Class Page -> Wicked_Page to satisfy autoloader

diff --git a/wicked/diff.php b/wicked/diff.php
index f872627..3144b6a 100644 (file)
--- a/wicked/diff.php
+++ b/wicked/diff.php
@@ -31,7 +31,7 @@ if (!$v1 || ($v2 && version_compare($v1, $v2) > 0) || $v2 == '?') {
     $v2 = $tmp;
 }
 
-$page = Page::getPage(Horde_Util::getFormData('page'), $v2);
+$page = Wicked_Page::getPage(Horde_Util::getFormData('page'), $v2);
 if (is_a($page, 'PEAR_Error')) {
     $notification->push(sprintf(_("Internal error viewing requested page: %s"), $page->getMessage()), 'horde.error');
     Wicked::url('WikiHome', true)->redirect();

diff --git a/wicked/display.php b/wicked/display.php
index 565a407..0ae43e3 100644 (file)
--- a/wicked/display.php
+++ b/wicked/display.php
@@ -11,7 +11,7 @@
 require_once dirname(__FILE__) . '/lib/Application.php';
 Horde_Registry::appInit('wicked');
 
-$page = Page::getCurrentPage();
+$page = Wicked_Page::getCurrentPage();
 if (is_a($page, 'PEAR_Error')) {
     $notification->push(_("Internal error viewing requested page"),
                         'horde.error');

diff --git a/wicked/history.php b/wicked/history.php
index 808561e..bc99520 100644 (file)
--- a/wicked/history.php
+++ b/wicked/history.php
@@ -11,7 +11,7 @@
 require_once dirname(__FILE__) . '/lib/Application.php';
 Horde_Registry::appInit('wicked');
 
-$page = Page::getCurrentPage();
+$page = Wicked_Page::getCurrentPage();
 if (is_a($page, 'PEAR_Error')) {
     $notification->push(_("Internal error viewing requested page"), 'horde.error');
     Wicked::url('WikiHome', true)->redirect();

diff --git a/wicked/lib/Api.php b/wicked/lib/Api.php
index 11166e1..9a70cbc 100644 (file)
--- a/wicked/lib/Api.php
+++ b/wicked/lib/Api.php
@@ -45,7 +45,7 @@ class Wicked_Api extends Horde_Registry_Api
      */
     public function getPageInfo($pagename)
     {
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -81,7 +81,7 @@ class Wicked_Api extends Horde_Registry_Api
         $info = array();
 
         foreach ($pagenames as $pagename) {
-            $page = Page::getPage($pagename);
+            $page = Wicked_Page::getPage($pagename);
             if (is_a($page, 'PEAR_Error')) {
                 return $page;
             }
@@ -107,7 +107,7 @@ class Wicked_Api extends Horde_Registry_Api
      */
     public function getPageHistory($pagename)
     {
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -146,7 +146,7 @@ class Wicked_Api extends Horde_Registry_Api
      */
     public function display($pagename)
     {
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -166,7 +166,7 @@ class Wicked_Api extends Horde_Registry_Api
      */
     public function renderPage($pagename, $format = 'Plain')
     {
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -195,7 +195,7 @@ class Wicked_Api extends Horde_Registry_Api
     public function edit($pagename, $text, $changelog = '',
                          $minorchange = false)
     {
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -275,7 +275,7 @@ class Wicked_Api extends Horde_Registry_Api
     {
         global $wicked;
 
-        $page = Page::getPage($pagename, $version);
+        $page = Wicked_Page::getPage($pagename, $version);
 
         if (!$page->allows(WICKED_MODE_CONTENT)) {
             return PEAR::raiseError(_("Permission denied."));

diff --git a/wicked/lib/Page.php b/wicked/lib/Page.php
index 904df55..e3f0d69 100644 (file)
--- a/wicked/lib/Page.php
+++ b/wicked/lib/Page.php
@@ -10,7 +10,7 @@
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class Page {
+class Wicked_Page {
 
     /**
      * Display modes supported by this page. Possible modes:
@@ -186,7 +186,7 @@ class Page {
      */
     function getCurrentPage()
     {
-        return Page::getPage(rtrim(Horde_Util::getFormData('page'), '/'),
+        return Wicked_Page::getPage(rtrim(Horde_Util::getFormData('page'), '/'),
                              Horde_Util::getFormData('version'),
                              Horde_Util::getFormData('referrer'));
     }

diff --git a/wicked/lib/Page/AddPage.php b/wicked/lib/Page/AddPage.php
index 83ce23c..ad1d182 100644 (file)
--- a/wicked/lib/Page/AddPage.php
+++ b/wicked/lib/Page/AddPage.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class AddPage extends Page {
+class AddPage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/AllPages.php b/wicked/lib/Page/AllPages.php
index c173a90..bed4cf6 100644 (file)
--- a/wicked/lib/Page/AllPages.php
+++ b/wicked/lib/Page/AllPages.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class AllPages extends Page {
+class AllPages extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/AttachedFiles.php b/wicked/lib/Page/AttachedFiles.php
index 23a97e5..0776daf 100644 (file)
--- a/wicked/lib/Page/AttachedFiles.php
+++ b/wicked/lib/Page/AttachedFiles.php
@@ -14,7 +14,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Jason M. Felice <jason.m.felice@gmail.com>
  * @package Wicked
  */
-class AttachedFiles extends Page {
+class AttachedFiles extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/BackLinks.php b/wicked/lib/Page/BackLinks.php
index 97f9950..fd8a73a 100644 (file)
--- a/wicked/lib/Page/BackLinks.php
+++ b/wicked/lib/Page/BackLinks.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class BackLinks extends Page {
+class BackLinks extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/DeletePage.php b/wicked/lib/Page/DeletePage.php
index 313bd3e..95bd31e 100644 (file)
--- a/wicked/lib/Page/DeletePage.php
+++ b/wicked/lib/Page/DeletePage.php
@@ -19,7 +19,7 @@ require_once WICKED_BASE . '/lib/Page.php';
  * @author  Chuck Hagenbuch <chuck@horde.org>
  * @package Wicked
  */
-class DeletePage extends Page {
+class DeletePage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -56,7 +56,7 @@ class DeletePage extends Page {
      */
     function preDisplay()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         if (!$page->allows(WICKED_MODE_REMOVE)) {
             Wicked::url($this->referrer(), true)->redirect();
         }
@@ -70,7 +70,7 @@ class DeletePage extends Page {
     function display()
     {
         $version = Horde_Util::getFormData('version');
-        $page = Page::getPage($this->referrer(), $version);
+        $page = Wicked_Page::getPage($this->referrer(), $version);
         if (!$page->isValid()) {
             Wicked::url('WikiHome', true)->redirect();
         }
@@ -124,7 +124,7 @@ class DeletePage extends Page {
     function handleAction()
     {
         $pagename = $this->referrer();
-        $page = Page::getPage($pagename);
+        $page = Wicked_Page::getPage($pagename);
         if ($page->allows(WICKED_MODE_REMOVE)) {
             $version = Horde_Util::getFormData('version');
             if (empty($version)) {

diff --git a/wicked/lib/Page/EditPage.php b/wicked/lib/Page/EditPage.php
index 9fd3db4..a6d6672 100644 (file)
--- a/wicked/lib/Page/EditPage.php
+++ b/wicked/lib/Page/EditPage.php
@@ -19,7 +19,7 @@ require_once WICKED_BASE . '/lib/Page.php';
  * @author  Jason M. Felice <jason.m.felice@gmail.com>
  * @package Wicked
  */
-class EditPage extends Page {
+class EditPage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -58,7 +58,7 @@ class EditPage extends Page {
     function allows($mode)
     {
         if ($mode == WICKED_MODE_EDIT) {
-            $page = Page::getPage($this->referrer());
+            $page = Wicked_Page::getPage($this->referrer());
             if ($page->isLocked(Wicked::lockUser())) {
                 return false;
             }
@@ -86,7 +86,7 @@ class EditPage extends Page {
             Wicked::url($this->referrer(), true)->redirect();
         }
         if ($this->allows(WICKED_MODE_LOCKING)) {
-            $page = Page::getPage($this->referrer());
+            $page = Wicked_Page::getPage($this->referrer());
             if ($page->isLocked()) {
                 $page->unlock();
             }
@@ -104,7 +104,7 @@ class EditPage extends Page {
      */
     function display()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         $page_text = Horde_Util::getFormData('page_text');
         if (is_null($page_text)) {
             $page_text = $page->getText();
@@ -131,19 +131,19 @@ class EditPage extends Page {
 
     function isLocked()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         return $page->isLocked();
     }
 
     function getLockRequestor()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         return $page->getLockRequestor();
     }
 
     function getLockTime()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         return $page->getLockTime();
     }
 
@@ -151,7 +151,7 @@ class EditPage extends Page {
     {
         global $notification, $conf;
 
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         if (!$this->allows(WICKED_MODE_EDIT)) {
             $notification->push(sprintf(_("You don't have permission to edit \"%s\"."), $page->pageName()));
         } else {

diff --git a/wicked/lib/Page/LeastPopular.php b/wicked/lib/Page/LeastPopular.php
index e08241a..1c793ae 100644 (file)
--- a/wicked/lib/Page/LeastPopular.php
+++ b/wicked/lib/Page/LeastPopular.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class LeastPopular extends Page {
+class LeastPopular extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/LikePages.php b/wicked/lib/Page/LikePages.php
index 78810f2..c2f2a7a 100644 (file)
--- a/wicked/lib/Page/LikePages.php
+++ b/wicked/lib/Page/LikePages.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class LikePages extends Page {
+class LikePages extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/MergeOrRename.php b/wicked/lib/Page/MergeOrRename.php
index b0fcf47..3d2e851 100644 (file)
--- a/wicked/lib/Page/MergeOrRename.php
+++ b/wicked/lib/Page/MergeOrRename.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Jason M. Felice <eraserhd@speakeasy.net>
  * @package Wicked
  */
-class MergeOrRename extends Page {
+class MergeOrRename extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -59,7 +59,7 @@ class MergeOrRename extends Page {
             if (!parent::allows(WICKED_MODE_REMOVE)) {
                 return false;
             }
-            $page = Page::getPage($this->referrer());
+            $page = Wicked_Page::getPage($this->referrer());
             if ($page->isLocked(Wicked::lockUser())) {
                 return false;
             }
@@ -178,7 +178,7 @@ class MergeOrRename extends Page {
             return;
         }
 
-        $sourcePage = Page::getPage($referrer);
+        $sourcePage = Wicked_Page::getPage($referrer);
         if (is_a($sourcePage, 'PEAR_Error')) {
             $notification->push(sprintf(_("Failed to retrieve \"%s\": %s"),
                                         $referrer, $sourcePage->getMessage()),
@@ -190,7 +190,7 @@ class MergeOrRename extends Page {
             return;
         }
 
-        $destPage = Page::getPage($new_name);
+        $destPage = Wicked_Page::getPage($new_name);
         if (!is_a($destPage, 'PEAR_Error') && !is_a($destPage, 'AddPage')) {
             // Destination page exists.
             if ($collision != 'merge') {

diff --git a/wicked/lib/Page/MostPopular.php b/wicked/lib/Page/MostPopular.php
index 9bf4188..7ae4eab 100644 (file)
--- a/wicked/lib/Page/MostPopular.php
+++ b/wicked/lib/Page/MostPopular.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class MostPopular extends Page {
+class MostPopular extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/NewPage.php b/wicked/lib/Page/NewPage.php
index a81d4da..6fee5ac 100644 (file)
--- a/wicked/lib/Page/NewPage.php
+++ b/wicked/lib/Page/NewPage.php
@@ -19,7 +19,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Chuck Hagenbuch <chuck@horde.org>
  * @package Wicked
  */
-class NewPage extends Page {
+class NewPage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -85,7 +85,7 @@ class NewPage extends Page {
     {
         // Load the page template.
         if ($this->_template) {
-            $page = Page::getPage($this->_template);
+            $page = Wicked_Page::getPage($this->_template);
             $page_text = $page->getText();
         } else {
             $page_text = '';

diff --git a/wicked/lib/Page/RecentChanges.php b/wicked/lib/Page/RecentChanges.php
index 7d98e71..885e480 100644 (file)
--- a/wicked/lib/Page/RecentChanges.php
+++ b/wicked/lib/Page/RecentChanges.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class RecentChanges extends Page {
+class RecentChanges extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/RevertPage.php b/wicked/lib/Page/RevertPage.php
index b06ddd4..240fd8b 100644 (file)
--- a/wicked/lib/Page/RevertPage.php
+++ b/wicked/lib/Page/RevertPage.php
@@ -13,7 +13,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage.php';
  * @author  Chuck Hagenbuch <chuck@horde.org>
  * @package Wicked
  */
-class RevertPage extends Page {
+class RevertPage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -50,7 +50,7 @@ class RevertPage extends Page {
      */
     function preDisplay()
     {
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         if (!$page->allows(WICKED_MODE_EDIT)) {
             Wicked::url($this->referrer(), true)->redirect();
         }
@@ -64,7 +64,7 @@ class RevertPage extends Page {
     function display()
     {
         $version = Horde_Util::getFormData('version');
-        $page = Page::getPage($this->referrer(), $version);
+        $page = Wicked_Page::getPage($this->referrer(), $version);
         $msg = sprintf(_("Are you sure you want to revert to version %s of this page?"), $version);
 ?>
 <form method="post" name="revertform" action="<?php echo Wicked::url('RevertPage') ?>">
@@ -110,14 +110,14 @@ class RevertPage extends Page {
     {
         global $notification;
 
-        $page = Page::getPage($this->referrer());
+        $page = Wicked_Page::getPage($this->referrer());
         if ($page->allows(WICKED_MODE_EDIT)) {
             $version = Horde_Util::getPost('version');
             if (empty($version)) {
                 $notification->push(sprintf(_("Can't revert to an unknown version.")), 'horde.error');
                 Wicked::url($this->referrer(), true)->redirect();
             }
-            $oldpage = Page::getPage($this->referrer(), $version);
+            $oldpage = Wicked_Page::getPage($this->referrer(), $version);
             $minor = substr($page->version(), 0, strpos($page->version(), '.')) ==
                 substr($oldpage->version(), 0, strpos($oldpage->version(), '.'));
             $page->updateText($oldpage->getText(), 'Revert', $minor);

diff --git a/wicked/lib/Page/Search.php b/wicked/lib/Page/Search.php
index 90615e8..934cf56 100644 (file)
--- a/wicked/lib/Page/Search.php
+++ b/wicked/lib/Page/Search.php
@@ -14,7 +14,7 @@ require_once WICKED_BASE . '/lib/Page/StandardPage/StdHistoryPage.php';
  * @author Ben Chavet <ben@horde.org>
  * @package Wicked
  */
-class Search extends Page {
+class Search extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/StandardPage.php b/wicked/lib/Page/StandardPage.php
index 2ccfe87..e48e34d 100644 (file)
--- a/wicked/lib/Page/StandardPage.php
+++ b/wicked/lib/Page/StandardPage.php
@@ -10,7 +10,7 @@
  * @author  Tyler Colbert <tyler@colberts.us>
  * @package Wicked
  */
-class StandardPage extends Page {
+class StandardPage extends Wicked_Page {
 
     /**
      * Display modes supported by this page.

diff --git a/wicked/lib/Page/SyncDiff.php b/wicked/lib/Page/SyncDiff.php
index 0e62a2d..2984e2f 100644 (file)
--- a/wicked/lib/Page/SyncDiff.php
+++ b/wicked/lib/Page/SyncDiff.php
@@ -55,7 +55,7 @@ class SyncDiff extends SyncPages {
             return $remote;
         }
 
-        $page = Page::getPage($this->_pageName);
+        $page = Wicked_Page::getPage($this->_pageName);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }

diff --git a/wicked/lib/Page/SyncPages.php b/wicked/lib/Page/SyncPages.php
index 9db450b..8ea4b07 100644 (file)
--- a/wicked/lib/Page/SyncPages.php
+++ b/wicked/lib/Page/SyncPages.php
@@ -14,7 +14,7 @@ require_once WICKED_BASE . '/lib/Sync.php';
  * @author  Duck <duck@obala.net>
  * @package Wicked
  */
-class SyncPages extends Page {
+class SyncPages extends Wicked_Page {
 
     /**
      * Display modes supported by this page.
@@ -91,7 +91,7 @@ class SyncPages extends Page {
             if (isset($_SESSION['wicked']['sync']['pages'][$pageName])) {
                 continue;
             }
-            $page = Page::getPage($pageName);
+            $page = Wicked_Page::getPage($pageName);
             if (is_a($page, 'PEAR_Error')) {
                 return $page;
             }
@@ -115,7 +115,7 @@ class SyncPages extends Page {
             }
 
             // Compare checksum
-            $page = Page::getPage($pageName);
+            $page = Wicked_Page::getPage($pageName);
             if (is_a($page, 'PEAR_Error')) {
                 return $page;
             } elseif (md5($page->getText()) == $_SESSION['wicked']['sync']['pages'][$pageName]['page_checksum']) {
@@ -316,7 +316,7 @@ class SyncPages extends Page {
      */
     function getLocalPageInfo($pageName)
     {
-        $page = Page::getPage($pageName);
+        $page = Wicked_Page::getPage($pageName);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -359,7 +359,7 @@ class SyncPages extends Page {
             return $text;
         }
 
-        $page = Page::getPage($pageName);
+        $page = Wicked_Page::getPage($pageName);
         if (is_a($page, 'PEAR_Error')) {
             return $page;
         }
@@ -400,7 +400,7 @@ class SyncPages extends Page {
      */
     function upload($pageName)
     {
-        $page = Page::getPage($pageName);
+        $page = Wicked_Page::getPage($pageName);
         if (is_a($page, 'PEAR_Error')) {
             $GLOBALS['notification']->push($page);
             return $page;

diff --git a/wicked/preview.php b/wicked/preview.php
index 598c087..5d2777f 100644 (file)
--- a/wicked/preview.php
+++ b/wicked/preview.php
@@ -15,7 +15,7 @@ if (!($text = Horde_Util::getFormData('page_text'))) {
     exit;
 }
 
-$page = new Page();
+$page = new Wicked_Page();
 $wiki = &$page->getProcessor();
 $text = $wiki->transform($text);