[Phpcms-plugins-cvs] admin4phpCMS/include class.eventhandler.php,1.5,1.6 class.framework.php,1.6,1.7

[Martin J. <mj...@us...>]

Update of /cvsroot/phpcms-plugins/admin4phpCMS/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28241/include

Modified Files:
	class.eventhandler.php class.framework.php 
Log Message:
module filemanager and editor included


Index: class.framework.php
===================================================================
RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.framework.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- class.framework.php	4 Jun 2004 11:32:07 -0000	1.6
+++ class.framework.php	18 Jun 2004 15:16:59 -0000	1.7
@@ -34,6 +34,9 @@
 
 /*
 * $Log$
+* Revision 1.7  2004/06/18 15:16:59  mjahn
+* module filemanager and editor included
+*
 * Revision 1.6  2004/06/04 11:32:07  mjahn
 * several changes
 *
@@ -49,7 +52,6 @@
 /**
 * include the necessary files
 **/
-include_once (dirname(__FILE__).'/class.actionhandler.php');
 include_once (dirname(__FILE__).'/class.eventhandler.php');
 include_once (dirname(__FILE__).'/class.module.php');
 
@@ -60,7 +62,7 @@
 	
 	function run () {
 		global $ACTION;
-		$this->eventhandler =& new eventHandler (new actionHandler ());
+		$this->eventhandler =& new eventHandler ();
 		
 		// register some necessary events and actions
 		$actiondata = array ('actionname'=>'doLoadModule', 'class'=>'actionHandler', 'method'=>'loadModule');

Index: class.eventhandler.php
===================================================================
RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/include/class.eventhandler.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- class.eventhandler.php	4 Jun 2004 11:32:07 -0000	1.5
+++ class.eventhandler.php	18 Jun 2004 15:16:59 -0000	1.6
@@ -30,6 +30,9 @@
 
 /*
 * $Log$
+* Revision 1.6  2004/06/18 15:16:59  mjahn
+* module filemanager and editor included
+*
 * Revision 1.5  2004/06/04 11:32:07  mjahn
 * several changes
 *
@@ -41,6 +44,10 @@
 *
 */
 /**
+* include the actionhandler-class
+**/
+include_once (dirname(__FILE__).'/class.actionhandler.php');
+/**
 * eventhandler-class
 *
 * The eventhandler-class hides the managment of the events and correspondending action from the framework
@@ -63,8 +70,8 @@
 	* @param actionhandler $actionhandler saves the reference to the actionhandler-object
 	* @ignore
 	**/
-	function eventHandler (&$actionhandler) {
-		return $this->__construct ($actionhandler);
+	function eventHandler () {
+		return $this->__construct ();
 	}
 
 	/**
@@ -73,8 +80,8 @@
 	* @param actionhandler $actionhandler referenze to the actionhandler-object
 	* @ignore
 	**/
-	function __construct (&$actionhandler) {
-		$this->_actionHandler =& $actionhandler;
+	function __construct () {
+		$this->_actionHandler =& new actionHandler ();
 		$this->_events['REGISTER_ACTION'] = 'doRegisterAction';
 		$this->_events['REGISTER_EVENT'] = 'doRegisterEvent';
 		$this->_actionHandler->_objects['eventHandler'] =& $this;