Changeset 4614

Timestamp:

09/06/10 21:52:15 (17 months ago)

Author:

vain

Message:

• minor changes

Location:

trunk/core

Files:

• config/ini.config.php (modified) (3 diffs)
• factories/config.factory.php (modified) (2 diffs)
• filters/maintenance.filter.php (modified) (1 diff)
• router.core.php (modified) (3 diffs)

trunk/core/config/ini.config.php

@@ -104 +104 @@
         }
 
-
         # when ini_filename exists, get old config array
         if(is_file($ini_filename) === true)
@@ -115 +114 @@
         else
         {
-
             # create file
             touch($ini_filename);
@@ -215 +213 @@
     {
         # check ini_filename exists
-        if(is_file($filename) === false)
+        if(is_file($filename) === false or is_readable($filename) === false)
         {
             throw new Clansuite_Exception('File not found: '.$filename, 4);

trunk/core/factories/config.factory.php

@@ -103 +103 @@
     {
         $handler = self::getHandler($configfile);
-        return $handler::readConfig($configfile);
+        return $handler->readConfig($configfile);
     }
 
@@ -135 +135 @@
             {
                 # instantiate and return the specific confighandler with the $configfile to read
-                #return new $class();
-                return $class::getInstance();
+                #return $class::getInstance();
+                #call_user_func($class.'::getInstance');
+                return new $class();
             }
             else

trunk/core/filters/maintenance.filter.php

@@ -70 +70 @@
             $html = $smarty->fetch( ROOT_THEMES . 'core/templates/maintenance.tpl', true);
 
-            $response::setContent($html);
-            $response::flush();
+            $response->setContent($html);
+            $response->flush();
             exit();
         }

trunk/core/router.core.php

@@ -84 +84 @@
     public function __construct(Clansuite_HttpRequest $request)
     {
-        $request_uri = $request::getRequestURI();
+        $request_uri = $request->getRequestURI();
 
         # clean the incomming uri
@@ -1104 +1104 @@
     public function addRoutesOfModule($modulename)
     {
-        self:updateApplicationRoutes($modulename);
+        self::updateApplicationRoutes($modulename);
     }
 
@@ -1213 +1213 @@
 interface Clansuite_Router_Interface
 {
-    function addRoute($name, array $route);
+    function addRoute($url_pattern, array $route_options = null);
     function addRoutes(array $routes);
     function getRoutes();