Minahito
minah****@users*****
2006年 8月 1日 (火) 19:33:47 JST
Index: xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php:1.1.2.2 Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/InstallWizardAction.class.php Tue Aug 1 19:33:47 2006
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Id: InstallWizardAction.class.php,v 1.1.2.2 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: InstallWizardAction.class.php,v 1.1.2.3 2006/08/01 10:33:47 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -38,9 +38,12 @@
$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
$language = $root->mController->getConfig('language');
- $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file;
+ //
+ // TODO Replace with language manager.
+ //
+ $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->get('dirname') ."/language/" . $language . "/" . $file;
if (!file_exists($path)) {
- $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "pm/language/english/" . $file;
+ $path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->get('dirname') . "/language/english/" . $file;
if (!file_exists($path)) {
return;
}
@@ -49,21 +52,21 @@
$this->mLicenceText = file_get_contents($path);
}
- function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+ function executeViewSuccess(&$controller, &$xoopsUser, &$render)
{
- $renderer->setTemplateName("module_install_success.html");
- $renderer->setAttribute('log', $this->mLog->mMessages);
+ $render->setTemplateName("module_install_success.html");
+ $render->setAttribute('log', $this->mLog->mMessages);
}
- function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+ function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
{
- $renderer->setAttribute('module', $this->mModuleObject);
- $renderer->setAttribute('actionForm', $this->mActionForm);
+ $render->setAttribute('module', $this->mModuleObject);
+ $render->setAttribute('actionForm', $this->mActionForm);
if (isset($this->mModuleObject->modinfo['installer'])) {
- $renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
- $renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
- $renderer->setTemplateName("install_wizard.html");
+ $render->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
+ $render->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
+ $render->setTemplateName("install_wizard.html");
}
else {
$controller->executeForward("index.php?action=ModuleInstall&dirname=" . $this->mModuleObject->get('dirname'));