Changeset 4610

Timestamp:

08/29/10 19:32:54 (18 months ago)

Author:

vain

Message:

• added helper method toUnderscoredUpperCamelCase() to transform modulename to classname

File:

• trunk/core/bootstrap/clansuite.loader.php (modified) (3 diffs)

trunk/core/bootstrap/clansuite.loader.php

@@ -365 +365 @@
          * or  : Array ( [0] => clansuite [1] => module [2] => news )
          */
+
+        $classname = self::toUnderscoredUpperCamelCase($modulename);
+
         $moduleinfos = explode('_', $modulename);
-        $classname = '';
-
-        $i = 0;
-        foreach ($moduleinfos as $moduleinfo)
-        {
-            if($i == 0)
-            {
-                $classname .= ucfirst($moduleinfo);
-                ++$i;
-            }
-            else
-            {
-                $classname .= '_'.ucfirst($moduleinfo);
-            }
-        }
-
         $filename = ROOT_MOD;
 
@@ -392 +379 @@
                 # admin submodule filename, like news.admin.php
                 $filename .= $moduleinfos['2'] . DS . 'controller' . DS . $moduleinfos['2'] . '.admin.php';
-
-                $classname .= 'Admin';
             }
             else
@@ -409 +394 @@
         return self::requireFile($filename, $classname);
     }
+
+    /**
+     * Transforms a string from underscored_lower_case to Underscored_Upper_Camel_Case.
+     *
+     * @param string $string String in underscored_lower_case format.
+     * @return $string String in Upper_Camel_Case.
+     */
+    public static function toUnderscoredUpperCamelCase($string)
+    {
+        $upperCamelCase = str_replace(' ', '_', ucwords(str_replace('_', ' ', strtolower($string))));
+        return $upperCamelCase;
+    }
 }
 ?>