Changeset 807 for trunk

Timestamp:

May 25, 2014, 12:33:20 AM (11 years ago)

Author:

chronos

Message:

• Modified: Do not register all possible redirected pages to main URL route tree in Redirection module. Instead register itself as System->OnPageNotFound handler.

Location:

trunk

Files:

• Modules/Redirection/Redirection.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)
• includes/system.php (modified) (4 diffs)

trunk/Modules/Redirection/Redirection.php

@@ -17 +17 @@
   function Start()
   {
-        $this->System->RegisterPage('team.php', 'PageRedirection');
-    $this->System->RegisterPage('version.php', 'PageRedirection');
-    $this->System->RegisterPage('phpBB3', 'PageRedirection');
-    $this->System->RegisterPage('phpbb3', 'PageRedirection');
-    $this->System->RegisterPage(array('forum', 'index.php'), 'PageRedirection');
-    $this->System->RegisterPage('statistic.php', 'PageRedirection');
-    $this->System->RegisterPage('register.php', 'PageRedirection');
-    $this->System->RegisterPage('dictionary.php', 'PageRedirection');
-    $this->System->RegisterPage(array('dictionary', 'user.php'), 'PageRedirection');
-    $this->System->RegisterPage(array('team', 'userlist.php'), 'PageRedirection');
-    $this->System->RegisterPage('download-addon.php', 'PageRedirection');
-    $this->System->RegisterPage('banners.php', 'PageRedirection');
-    $this->System->RegisterPage('download.php', 'PageRedirection');
-    $this->System->RegisterPage('serverlist.php', 'PageRedirection');
+        $this->System->OnPageNotFound = array($this, 'ShowRedirect');
   }
-}
 
-class PageRedirection extends Page
-{
-        function Show()
+  function ShowRedirect()
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
@@ -60 +44 @@
         if(($this->System->PathItems[0] == 'forum') and ($this->System->PathItems[1] == 'index.php'))
           Header('Location: '.$this->System->Link('/forum/'));
+        if(($this->System->PathItems[0] == 'phpbb3') and ($this->System->PathItems[1] == 'index.php'))
+          Header('Location: '.$this->System->Link('/forum/'));
+        if(($this->System->PathItems[0] == 'phpBB3') and ($this->System->PathItems[1] == 'index.php'))
+          Header('Location: '.$this->System->Link('/forum/'));
       }
     }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 806; // Subversion revision
+$Revision = 807; // Subversion revision
 $DatabaseRevision = 803; // Database structure revision
 $ReleaseTime = '2014-05-24';

trunk/includes/system.php

@@ -12 +12 @@
   var $Menu;
   var $DoNotShowPage;
+  var $OnPageNotFound;
 
   function __construct()
@@ -19 +20 @@
     $this->RSSChannels = array();
     $this->DoNotShowPage = false;
+    $this->OnPageNotFound = array();
   }
 
@@ -245 +247 @@
       if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
     } else {
-        $Output = $this->PageNotFound();
-        $this->BaseView->Title = T('Page not found');
-        $Output = $this->BaseView->ShowPage($Output);
-    }
+        if((count($this->OnPageNotFound) == 2)
+  and method_exists($this->OnPageNotFound[0], $this->OnPageNotFound[1]))
+          $Output = $this->BaseView->ShowPage(call_user_func_array($this->OnPageNotFound, array()));
+                else 
+                {
+                        $Output = $this->PageNotFound();
+            $this->BaseView->Title = T('Page not found');
+                $Output = $this->BaseView->ShowPage($Output);
+                }
+        }
     echo($Output);
   }
@@ -443 +451 @@
         {
                 $Output = $this->ShowHeader().$Content.$this->ShowFooter();
-                //if($this->System->Config['Web']['FormatOutput']) $Output = $this->FormatOutput($Output);
+                if($this->System->Config['Web']['FormatOutput']) 
+              $Output = $this->FormatOutput($Output);
                 return($Output);
         }