Changeset 4599 for trunk/core/moduleinfocontroller.core.php

Timestamp:

08/27/10 23:01:58 (21 months ago)

Author:

vain

Message:

• minor change to all security constant checks
• fixed the non rewrite routing

File:

• trunk/core/moduleinfocontroller.core.php (modified) (7 diffs)

trunk/core/moduleinfocontroller.core.php

@@ -30 +30 @@
 
 # Security Handler
-if(defined('IN_CS') == false)
+if(defined('IN_CS') === false)
 {
     die('Clansuite not loaded. Direct Access forbidden.');
@@ -106 +106 @@
             # get the modulename, so strip the path info
             $modulename = str_replace( ROOT_MOD, '', $modulepath);
+            # $modulename_by_dirname = str_replace( ROOT . 'modules' . DS ,'', $module_path);
 
             # create array with pieces of information about a module
@@ -118 +119 @@
 
             # hasInfo
-            if(is_file($modulepath . DS . $modulename.'.info.php') === true)
-            {
-                self::$modulesinfo[$modulename]['info'] = Clansuite_CMS::getInjector()->instantiate('Clansuite_Config')
-                                                          ->readConfig( $modulepath . DS . $modulename.'.info.php' );
+            $module_infofile = $modulepath . DS . $modulename . '.info.php';
+            $config_object = Clansuite_CMS::getInjector()->instantiate('Clansuite_Config');
+            if(is_file($module_infofile) === true)
+            {
+                #Clansuite_Debug::firebug($module_infofile);
+
+                self::$modulesinfo[$modulename]['info'] = $config_object->readConfig($module_infofile);
             }
-            else # if the info file for a module does not exists yet, create it
-            {
-                Clansuite_CMS::getInjector()->instantiate('Clansuite_Config')
-                ->writeConfig( $modulepath . DS . $modulename.'.info.php' );
+            else # create file in DEV MODE
+            {
+                # if the info file for a module does not exists yet, create it
+                $config_object->writeConfig($module_infofile);
             }
 
@@ -146 +150 @@
         }
         ksort(self::$modulesinfo);
-        #Clansuite_Debug::printR(self::$modulesinfos);
+
         return self::$modulesinfo;
     }
@@ -152 +156 @@
     public static function getModuleInformations($module = null)
     {
-         # check if the infos of this specific module were catched before
+        # check if the infos of this specific module were catched before
         if($module === false and isset(self::$modulesinfo[$module]) === null)
         {
-            Clansuite_Debug::printR(self::$modulesinfo);
             return self::$modulesinfo[$module];
         }
@@ -164 +167 @@
             return self::scanModuleInformations();
         }
-        # fetch infos for the requested $module
-        else
+        else # fetch infos for the requested $module
         {
             return self::scanModuleInformations($module);
@@ -213 +215 @@
     {
         return Clansuite_CMS::getInjector()->instantiate('Clansuite_Config')
-                ->readConfig( ROOT . 'configuration' . DS . 'modules.config.php' );
+                ->readConfig(ROOT . 'configuration' . DS . 'modules.config.php');
     }