Minahito
minah****@users*****
2006年 10月 15日 (日) 01:00:51 JST
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.1 Sat Oct 14 23:55:23 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php Sun Oct 15 01:00:51 2006
@@ -2,7 +2,7 @@
if (!defined('XOOPS_ROOT_PATH')) exit();
-require_once XOOPS_BASE_PATH."/admin/class/AbstractModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH."/admin/class/AbstractModuleInstaller.class.php";
class Legacy_ModuleUninstaller extends Legacy_AbstractModuleInstaller
{
@@ -35,12 +35,12 @@
$module =& $moduleHandler->getByDirname($dirname);
if (!is_object($module)) {
- $this->mLog->addError(_AD_BASE_ERROR_MODULE_NOT_FOUND);
+ $this->mLog->addError(_AD_LEGACY_ERROR_MODULE_NOT_FOUND);
return $error;
}
if ($module->getVar('isactive') != 0) {
- $this->mLog->addError(_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE);
+ $this->mLog->addError(_AD_LEGACY_ERROR_CASE_OF_ACTIVE_MODULE);
return $error;
}
@@ -54,10 +54,10 @@
{
$moduleHandler =& xoops_gethandler('module');
if (!$moduleHandler->delete($this->mModule)) {
- $this->mLog->addError(_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB);
+ $this->mLog->addError(_AD_LEGACY_ERROR_DELETE_MODULEINFO_FROM_DB);
}
else {
- $this->mLog->addReport(_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB);
+ $this->mLog->addReport(_AD_LEGACY_MESSAGE_DELETE_MODULEINFO_FROM_DB);
}
}
@@ -77,10 +77,10 @@
//
$sql = "DROP TABLE " . $db->prefix($table);
if ($db->query($sql)) {
- $log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_DROP_TABLE, $db->prefix($table)));
+ $log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($table)));
}
else {
- $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_DROP_TABLE, $db->prefix($table)));
+ $log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($table)));
}
}
}
@@ -97,7 +97,7 @@
foreach($deleteTemplates as $tpl) {
if (!$tplHandler->delete($tpl)) {
- $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
+ $log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
}
}
}
@@ -115,7 +115,7 @@
$gpermHandler =& xoops_gethandler('groupperm');
foreach ($blocks as $block) {
$blockHandler->delete($block);
- $this->mLog->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED, $block->get('name')));
+ $this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED, $block->get('name')));
//
// delete permission
@@ -130,7 +130,7 @@
$tplHandler =& xoops_gethandler('tplfile');
$criteria =& new Criteria('tpl_module', $this->mModule->getVar('dirname'));
if(!$tplHandler->deleteAll($criteria)) {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
+ $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
}
}
@@ -147,7 +147,7 @@
$funcName = 'xoops_module_uninstall_' . $module->getVar('dirname');
if (function_exists($funcName)) {
if (!call_user_func($funcName, $module)) {
- $log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+ $log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
}
}
}
@@ -156,14 +156,14 @@
function _processReport()
{
if (!$this->mLog->hasError()) {
- $this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+ $this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
}
else {
if (is_object($this->mModule)) {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+ $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
}
else {
- $this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname));
+ $this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname));
}
}
}