Changeset 812 for trunk

Timestamp:

May 31, 2014, 9:35:15 AM (10 years ago)

Author:

chronos

Message:

• Fixed: "Page not found" was not handled correctly. It was handled incorrectly by Redirection module.

Location:

trunk

Files:

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

trunk/Modules/Redirection/Redirection.php

@@ -20 +20 @@
   }
 
+  function Redirect($Location)
+  {
+        Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
+    Header('Location: '.$Location);
+    return('<h3 align="center">Požadovaná stránka byla přesunuta do nového umístění.</h3>');
+  }
+
   function ShowRedirect()
   {
-    Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
+    $Output = '';
     if(count($this->System->PathItems) > 0)
     {
-        if($this->System->PathItems[0] == 'team.php') Header('Location: '.$this->System->Link('/team/'));
-      if($this->System->PathItems[0] == 'version.php') Header('Location: '.$this->System->Link('/client-version/'));
-      if($this->System->PathItems[0] == 'phpBB3') Header('Location: '.$this->System->Link('/forum/'));
-      if($this->System->PathItems[0] == 'phpbb3') Header('Location: '.$this->System->Link('/forum/'));
-      if($this->System->PathItems[0] == 'statistic.php') Header('Location: '.$this->System->Link('/progress/'));
-      if($this->System->PathItems[0] == 'register.php') Header('Location: '.$this->System->Link('/registrace.php'));
-      if($this->System->PathItems[0] == 'dictionary.php') Header('Location: '.$this->System->Link('/dictionary/'));
-      if($this->System->PathItems[0] == 'download-addon.php') Header('Location: '.$this->System->Link('/download/'));
-      if($this->System->PathItems[0] == 'banners.php') Header('Location: '.$this->System->Link('/referrer/'));
-      if($this->System->PathItems[0] == 'download.php') Header('Location: '.$this->System->Link('/download/'));
-      if($this->System->PathItems[0] == 'serverlist.php') Header('Location: '.$this->System->Link('/server/'));
+        if($this->System->PathItems[0] == 'team.php') $Output = $this->Redirect($this->System->Link('/team/'));
+      if($this->System->PathItems[0] == 'version.php') $Output = $this->Redirect($this->System->Link('/client-version/'));
+      if($this->System->PathItems[0] == 'phpBB3') $Output = $this->Redirect($this->System->Link('/forum/'));
+      if($this->System->PathItems[0] == 'phpbb3') $Output = $this->Redirect($this->System->Link('/forum/'));
+      if($this->System->PathItems[0] == 'statistic.php') $Output = $this->Redirect($this->System->Link('/progress/'));
+      if($this->System->PathItems[0] == 'register.php') $Output = $this->Redirect($this->System->Link('/registrace.php'));
+      if($this->System->PathItems[0] == 'dictionary.php') $Output = $this->Redirect($this->System->Link('/dictionary/'));
+      if($this->System->PathItems[0] == 'download-addon.php') $Output = $this->Redirect($this->System->Link('/download/'));
+      if($this->System->PathItems[0] == 'banners.php') $Output = $this->Redirect($this->System->Link('/referrer/'));
+      if($this->System->PathItems[0] == 'download.php') $Output = $this->Redirect($this->System->Link('/download/'));
+      if($this->System->PathItems[0] == 'serverlist.php') $Output = $this->Redirect($this->System->Link('/server/'));
       if(count($this->System->PathItems) > 1)
       {
         if(($this->System->PathItems[0] == 'team') and ($this->System->PathItems[1] == 'userlist.php'))
-          Header('Location: '.$this->System->Link('/userlist.php'));
+          $Output = $this->Redirect($this->System->Link('/userlist.php'));
         if(($this->System->PathItems[0] == 'dictionary') and ($this->System->PathItems[1] == 'user.php'))
-          Header('Location: '.$this->System->Link('/user.php'));
+          $Output = $this->Redirect($this->System->Link('/user.php'));
         if(($this->System->PathItems[0] == 'forum') and ($this->System->PathItems[1] == 'index.php'))
-          Header('Location: '.$this->System->Link('/forum/'));
+          $Output = $this->Redirect($this->System->Link('/forum/'));
         if(($this->System->PathItems[0] == 'phpbb3') and ($this->System->PathItems[1] == 'index.php'))
-          Header('Location: '.$this->System->Link('/forum/'));
+          $Output = $this->Redirect($this->System->Link('/forum/'));
         if(($this->System->PathItems[0] == 'phpBB3') and ($this->System->PathItems[1] == 'index.php'))
-          Header('Location: '.$this->System->Link('/forum/'));
+          $Output = $this->Redirect($this->System->Link('/forum/'));
       }
     }
-    return('<h3 align="center">Požadovaná stránka byla přesunuta do nového umístění.</h3>');
+    return($Output);
   }
 }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 811; // Subversion revision
+$Revision = 812; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2014-05-28';
+$ReleaseTime = '2014-05-31';

trunk/includes/system.php

@@ -247 +247 @@
       if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
     } else {
+      $Output2 = '';
         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
-                {
+          $Output2 = call_user_func_array($this->OnPageNotFound, array());
+     if($Output2 != '') $Output .= $this->BaseView->ShowPage($Output2);
+                else {
                         $Output = $this->PageNotFound();
-            $this->BaseView->Title = T('Page not found');
-                $Output = $this->BaseView->ShowPage($Output);
+          $this->BaseView->Title = T('Page not found');
+        $Output = $this->BaseView->ShowPage($Output);
                 }
         }