Minahito
minah****@users*****
2006年 8月 9日 (水) 13:31:08 JST
Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ <?php /** * @package Legacy - * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.7 2006/08/07 11:28:29 minahito Exp $ + * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.8 2006/08/09 04:31:08 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -48,16 +48,16 @@ function executeViewSuccess(&$controller, &$xoopsUser, &$renderer) { if (!$this->mLog->hasError()) { - $this->mUpdateSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mUpdateSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mUpdateFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mUpdateFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_update_success.html"); - $renderer->setAttribute('module', $this->mLog->mModuleObject); + $renderer->setAttribute('module', $this->mModuleObject); $renderer->setAttribute('log', $this->mLog->mMessages); } Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.12 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.13 --- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.12 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ <?php /** * @package Legacy - * @version $Id: ModuleInstallAction.class.php,v 1.1.2.12 2006/08/07 11:28:29 minahito Exp $ + * @version $Id: ModuleInstallAction.class.php,v 1.1.2.13 2006/08/09 04:31:08 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -54,16 +54,16 @@ function executeViewSuccess(&$controller,&$xoopsUser,&$renderer) { if (!$this->mLog->hasError()) { - $this->mInstallSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mInstallSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mInstallFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mInstallFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_install_success.html"); - $renderer->setAttribute('module', $this->mLog->mModuleObject); + $renderer->setAttribute('module', $this->mModuleObject); $renderer->setAttribute('log', $this->mLog->mMessages); } Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.8 --- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.7 Mon Aug 7 20:28:29 2006 +++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php Wed Aug 9 13:31:08 2006 @@ -1,7 +1,7 @@ <?php /** * @package Legacy - * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.7 2006/08/07 11:28:29 minahito Exp $ + * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.8 2006/08/09 04:31:08 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -51,12 +51,12 @@ function executeViewSuccess(&$controller, &$xoopsUser, &$renderer) { if (!$this->mLog->hasError()) { - $this->mUninstallSuccess->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject)); + $this->mUninstallSuccess->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } else { - $this->mUninstallFail->call(new XCube_Ref($this->mModuleObject)); - XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject)); + $this->mUninstallFail->call(new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); + XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject), new XCube_Ref($this->mLog)); } $renderer->setTemplateName("module_uninstall_success.html");