@@ -4,4 +4,9 @@ generating an application skeleton with the "-p" flag (see ./script/newapp.sh -h Otherwise, you can use the framework in the same directory as your application. + +Dependency: + - The Krai_Mail component of the framework depends on the PEAR Mail library + - The Demo Application depends on the PEAR Text_Wiki library + Please see the README file for complete details. INSTALL @@ -343,6 +343,12 @@ final class Krai self::$MODULES = self::$INCLUDES."/modules"; self::$LAYOUTS = self::$INCLUDES."/layouts"; + spl_autoload_register(array("Krai","AutoLoad")); + if(function_exists("__autoload")) + { + spl_autoload_register("__autoload"); + } + self::$_SETUP = true; } } @@ -570,7 +576,7 @@ final class Krai foreach($args as $filename) { - if(preg_match("#^pear://#"), $filename)) + if(preg_match("#^pear://#", $filename)) { try { @@ -674,4 +680,79 @@ final class Krai } } + + /** + * Loads the file for a module or action name + * + * This function attempts to load the file containing the class named by the + * parameter. It is configured to have success with modules and actions placed + * in the usual places. + * + * @param string $_class The name of the class + * @return boolean The success of the loading + * @throws Exception + * + */ + public static function AutoLoad($_class) + { + $_class = self::$INFLECTOR->Camel2Underscore($_class); + if(substr($_class,-6) == "module") + { + self::LoadModuleFile(substr($_class, 0, -7)); + } + elseif(substr($_class, -6) == "action") + { + list($mod, $act) = explode("module", $_class, 2); + self::LoadActionFile(substr($mod,0,-1), substr($act, 1,-7)); + } + else + { + //throw new Exception("Load failed for class ".$class); + } + } + + /** + * Tries to load the file for a module + * + * This function attempts to load the file containing a certain module. + * + * @param string $_module The name of the module + * @return boolean The success of the loading + * @throws Krai_Router_Exception + */ + private static function LoadModuleFile($_module) + { + $f = self::$MODULES."/".$_module.".module/".$_module.".module.php"; + if(self::Uses($f)) + { + return true; + } + else + { + //throw new Exception("Module Load failed for file ".$f); + } + } + + /** + * Tries to load the file for an action + * + * This function attempts to load the file containing a certain action. + * + * @param string $_module The name of the module of the action + * @param string $_action The name of the action + * @return boolean The success of the loading + * @throws Exception + */ + private static function LoadActionFile($_module, $_action) + { + $f = self::$MODULES."/".$_module.".module/actions/".$_action.".action.php"; + if(self::Uses($f)) + { + return true; + } + else + { + //throw new Exception("Action Load failed for file ".$f); + } + } } Krai.php @@ -60,10 +60,6 @@ abstract class Krai_Module extends Krai_Base { throw new Krai_Module_Exception("Unable to find requested action ".$action." (".$act." : ".$f.").", Krai_Module_Exception::ActionNotFound); } - else - { - Krai_Base::$ROUTER->Load($fsc); - } try Krai/Module.php @@ -206,7 +206,6 @@ final class Krai_Router { Krai_Base::$PARAMS = array_merge(Krai_Base::$PARAMS, $_params); $t = Krai::$INFLECTOR->Underscore2Camel($_module."_module"); - $this->Load($t); $inst = new $t(); $inst->DoAction($_action, $_SERVER["REQUEST_METHOD"]); } @@ -241,79 +240,4 @@ final class Krai_Router } } - /** - * Loads the file for a module or action name - * - * This function attempts to load the file containing the class named by the - * parameter. It is configured to have success with modules and actions placed - * in the usual places. - * - * @param string $_class The name of the class - * @return boolean The success of the loading - * @throws Krai_Router_Exception - * - */ - public function Load($_class) - { - $_class = Krai::$INFLECTOR->Camel2Underscore($_class); - if(substr($_class,-6) == "module") - { - $this->LoadModuleFile(substr($class, 0, 7)); - } - elseif(substr($_class, -6) == "action") - { - list($mod, $act) = explode("module", $_class, 2); - $this->LoadActionFile(substr($mod,0,-1), substr($act, 1,-7)); - } - else - { - throw new Krai_Router_Exception("Load failed for class ".$class); - } - } - - /** - * Tries to load the file for a module - * - * This function attempts to load the file containing a certain module. - * - * @param string $_module The name of the module - * @return boolean The success of the loading - * @throws Krai_Router_Exception - */ - private function LoadModuleFile($_module) - { - $f = Krai::$MODULES."/".$_module.".module/".$_module.".module.php"; - if(Krai::Uses($f)) - { - return true; - } - else - { - throw new Krai_Router_Exception("Module Load failed for file ".$f); - } - } - - /** - * Tries to load the file for an action - * - * This function attempts to load the file containing a certain action. - * - * @param string $_module The name of the module of the action - * @param string $_action The name of the action - * @return boolean The success of the loading - * @throws Krai_Router_Exception - */ - private function LoadActionFile($_module, $_action) - { - $f = Krai::$MODULES."/".$_module.".module/actions/".$_action.".action.php"; - if(Krai::Uses($f)) - { - return true; - } - else - { - throw new Krai_Router_Exception("Action Load failed for file ".$f); - } - } - } Krai/Router.php 3a5ca0de4868bdb4d6054cbd4207a884afe1d517 Greg McWhirter greg@hallofkvasir.org http://github.com/gsmcwhirter/krai/commit/f89649803591f77c5cd1b1db116d4eb3850744d3 f89649803591f77c5cd1b1db116d4eb3850744d3 2008-07-16T18:09:15-07:00 2008-07-16T18:09:15-07:00 Fixing that I actually need autoloading for un-uglyness... using spl_autoload_register 754a42e31c7a6bb2d3e801d0656a2583bbf2ac8b Greg McWhirter greg@hallofkvasir.org