Changeset 8756 for trunk/inc/classes/BxDolRequest.php

Timestamp:

01/22/09 23:18:33 (3 years ago)

Author:

Anton Lesnikov

Message:

1. Default action 'Home' in modules
2. 404 error if request not found

File:

• trunk/inc/classes/BxDolRequest.php (modified) (2 diffs)

trunk/inc/classes/BxDolRequest.php

@@ -30 +30 @@
         
         $sFile = BX_DIRECTORY_PATH_MODULES . $aModule['path'] . $sFileName . '.php';
-        if(file_exists($sFile))
+        if(!file_exists($sFile))
+            BxDolRequest::pageNotFound();
+        else    
             include($sFile);
     }
     
-    function processAsAction($aModule, &$aRequest, $sClass = "Module") {        
-        $sMethod = 'action' . str_replace(' ', '', ucwords(str_replace('_', ' ', array_shift($aRequest))));
+    function processAsAction($aModule, &$aRequest, $sClass = "Module") {
+        $sAction = empty($aRequest) || (isset($aRequest[0]) && empty($aRequest[0])) ? 'Home' : array_shift($aRequest);
+        
+        $sMethod = 'action' . str_replace(' ', '', ucwords(str_replace('_', ' ', $sAction)));
         return BxDolRequest::_perform($aModule, $sClass, $sMethod, $aRequest);
     }
@@ -48 +52 @@
         
         $sFile = BX_DIRECTORY_PATH_MODULES . $aModule['path'] . 'classes/' . $sClass . '.php';
-        if(!file_exists($sFile)) return;
+        if(!file_exists($sFile)) 
+            BxDolRequest::pageNotFound();
         
         require_once($sFile);
         $oModule = new $sClass($aModule);
+
+        if(method_exists($oModule, $sMethod))
+            return call_user_func_array(array($oModule, $sMethod), $aParams);
+        else
+            BxDolRequest::pageNotFound();
+    }
+    function pageNotFound() {
+        header('Status: 404 Not Found');
+        header('HTTP/1.0 404 Not Found');
         
-        return method_exists($oModule, $sMethod) ? call_user_func_array(array($oModule, $sMethod), $aParams) : null;
-    }
+        if(file_exists(BX_DIRECTORY_PATH_ROOT . '404.html'))
+            readfile(BX_DIRECTORY_PATH_ROOT . '404.html');
+        else
+            echo '404. Page Not Found';
+        exit;
+    }
 }
 ?>