phpwebsite-comm-cvs-commits

[Greg M. <bli...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/wiki/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6952/class

Modified Files:
	OldWikiPage.php WikiImage.php WikiManager.php 
Log Message:
Support new mod_rewrite method introduced in phpWebSite 1.5.0

Index: WikiManager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiManager.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** WikiManager.php	3 Jan 2008 16:29:38 -0000	1.68
--- WikiManager.php	29 Mar 2008 20:01:55 -0000	1.69
***************
*** 258,266 ****
          $pager->setModule('wiki');
          $pager->setTemplate('images/admin.tpl');
!         $pager->addToggle(' class="bgcolor1"');
          $pager->addPageTags($tags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('filename', 'summary');
          $pager->setDefaultOrder('filename', 'asc');
  
          $template['TITLE'] = dgettext('wiki', 'Wiki Images');
--- 258,267 ----
          $pager->setModule('wiki');
          $pager->setTemplate('images/admin.tpl');
!         $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
          $pager->addPageTags($tags);
          $pager->addRowTags('getTpl');
          $pager->setSearch('filename', 'summary');
          $pager->setDefaultOrder('filename', 'asc');
+         $pager->setEmptyMessage(dgettext('wiki', 'No images found.'));
  
          $template['TITLE'] = dgettext('wiki', 'Wiki Images');
***************
*** 289,293 ****
          $pager->setModule('wiki');
          $pager->setTemplate('recentchanges/list.tpl');
!         $pager->addToggle(' class="bgcolor1"');
          $pager->addPageTags($tags);
          $pager->addRowTags('getRecentChangesTpl');
--- 290,294 ----
          $pager->setModule('wiki');
          $pager->setTemplate('recentchanges/list.tpl');
!         $pager->addToggle(PHPWS_LIST_TOGGLE_CLASS);
          $pager->addPageTags($tags);
          $pager->addRowTags('getRecentChangesTpl');
***************
*** 403,407 ****
          if(!isset($_REQUEST['op']) && !isset($_REQUEST['page_op']))
          {
!             if (MOD_REWRITE_ENABLED && isset($_REQUEST['id']) && is_string($_REQUEST['id']))
              {
                  PHPWS_Core::initModClass('wiki', 'WikiPage.php');
--- 404,414 ----
          if(!isset($_REQUEST['op']) && !isset($_REQUEST['page_op']))
          {
!             // phpWebSite 1.5.0 and later mod_rewrite method
!             if (isset($_GET['var1']))
!             {
!                 $_REQUEST['id'] = $_GET['id'] = $_GET['var1'];
!             }
! 
!             if (isset($_REQUEST['id']) && is_string($_REQUEST['id']))
              {
                  PHPWS_Core::initModClass('wiki', 'WikiPage.php');

Index: WikiImage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/WikiImage.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WikiImage.php	28 May 2007 19:00:16 -0000	1.9
--- WikiImage.php	29 Mar 2008 20:01:55 -0000	1.10
***************
*** 37,48 ****
      function WikiImage($id=NULL)
      {
!         if (empty($id))
          {
!             return;
!         }
!         $this->setId($id);
  
!         $db = new PHPWS_DB('wiki_images');
!         $db->loadObject($this);
      }
  
--- 37,47 ----
      function WikiImage($id=NULL)
      {
!         if (!empty($id))
          {
!             $this->setId($id);
  
!             $db = new PHPWS_DB('wiki_images');
!             PHPWS_Error::logIfError($db->loadObject($this));
!         }
      }
  
***************
*** 76,82 ****
          $db->addColumn('username');
          $result = $db->select('col');
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              return dgettext('wiki', 'N/A');
          }
--- 75,80 ----
          $db->addColumn('username');
          $result = $db->select('col');
!         if (PHPWS_Error::logIfError($result))
          {
              return dgettext('wiki', 'N/A');
          }
***************
*** 218,225 ****
                  return implode(' ', $imageErrors);
              }
!             else
!             {
!                 return dgettext('wiki', 'Please specify a valid file to upload.');
!             }
          }
          else
--- 216,221 ----
                  return implode(' ', $imageErrors);
              }
! 
!             return dgettext('wiki', 'Please specify a valid file to upload.');
          }
          else
***************
*** 230,252 ****
                  $image->setFilename($this->created . '_' . $image->file_name);
              }
