[Phpcms-plugins-cvs] admin4phpCMS/include class.actionhandler.php,1.1,1.2 class.eventhandler.php,1.1
Brought to you by:
mjahn
From: Martin J. <mj...@us...> - 2004-05-26 11:26:13
|
Update of /cvsroot/phpcms-plugins/admin4phpCMS/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv597/include Modified Files: class.actionhandler.php class.eventhandler.php class.framework.php class.module.php Log Message: restructured directory module/ Index: class.module.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.module.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- class.module.php 21 May 2004 19:50:29 -0000 1.1 +++ class.module.php 26 May 2004 11:25:59 -0000 1.2 @@ -11,17 +11,17 @@ } function __registerEvent ($eventname, $eventaction) { - $this->__callEvent ('REGISTER_EVENT', array ('eventname'=>$eventname, 'eventaction'=>$eventaction,)); + $actiondata = array ('eventname'=>$eventname, 'eventaction'=>$eventaction); + $this->__callEvent ('REGISTER_EVENT', $actiondata); } - function __callEvent ($eventname, $actiondata) { - global $ACTION; - $ACTION = $actiondata; - $this->_event->event ($eventname); + function &__callEvent ($eventname, &$actiondata) { + return $this->_event->event ($eventname, $actiondata); } - function __registerAction ($actionname, $method) { - $this->__callEvent ('REGISTER_ACTION', array ('actionname'=>$actionname, 'class'=>get_class($this), 'method'=>$method)); + function &__registerAction ($actionname, $method) { + $actiondata = array ('actionname'=>$actionname, 'class'=>get_class($this), 'method'=>$method); + return $this->__callEvent ('REGISTER_ACTION', $actiondata); } } Index: class.actionhandler.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.actionhandler.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- class.actionhandler.php 21 May 2004 19:50:29 -0000 1.1 +++ class.actionhandler.php 26 May 2004 11:25:59 -0000 1.2 @@ -26,20 +26,16 @@ } function __construct () { - // register my own classname with the object $this - $this->objects['actionHandler'] = &$this; + // register my own classname with a reference to $this + $this->objects['actionHandler'] =& $this; $this->actions['doRegisterAction'] = array('actionHandler'=>'registerAction'); } - function action ($actionname, $actiondata = null) { + function &action ($actionname, &$actiondata) { if (!isset($this->actions[$actionname])) { return false; } - if ($actiondata === null) { - global $ACTION; - $actiondata = $ACTION; - } reset ($this->actions[$actionname]); foreach ($this->actions[$actionname] as $actionclass => $actionmethod ) { $object =& $this->__getInstance($actionclass); @@ -49,7 +45,7 @@ return true; } - function registerAction ($actiondata) { + function ®isterAction (&$actiondata) { $actionname = $actiondata['actionname']; $actionclass = $actiondata['class']; $actionmethod = $actiondata['method']; @@ -57,8 +53,7 @@ return true; } - function loadModule ($actiondata) { - echo '<p>actionHandler::loadModule ('.$actiondata['filename'].', '.$actiondata['class'].')</p>'; + function &loadModule (&$actiondata) { $modulefile = $actiondata['filename']; $moduleclass = $actiondata['class']; @@ -67,22 +62,24 @@ } if (!file_exists ($modulefile)) { + $actiondata = array ('errortext'=>'Modul '.$moduleclass.' konnte nicht unter '.$modulefile.' geladen werden!', 'type'=>'abort'); + $this->objects['eventHandler']->event ('ERROR_ABORT', $actiondata); return false; } - @include_once ($modulefile); + @require_once ($modulefile); - $this->objects[$moduleclass] = &$this->__getInstance ($moduleclass); + $this->objects[$moduleclass] =& $this->__getInstance ($moduleclass); return true; } - function &__getInstance ($classname) { + function &__getInstance (&$classname) { if (isset ($this->objects[$classname])) { return $this->objects[$classname]; } if (!class_exists($classname)) { - $ACTION = array ('errortext'=>'Klasse '.$classname.' existiert nicht!', 'type'=>'abort'); - $this->objects['eventHandler']->event ('ERROR_ABORT'); + $actiondata = array ('errortext'=>'Klasse '.$classname.' existiert nicht!', 'type'=>'abort'); + $this->objects['eventHandler']->event ('ERROR_ABORT', $actiondata); return false; } $obj =& new $classname ($this->objects['eventHandler']); Index: class.framework.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.framework.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- class.framework.php 21 May 2004 19:50:29 -0000 1.1 +++ class.framework.php 26 May 2004 11:25:59 -0000 1.2 @@ -6,24 +6,21 @@ class framework { - var $configfile; - function run () { global $ACTION; $this->eventhandler =& new eventHandler (new actionHandler ()); - $ACTION = array ('actionname'=>'doLoadModule', 'class'=>'actionHandler', 'method'=>'loadModule'); - $this->eventhandler->event ('REGISTER_ACTION'); - $ACTION = array ('eventname'=>'LOAD_MODULE', 'eventaction'=>'doLoadModule'); - $this->eventhandler->event ('REGISTER_EVENT'); - - $this->configfile = realpath (dirname (__FILE__).'/../config.xml'); + $actiondata = array ('actionname'=>'doLoadModule', 'class'=>'actionHandler', 'method'=>'loadModule'); + $this->eventhandler->event ('REGISTER_ACTION', $actiondata); + $actiondata = array ('eventname'=>'LOAD_MODULE', 'eventaction'=>'doLoadModule'); + $this->eventhandler->event ('REGISTER_EVENT', $actiondata); - $ACTION = array ('filename'=>dirname(__FILE__).'/../modules/class.module_config.php', 'class'=>'module_config'); - $this->eventhandler->event ('LOAD_MODULE'); + $configfile = realpath (dirname (__FILE__).'/../config.xml'); - $ACTION = array ('configfile'=>$this->configfile); - $this->eventhandler->event ('READ_CONFIG'); + $actiondata = array ('filename'=>dirname(__FILE__).'/../modules/config/class.module_config.php', 'class'=>'module_config'); + $this->eventhandler->event ('LOAD_MODULE', $actiondata); + $actiondata = array ('configfile'=>$configfile); + $this->eventhandler->event ('CONFIG_READ', $actiondata); } } Index: class.eventhandler.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.eventhandler.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- class.eventhandler.php 21 May 2004 19:50:29 -0000 1.1 +++ class.eventhandler.php 26 May 2004 11:25:59 -0000 1.2 @@ -9,16 +9,16 @@ } function __construct (&$actionhandler) { - global $ACTION; $this->actionHandler =& $actionhandler; $this->events['REGISTER_ACTION'] = 'doRegisterAction'; $this->events['REGISTER_EVENT'] = 'doRegisterEvent'; $this->actionHandler->objects['eventHandler'] =& $this; - $ACTION = array ('actionname'=>'doRegisterEvent', 'class'=>'eventHandler', 'method'=>'registerEvent'); - return $this->event('REGISTER_ACTION'); + $actiondata = array ('actionname'=>'doRegisterEvent', 'class'=>'eventHandler', 'method'=>'registerEvent'); + return $this->event('REGISTER_ACTION', $actiondata); } - - function event ($eventname, $actiondata = null) { + + function &event ($eventname, &$actiondata) { + echo '<p>Event: '.$eventname.'</p>'; if (!isset($this->events[$eventname])) { return false; } @@ -27,7 +27,7 @@ return $this->actionHandler->action($action, $actiondata); } - function registerEvent ($actiondata) { + function ®isterEvent (&$actiondata) { $eventname = $actiondata['eventname']; $eventaction = $actiondata['eventaction']; if (isset($this->events[$eventname])) { |