Minahito
minah****@users*****
2006年 7月 27日 (木) 18:29:31 JST
Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.53 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.54
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.53 Thu Jul 27 15:53:12 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Thu Jul 27 18:29:30 2006
@@ -740,41 +740,33 @@
}
}
- function &_createEventManager()
- {
- $manager=&parent::_createEventManager();
-
- require_once XOOPS_ROOT_PATH."/modules/base/kernel/MiscEventFunctions.class.php";
- $manager->setAnchorDelegate("Legacypage.Misc.Access", new XCube_Delegate("Legacy_MiscEventFunction","AccessToMisc"));
-
- require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_EventFunctions.class.php";
- $manager->setAnchorDelegate("Legacypage.Imagemanager.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToImageManager"));
- $manager->setAnchorDelegate("Legacypage.Backend.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToBackend"));
- $manager->setAnchorDelegate("Legacypage.Search.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToSearch"));
-
- return $manager;
- }
-
function &_createDelegateManager()
{
- $manager =& parent::_createDelegateManager();
+ $delegateManager =& parent::_createDelegateManager();
- $manager->add('Legacypage.Notifications.Access', 'Legacy_NotificationFunctions::notifications', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
- $manager->add('Legacyfunction.Notificatins.Select', 'Legacy_NotificationFunctions::notifications_select', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
+ $file = XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_EventFunctions.class.php";
- return $manager;
+ $delegateManager->add('Legacypage.Notifications.Access', 'Legacy_EventFunction::notifications', $file);
+ $delegateManager->add('Legacyfunction.Notificatins.Select', 'Legacy_EventFunction::notifications_select', $file);
+ $delegateManager->add('Legacypage.Search.Access', 'Legacy_EventFunction::search', $file);
+ $delegateManager->add('Legacypage.Imagemanager.Access', 'Legacy_EventFunction::imageManager', $file);
+ $delegateManager->add('Legacypage.Backend.Access', 'Legacy_EventFunction::backend', $file);
+ $delegateManager->add('Legacypage.Misc.Access', 'Legacy_EventFunction::misc', $file);
+
+ return $delegateManager;
}
function &_createServiceManager()
{
- $manager =& parent::_createServiceManager();
+ $serviceManager =& parent::_createServiceManager();
require_once XOOPS_ROOT_PATH . "/modules/base/service/LegacySearchService.class.php";
- $service =& new LegacySearchService();
- $manager->addXCubeService("LegacySearch", $service);
- unset($service);
+ $searchService =& new Legacy_SearchService();
+ $searchService->prepare();
+
+ $serviceManager->addService('LegacySearch', $searchService);
- return $manager;
+ return $serviceManager;
}
/**