Minahito
minah****@users*****
2006年 7月 31日 (月) 19:02:17 JST
Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.13 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.14
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.13 Thu Jul 20 17:10:57 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php Mon Jul 31 19:02:17 2006
@@ -1,7 +1,7 @@
<?php
/**
* @package XCube
- * @version $Id: XCube_Controller.class.php,v 1.1.2.13 2006/07/20 08:10:57 minahito Exp $
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.14 2006/07/31 10:02:17 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -9,8 +9,6 @@
require_once XOOPS_ROOT_PATH . "/class/XCube_ActionFilter.class.php";
require_once XOOPS_ROOT_PATH . "/class/XCube_BlockProcedure.class.php";
require_once XOOPS_ROOT_PATH . "/class/XCube_RenderSystem.class.php";
-require_once XOOPS_ROOT_PATH . "/class/XCube_EventArgs.class.php";
-
require_once XOOPS_ROOT_PATH . "/kernel/XCube_Delegate.class.php";
/**
@@ -81,7 +79,6 @@
{
$this->mRoot=&$root;
- $this->mRoot->setEventManager($this->_createEventManager());
$this->mRoot->setDelegateManager($this->_createDelegateManager());
$this->mRoot->setServiceManager($this->_createServiceManager());
}
@@ -219,14 +216,6 @@
function _setupUser()
{
- $eventManager=&$this->mRoot->getEventManager();
- if($eventManager!=null) {
- $eventArgs= new LoginEventArgs();
- $eventManager->raiseEvent("Site.Login",$this,$eventArgs);
-
- if($eventArgs->hasUser())
- $this->mUser=&$eventArgs->getUser();
- }
}
function _setupModuleController()
@@ -335,13 +324,6 @@
}
}
- function &_createEventManager()
- {
- require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
- $eventManager=new XCube_EventManager();
- return $eventManager;
- }
-
/**
* Create an instance of delegate manager and return it.
*
@@ -355,8 +337,8 @@
function &_createServiceManager()
{
- require_once XOOPS_ROOT_PATH."/class/XCube_ServiceManager.class.php";
- $serviceManager=new XCube_ServiceManager();
+ require_once XOOPS_ROOT_PATH . "/class/XCube_ServiceManager.class.php";
+ $serviceManager =& new XCube_ServiceManager();
return $serviceManager;
}