Changeset 807 for trunk/includes

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/includes

Files:

• Version.php (modified) (1 diff)
• system.php (modified) (4 diffs)

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);
         }