!             $result = $image->write();
!             if (PEAR::isError($result))
              {
-                 PHPWS_Error::log($result);
                  return dgettext('wiki', 'There was a problem saving your image.');
              }
!             else
!             {
!                 $this->setFilename($image->file_name);
!                 $this->setSize($image->getSize());
!                 $this->setType($image->file_type);
!             }
          }
  
          $db = new PHPWS_DB('wiki_images');
!         $result = $db->saveObject($this);
!         if (PEAR::isError($result))
          {
-             PHPWS_Error::log($result);
              @unlink(PHPWS_HOME_DIR . 'images/wiki/' . $this->getFilename());
              return dgettext('wiki', 'There was a problem saving your image.');
--- 226,243 ----
                  $image->setFilename($this->created . '_' . $image->file_name);
              }
! 
!             if (PHPWS_Error::logIfError($image->write()))
              {
                  return dgettext('wiki', 'There was a problem saving your image.');
              }
! 
!             $this->setFilename($image->file_name);
!             $this->setSize($image->getSize());
!             $this->setType($image->file_type);
          }
  
          $db = new PHPWS_DB('wiki_images');
!         if (PHPWS_Error::logIfError($db->saveObject($this)))
          {
              @unlink(PHPWS_HOME_DIR . 'images/wiki/' . $this->getFilename());
              return dgettext('wiki', 'There was a problem saving your image.');
***************
*** 274,281 ****
              $db = new PHPWS_DB('wiki_images');
              $db->addWhere('id', $this->getId());
!             $result = $db->delete();
!             if (PEAR::isError($result))
              {
-                 PHPWS_Error::log($result);
                  return dgettext('wiki', 'Error deleting image.');
              }
--- 265,270 ----
              $db = new PHPWS_DB('wiki_images');
              $db->addWhere('id', $this->getId());
!             if (PHPWS_Error::logIfError($db->delete()))
              {
                  return dgettext('wiki', 'Error deleting image.');
              }
***************
*** 286,301 ****
              return dgettext('wiki', 'Image was not deleted!');
          }
-         else
-         {
-             $tags = array();
-             $tags['MESSAGE'] = dgettext('wiki', 'Are you sure you want to delete this image?');
-             $tags['YES'] = PHPWS_Text::secureLink(dgettext('wiki', 'Yes'), 'wiki',
-                            array('op'=>'doimagedelete', 'yes'=>1, 'id'=>$this->getId()));
-             $tags['NO'] = PHPWS_Text::secureLink(dgettext('wiki', 'No'), 'wiki',
-                           array('op'=>'doimagedelete', 'no'=>1, 'id'=>$this->getId()));
-             $tags['WIKIPAGE'] = '<img src="images/wiki/' . $this->getFilename() . '" alt="" />';
  
!             return PHPWS_Template::processTemplate($tags, 'wiki', 'confirm.tpl');
!         }
      }
  
--- 275,288 ----
              return dgettext('wiki', 'Image was not deleted!');
          }
  
!         $tags = array();
!         $tags['MESSAGE'] = dgettext('wiki', 'Are you sure you want to delete this image?');
!         $tags['YES'] = PHPWS_Text::secureLink(dgettext('wiki', 'Yes'), 'wiki',
!                                               array('op'=>'doimagedelete', 'yes'=>1, 'id'=>$this->getId()));
!         $tags['NO'] = PHPWS_Text::secureLink(dgettext('wiki', 'No'), 'wiki',
!                                              array('op'=>'doimagedelete', 'no'=>1, 'id'=>$this->getId()));
!         $tags['WIKIPAGE'] = '<img src="images/wiki/' . $this->getFilename() . '" alt="" />';
! 
!         return PHPWS_Template::processTemplate($tags, 'wiki', 'confirm.tpl');
      }
  

Index: OldWikiPage.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/wiki/class/OldWikiPage.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** OldWikiPage.php	3 Jan 2008 17:18:43 -0000	1.27
--- OldWikiPage.php	29 Mar 2008 20:01:55 -0000	1.28
***************
*** 43,47 ****
              $this->setId($id);
              $db = new PHPWS_DB('wiki_pages_version');
!             $db->loadObject($this);
          }
      }
--- 43,47 ----
              $this->setId($id);
              $db = new PHPWS_DB('wiki_pages_version');
!             PHPWS_Error::logIfError($db->loadObject($this));
          }
      }