[xoops-cvslog 1944] CVS update: xoops2jp/html/modules/base/admin/actions

Back to archive index

Minahito minah****@users*****
2006年 1月 26日 (木) 01:18:51 JST


Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH."/admin/class/ModuleUninstaller.class.php";
+
+/**
+ * Uninstall module
+ */
+class Legacy_ModuleUninstallAction extends Legacy_AbstractModuleInstallAction
+{
+	function &_getInstaller($dirname)
+	{
+		$installer =& new Legacy_ModuleUninstaller($dirname);
+		return $installer;
+	}
+
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_uninstall_success.html");
+		$renderer->setAttribute('log',$this->mLog->mMessages);
+	}
+
+	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_uninstall_confirm.html");
+		$renderer->setAttribute('module',$this->mModuleObject);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH."/admin/class/ModuleInstaller.class.php";
+
+/**
+ * Install module
+ */
+class Legacy_ModuleInstallAction extends Legacy_AbstractModuleInstallAction
+{
+	var $mLicence;
+	var $mLicenceText;
+
+	function &_getInstaller($dirname)
+	{
+		$installer =& new Legacy_ModuleInstaller($dirname);
+		return $installer;
+	}
+
+	function _loadAgreement()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$this->mLicence = $this->mModuleObject->modinfo['installer']['licence']['title'];
+
+		$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
+		$language = $root->mController->getConfig('language');
+
+		$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file;
+		if (!file_exists($path)) {
+			$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "pm/language/english/" . $file;
+			if (!file_exists($path)) {
+				return;
+			}
+		}
+
+		$this->mLicenceText = file_get_contents($path);
+	}
+	
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_install_success.html");
+		$renderer->setAttribute('log', $this->mLog->mMessages);
+	}
+
+	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setAttribute('module', $this->mModuleObject);
+
+		if (isset($this->mModuleObject->modinfo['installer'])) {
+			$renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
+			$renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
+			$renderer->setTemplateName("module_installer.html");
+		}
+		else {
+			$renderer->setTemplateName("module_install_confirm.html");
+		}
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("module_installer_licence.html");
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('licence', $this->mLicence);
+		$renderer->setAttribute('licenceText', $this->mLicenceText);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleDeactiveListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleDeactiveListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/LegacyModuleDeactiveListAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleDeactiveListAction.class.php:1.1.2.1	Fri Dec 16 18:50:52 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleDeactiveListAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,34 +0,0 @@
-<?php
-
-require_once XOOPS_BASE_PATH."/admin/class/DeactiveModuleHandler.class.php";
-
-/**
- * List up modules that are not installed yet.
- */
-class LegacyModuleDeactiveListAction extends LegacyAdminAction
-{
-	var $mModuleObjects = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-	}
-	
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		
-		$db =& $controller->getDB();
-		$handler = new Legacy_DeactiveModuleHandler($db);
-		
-		$this->mModuleObjects =& $handler->getObjects();
-		
-		return LEGACY_ADMIN_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
-	{
-		$renderer->setTemplateName("deactive_module_list.html");
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleUninstallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyModuleUninstallAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleUninstallAction.class.php:1.1.2.2	Thu Dec 29 16:24:46 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleUninstallAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,33 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyModuleUninstallAction.class.php,v 1.1.2.2 2005/12/29 07:24:46 minahito Exp $
- */
-
-require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_BASE_PATH."/admin/class/ModuleUninstaller.class.php";
-
-/**
- * Uninstall module
- */
-class LegacyModuleUninstallAction extends Legacy_AbstractModuleInstallAction
-{
-	function &_getInstaller($dirname)
-	{
-		$installer =& new Legacy_ModuleUninstaller($dirname);
-		return $installer;
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_uninstall_success.html");
-		$renderer->setAttribute('log',$this->mLog->mMessages);
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_uninstall_confirm.html");
-		$renderer->setAttribute('module',$this->mModuleObject);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @version $Id: ModuleInfoAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+/**
+ * This action will show the information of a module specified to user.
+ */
+class Legacy_ModuleInfoAction extends Legacy_Action
+{
+	/**
+	 * XoopsModule instance specified.
+	 */
+	var $mModuleObject = null;
+	var $mInstalledFlag = false;
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$dirname = $_GET['dirname'];
+		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+
+		if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+
+		$moduleHandler =& xoops_gethandler('module');
+		$this->mModuleObject =& $moduleHandler->getByDirname($dirname);
+
+		//
+		// If a module is installed, load modinfo and go to special displaying.
+		//
+		if (is_object($this->mModuleObject)) {
+			$this->mModuleObject->loadAdminMenu();
+			$this->mModuleObject->loadInfo($dirname);
+			$this->mInstalledFlag = true;
+		}
+		else {
+			$this->mModuleObject =& $moduleHandler->create();
+			$this->mModuleObject->loadInfoAsVar($dirname);
+			$this->mInstalledFlag = false;
+		}
+
+		return LEGACY_FRAME_VIEW_SUCCESS;
+	}
+	
+	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("module_information.html");
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('installed', $this->mInstalledFlag);
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$renderer)
+	{
+		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*Module not found*");
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleInstallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyModuleInstallAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleInstallAction.class.php:1.1.2.2	Thu Dec 29 16:24:46 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleInstallAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,72 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyModuleInstallAction.class.php,v 1.1.2.2 2005/12/29 07:24:46 minahito Exp $
- */
-
-require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_BASE_PATH."/admin/class/ModuleInstaller.class.php";
-
-/**
- * Install module
- */
-class LegacyModuleInstallAction extends Legacy_AbstractModuleInstallAction
-{
-	var $mLicence;
-	var $mLicenceText;
-
-	function &_getInstaller($dirname)
-	{
-		$installer =& new Legacy_ModuleInstaller($dirname);
-		return $installer;
-	}
-
-	function _loadAgreement()
-	{
-		$root =& XCube_Root::getSingleton();
-		
-		$this->mLicence = $this->mModuleObject->modinfo['installer']['licence']['title'];
-
-		$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
-		$language = $root->mController->getConfig('language');
-
-		$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file;
-		if (!file_exists($path)) {
-			$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "pm/language/english/" . $file;
-			if (!file_exists($path)) {
-				return;
-			}
-		}
-
-		$this->mLicenceText = file_get_contents($path);
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_install_success.html");
-		$renderer->setAttribute('log', $this->mLog->mMessages);
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setAttribute('module', $this->mModuleObject);
-
-		if (isset($this->mModuleObject->modinfo['installer'])) {
-			$renderer->setAttribute('image', $this->mModuleObject->modinfo['installer']['image']);
-			$renderer->setAttribute('description', $this->mModuleObject->modinfo['installer']['description']);
-			$renderer->setTemplateName("module_installer.html");
-		}
-		else {
-			$renderer->setTemplateName("module_install_confirm.html");
-		}
-	}
-
-	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
-	{
-		$renderer->setTemplateName("module_installer_licence.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('licence', $this->mLicence);
-		$renderer->setAttribute('licenceText', $this->mLicenceText);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+require_once XOOPS_BASE_PATH."/admin/forms/ModuleListFilterForm.class.php";
+require_once XOOPS_BASE_PATH."/admin/forms/ModuleSettingsForm.class.php";
+
+class Legacy_ModuleListAction extends Legacy_Action
+{
+	var $mDB=null;
+	var $mModuleObjects=array();
+	var $mFilter=null;
+	var $mForm=null;
+
+	function prepare(&$controller,&$xoopsUser)
+	{
+		$this->mDB=&$controller->getDB();
+	}
+
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		$this->mFilter=new ModuleListFilterForm();
+		$this->mFilter->fetch();
+		
+		$moduleHandler=&xoops_gethandler('module');
+
+		// dmy
+		$criteria=new Criteria('mid',0,'>');
+		$criteria->setSort($this->mFilter->getSort());
+		$criteria->setOrder($this->mFilter->getOrder());
+		
+		$this->mModuleObjects=&$moduleHandler->getObjects($criteria);
+
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+	
+	function execute(&$controller,&$xoopsUser)
+	{
+		$moduleHandler=&xoops_gethandler('module');
+		$objests=$moduleHandler->getObjects();
+
+		$this->mForm=new ModuleSettingsForm();
+		$this->mForm->prepare();
+		
+		$this->mForm->fetch();
+		$this->mForm->validate();
+
+		if($this->mForm->hasError() || !isset($_POST['dummy_ticket'])) {
+			return $this->_processConfirm($controller,$xoopsUser);
+		}
+		else {
+			return $this->_processSave($controller,$xoopsUser);
+		}
+
+	}
+	
+	function _processConfirm(&$controller,&$xoopsUser)
+	{
+		$moduleHandler=&xoops_gethandler('module');
+		$objests=$moduleHandler->getObjects();
+
+		//
+		// Do mapping.
+		//
+		foreach($objests as $modObject) {
+			$this->mModuleObjects[$modObject->getVar('mid')]=&$modObject;
+			unset($modObject);
+		}
+
+		return LEGACY_FRAME_VIEW_INPUT;
+	}
+
+	function _processSave(&$controller,&$xoopsUser)
+	{
+		$moduleHandler=&xoops_gethandler('module');
+		$objects=$moduleHandler->getObjects();
+		
+		$successFlag=true;
+		foreach($objects as $modObject) {
+			$mid=$modObject->getVar('mid');
+			$modObject->setVar('name',$this->mForm->getVar('name',$mid));
+			$modObject->setVar('weight',$this->mForm->getVar('weight',$mid));
+			$modObject->setVar('isactive',$this->mForm->getVar('isactive',$mid));
+
+			//
+			// Store.
+			//
+			$successFlag&=$moduleHandler->insert($modObject);
+		}
+		
+		return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
+	}
+
+	/**
+	 * To support a template writer, this send the list of mid that actionForm kept.
+	 */
+	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("modulelist_confirm.html");
+		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
+		$renderer->setAttribute('actionForm',$this->mForm);
+		
+		//
+		// To support a template writer, this send the list of mid that
+		// actionForm kept.
+		//
+		$tarray=&$this->mForm->getVar('name');
+		$renderer->setAttribute('mids',array_keys($tarray));
+	}
+
+	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_list.html");
+
+		//
+		// Load adminmenu before we assign these to template.
+		//
+		foreach(array_keys($this->mModuleObjects) as $key) {
+			$this->mModuleObjects[$key]->loadAdminMenu();
+			$this->mModuleObjects[$key]->loadInfo($this->mModuleObjects[$key]->getVar('dirname'));
+		}
+
+		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
+	}
+
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	{
+		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*SUCCESS*");
+	}
+
+	function executeViewError(&$controller,&$xoopsUser,&$renderer)
+	{
+		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*ERROR*");
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleInfoAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleInfoAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyModuleInfoAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleInfoAction.class.php:1.1.2.2	Wed Dec 21 13:08:12 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleInfoAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,61 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyModuleInfoAction.class.php,v 1.1.2.2 2005/12/21 04:08:12 minahito Exp $
- */
-
-/**
- * This action will show the information of a module specified to user.
- */
-class LegacyModuleInfoAction extends LegacyAdminAction
-{
-	/**
-	 * XoopsModule instance specified.
-	 */
-	var $mModuleObject = null;
-	var $mInstalledFlag = false;
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$dirname = $_GET['dirname'];
-		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
-		}
-
-		if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
-		}
-
-		$moduleHandler =& xoops_gethandler('module');
-		$this->mModuleObject =& $moduleHandler->getByDirname($dirname);
-
-		//
-		// If a module is installed, load modinfo and go to special displaying.
-		//
-		if (is_object($this->mModuleObject)) {
-			$this->mModuleObject->loadAdminMenu();
-			$this->mModuleObject->loadInfo($dirname);
-			$this->mInstalledFlag = true;
-		}
-		else {
-			$this->mModuleObject =& $moduleHandler->create();
-			$this->mModuleObject->loadInfoAsVar($dirname);
-			$this->mInstalledFlag = false;
-		}
-
-		return LEGACY_ADMIN_FRAME_VIEW_SUCCESS;
-	}
-	
-	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
-	{
-		$renderer->setTemplateName("module_information.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('installed', $this->mInstalledFlag);
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$renderer)
-	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*Module not found*");
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php:1.1.2.4	Fri Dec 30 17:22:57 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyHelpAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,130 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyHelpAction.class.php,v 1.1.2.4 2005/12/30 08:22:57 minahito Exp $
- */
-
-/**
- * This class extends Smarty to mediate the collision compiled file name.
- */
-class Legacy_HelpSmarty extends Smarty
-{
-	var $mDirname = null;
-	var $mModuleObject = null;
-	var $mFilename = null;
-
-	function Legacy_HelpSmarty()
-	{
-		parent::Smarty();
-
-		$this->compile_id = null;
-		$this->_canUpdateFromFile = true;
-		$this->compile_check = true;
-		$this->compile_dir = XOOPS_COMPILE_PATH;
-		$this->left_delimiter = "<{";
-		$this->right_delimiter = "}>";
-
-		$this->register_modifier("helpurl", "Legacy_modifier_helpurl");
-	}
-	
-	function setDirname($dirname)
-	{
-		$this->mDirname = $dirname;
-	}
-
-	function _get_auto_filename($autoBase, $autoSource = null, $auotId = null)
-	{
-		$autoSource = $this->mDirname . "_help_" . $autoSource;
-		return parent::_get_auto_filename($autoBase, $autoSource, $auotId);
-	}
-}
-
-function Legacy_modifier_helpurl($file)
-{
-	$root =& XCube_Root::getSingleton();
-	$modController =& $root->mController->getModuleController();
-	$moduleObject =& $modController->getXoopsModule();
-	
-	$language = $root->mController->getConfig('language');
-	$dirname = $moduleObject->getVar('dirname');
-
-	//
-	// TODO We should check file_exists.
-	//
-
-	$url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&amp;dirname=${dirname}&amp;file=${file}";
-
-	return $url;
-}
-
-/**
- * This action will show the information of a module specified to user.
- */
-class LegacyHelpAction extends LegacyAdminAction
-{
-	var $mModuleObject = null;
-	var $mContents = null;
-
-	var $mErrorMessage = null;
-	
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		//
-		// TODO We must change the following lines to ActionForm.
-		//
-		$dirname = $_GET['dirname'];
-		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
-		}
-
-		if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
-		}
-
-		$moduleHandler =& xoops_gethandler('module');
-		$this->mModuleObject =& $moduleHandler->getByDirname($dirname);
-		
-		$language =& $controller->getConfig('language');
-
-		//
-		// TODO We must change the following lines to ActionForm.
-		//
-		$helpfile = isset($_GET['file']) ? $_GET['file'] : $this->mModuleObject->getHelp();
-
-		//
-		// Smarty
-		//
-		$smarty =& new Legacy_HelpSmarty();
-		$smarty->setDirname($dirname);
-
-		//
-		// file check
-		//
-		$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/" . $language;
-		if (!file_exists($template_dir . "/" . $helpfile)) {
-			$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/english";
-			if (!file_exists($template_dir . "/" . $helpfile)) {
-				$this->mErrorMessage = _MD_A_BASE_ERROR_NO_HELP_FILE;
-				return LEGACY_ADMIN_FRAME_VIEW_ERROR;
-			}
-		}
-
-		$smarty->template_dir = $template_dir;
-		$this->mContents = $smarty->fetch("file:" . $helpfile);
-
-		return LEGACY_ADMIN_FRAME_VIEW_SUCCESS;
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
-	{
-		$renderer->setTemplateName("help.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('contents', $this->mContents);
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$renderer)
-	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, $this->mErrorMessage);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyActSearchAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyActSearchAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyActSearchAction.class.php:1.1.2.2	Thu Dec  1 01:02:16 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyActSearchAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,152 +0,0 @@
-<?php
-
-require_once XOOPS_BASE_PATH."/class/Legacy_ModuleAdapter.class.php";
-require_once XOOPS_BASE_PATH."/admin/forms/ActionSearchForm.class.php";
-
-class ActionSearchEventArgs
-{
-	var $mKeywords;
-	var $mRecords;
-
-	function ActionSearchEventArgs($words)
-	{
-		$this->setKeywords($words);
-	}
-	
-	function setKeywords($words)
-	{
-		foreach(explode(" ",$words) as $word) {
-			if(strlen($word)>0)
-				$this->mKeywords[]=$word;
-		}
-	}
-
-	function getKeywords()
-	{
-		return $this->mKeywords;
-	}
-
-	function addRecord($moduleName,$url,$title,$desc=null)
-	{
-		$this->mRecords[]=new ActionSearchRecord($moduleName,$url,$title,$desc);
-	}
-	
-	function &getRecords()
-	{
-		return $this->mRecords;
-	}
-	
-	/**
-	 * @return bool
-	 */
-	function hasRecord()
-	{
-		return count($this->mRecords)>0;
-	}
-}
-
-class ActionSearchRecord
-{
-	var $mModuleName;
-	var $mActionUrl;
-	var $mTitle;
-	var $mDescription;
-
-	function ActionSearchRecord($moduleName,$url,$title,$desc=null)
-	{
-		$this->mModuleName=$moduleName;
-		$this->mActionUrl=$url;
-		$this->mTitle=$title;
-		$this->mDescription=$desc;
-	}
-}
-
-class LegacyActSearchAction extends LegacyAdminAction
-{
-	var $mModules=array();
-	var $mModuleRecords=null;
-	var $mRecords=null;
-	var $mActionForm;
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		parent::prepare(&$controller,&$xoopsUser);
-
-		$db=&$controller->getDB();
-		//
-		// TODO : We don't use handler and write sql directly.
-		//
-		$sql = "SELECT {mod}.* FROM {mod},{perm} ".
-		        "WHERE {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ".
-		        "ORDER BY {mod}.weight";
-
-		$replaceMap=array("mod"=>$db->prefix("modules"),
-		                 "perm"=>$db->prefix("group_permission"),
-		                 "groups"=>implode(",",$xoopsUser->getGroups()));
-
-		$sql=XCube_Utils::formatMessageByMap($sql,$replaceMap);
-
-		$result=$db->query($sql);
-		while($row=$db->fetchArray($result)) {
-			$xoopsModule = new XoopsModule();
-			$xoopsModule->assignVars($row);
-
-			$adapter=new Legacy_ModuleAdapter($xoopsModule);
-			$adapter->prepareAdmin($controller);
-			
-			$this->mModules[]=&$adapter;
-
-			unset($xoopsModule);
-			unset($adapter);
-		}
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-		return LEGACY_ADMIN_FRAME_VIEW_INPUT;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-
-		if($this->mActionForm->hasError())
-			return LEGACY_ADMIN_FRAME_VIEW_INPUT;
-
-		$eventArgs=new ActionSearchEventArgs($this->mActionForm->getVar('keywords'));
-		$controller->mRoot->mEventManager->raiseEvent("Module.Admin.ActionSearch",$this,$eventArgs);
-
-		if($eventArgs->hasRecord()) {
-			$this->mRecords=&$eventArgs->getRecords();
-			return LEGACY_ADMIN_FRAME_VIEW_SUCCESS;
-		}
-		else {
-			return LEGACY_ADMIN_FRAME_VIEW_INPUT;
-		}
-	}
-	
-	function _processActionForm()
-	{
-		$this->mActionForm=new ActionSearchForm();
-		$this->mActionForm->prepare();
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_admin_actionsearch_success.html");
-		$renderSystem->setAttribute("records",$this->mRecords);
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("legacy_admin_actionsearch_input.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
+require_once XOOPS_BASE_PATH."/admin/class/ModuleUpdater.class.php";
+
+class Legacy_ModuleUpdateAction extends Legacy_AbstractModuleInstallAction
+{
+	function &_getInstaller($dirname)
+	{
+		$installer =& new Legacy_ModuleUpdater($dirname);
+		return $installer;
+	}
+
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_update_success.html");
+		$renderer->setAttribute('log',$this->mLog->mMessages);
+	}
+
+	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	{
+		$renderer->setTemplateName("module_update_confirm.html");
+		$renderer->setAttribute('module',$this->mModuleObject);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @version $Id: HelpAction.class.php,v 1.1.2.1 2006/01/25 16:18:51 minahito Exp $
+ */
+
+/**
+ * This class extends Smarty to mediate the collision compiled file name.
+ */
+class Legacy_HelpSmarty extends Smarty
+{
+	var $mDirname = null;
+	var $mModuleObject = null;
+	var $mFilename = null;
+
+	function Legacy_HelpSmarty()
+	{
+		parent::Smarty();
+
+		$this->compile_id = null;
+		$this->_canUpdateFromFile = true;
+		$this->compile_check = true;
+		$this->compile_dir = XOOPS_COMPILE_PATH;
+		$this->left_delimiter = "<{";
+		$this->right_delimiter = "}>";
+
+		$this->register_modifier("helpurl", "Legacy_modifier_helpurl");
+	}
+	
+	function setDirname($dirname)
+	{
+		$this->mDirname = $dirname;
+	}
+
+	function _get_auto_filename($autoBase, $autoSource = null, $auotId = null)
+	{
+		$autoSource = $this->mDirname . "_help_" . $autoSource;
+		return parent::_get_auto_filename($autoBase, $autoSource, $auotId);
+	}
+}
+
+function Legacy_modifier_helpurl($file)
+{
+	$root =& XCube_Root::getSingleton();
+	$modController =& $root->mController->getModuleController();
+	$moduleObject =& $modController->getXoopsModule();
+	
+	$language = $root->mController->getConfig('language');
+	$dirname = $moduleObject->getVar('dirname');
+
+	//
+	// TODO We should check file_exists.
+	//
+
+	$url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&amp;dirname=${dirname}&amp;file=${file}";
+
+	return $url;
+}
+
+/**
+ * This action will show the information of a module specified to user.
+ */
+class Legacy_HelpAction extends Legacy_Action
+{
+	var $mModuleObject = null;
+	var $mContents = null;
+
+	var $mErrorMessage = null;
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		//
+		// TODO We must change the following lines to ActionForm.
+		//
+		$dirname = $_GET['dirname'];
+		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+
+		if (!is_dir(XOOPS_MODULE_PATH . "/" . $dirname)) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+
+		$moduleHandler =& xoops_gethandler('module');
+		$this->mModuleObject =& $moduleHandler->getByDirname($dirname);
+		
+		$language =& $controller->getConfig('language');
+
+		//
+		// TODO We must change the following lines to ActionForm.
+		//
+		$helpfile = isset($_GET['file']) ? $_GET['file'] : $this->mModuleObject->getHelp();
+
+		//
+		// Smarty
+		//
+		$smarty =& new Legacy_HelpSmarty();
+		$smarty->setDirname($dirname);
+
+		//
+		// file check
+		//
+		$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/" . $language;
+		if (!file_exists($template_dir . "/" . $helpfile)) {
+			$template_dir = XOOPS_MODULE_PATH . "/" . $dirname . "/language/english";
+			if (!file_exists($template_dir . "/" . $helpfile)) {
+				$this->mErrorMessage = _MD_A_BASE_ERROR_NO_HELP_FILE;
+				return LEGACY_FRAME_VIEW_ERROR;
+			}
+		}
+
+		$smarty->template_dir = $template_dir;
+		$this->mContents = $smarty->fetch("file:" . $helpfile);
+
+		return LEGACY_FRAME_VIEW_SUCCESS;
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("help.html");
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('contents', $this->mContents);
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$renderer)
+	{
+		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, $this->mErrorMessage);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleUpdateAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyModuleUpdateAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleUpdateAction.class.php:1.1.2.2	Thu Dec 29 16:24:46 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleUpdateAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,33 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyModuleUpdateAction.class.php,v 1.1.2.2 2005/12/29 07:24:46 minahito Exp $
- */
-
-require_once XOOPS_BASE_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_BASE_PATH."/admin/class/ModuleUpdater.class.php";
-
-/**
- * ???????????????
- */
-class LegacyModuleUpdateAction extends Legacy_AbstractModuleInstallAction
-{
-	function &_getInstaller($dirname)
-	{
-		$installer =& new Legacy_ModuleUpdater($dirname);
-		return $installer;
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_update_success.html");
-		$renderer->setAttribute('log',$this->mLog->mMessages);
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_update_confirm.html");
-		$renderer->setAttribute('module',$this->mModuleObject);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,152 @@
+<?php
+
+require_once XOOPS_BASE_PATH."/class/Legacy_ModuleAdapter.class.php";
+require_once XOOPS_BASE_PATH."/admin/forms/ActionSearchForm.class.php";
+
+class ActionSearchEventArgs
+{
+	var $mKeywords;
+	var $mRecords;
+
+	function ActionSearchEventArgs($words)
+	{
+		$this->setKeywords($words);
+	}
+	
+	function setKeywords($words)
+	{
+		foreach(explode(" ",$words) as $word) {
+			if(strlen($word)>0)
+				$this->mKeywords[]=$word;
+		}
+	}
+
+	function getKeywords()
+	{
+		return $this->mKeywords;
+	}
+
+	function addRecord($moduleName,$url,$title,$desc=null)
+	{
+		$this->mRecords[]=new ActionSearchRecord($moduleName,$url,$title,$desc);
+	}
+	
+	function &getRecords()
+	{
+		return $this->mRecords;
+	}
+	
+	/**
+	 * @return bool
+	 */
+	function hasRecord()
+	{
+		return count($this->mRecords)>0;
+	}
+}
+
+class ActionSearchRecord
+{
+	var $mModuleName;
+	var $mActionUrl;
+	var $mTitle;
+	var $mDescription;
+
+	function ActionSearchRecord($moduleName,$url,$title,$desc=null)
+	{
+		$this->mModuleName=$moduleName;
+		$this->mActionUrl=$url;
+		$this->mTitle=$title;
+		$this->mDescription=$desc;
+	}
+}
+
+class Legacy_ActSearchAction extends Legacy_Action
+{
+	var $mModules=array();
+	var $mModuleRecords=null;
+	var $mRecords=null;
+	var $mActionForm;
+
+	function prepare(&$controller,&$xoopsUser)
+	{
+		parent::prepare(&$controller,&$xoopsUser);
+
+		$db=&$controller->getDB();
+		//
+		// TODO : We don't use handler and write sql directly.
+		//
+		$sql = "SELECT {mod}.* FROM {mod},{perm} ".
+		        "WHERE {mod}.mid={perm}.gperm_itemid AND {perm}.gperm_name='module_admin' AND {perm}.gperm_groupid IN ({groups}) ".
+		        "ORDER BY {mod}.weight";
+
+		$replaceMap=array("mod"=>$db->prefix("modules"),
+		                 "perm"=>$db->prefix("group_permission"),
+		                 "groups"=>implode(",",$xoopsUser->getGroups()));
+
+		$sql=XCube_Utils::formatMessageByMap($sql,$replaceMap);
+
+		$result=$db->query($sql);
+		while($row=$db->fetchArray($result)) {
+			$xoopsModule = new XoopsModule();
+			$xoopsModule->assignVars($row);
+
+			$adapter=new Legacy_ModuleAdapter($xoopsModule);
+			$adapter->prepareAdmin($controller);
+			
+			$this->mModules[]=&$adapter;
+
+			unset($xoopsModule);
+			unset($adapter);
+		}
+	}
+
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		$this->_processActionForm();
+		return LEGACY_FRAME_VIEW_INPUT;
+	}
+	
+	function execute(&$controller,&$xoopsUser)
+	{
+		$this->_processActionForm();
+
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+
+		if($this->mActionForm->hasError())
+			return LEGACY_FRAME_VIEW_INPUT;
+
+		$eventArgs=new ActionSearchEventArgs($this->mActionForm->getVar('keywords'));
+		$controller->mRoot->mEventManager->raiseEvent("Module.Admin.ActionSearch",$this,$eventArgs);
+
+		if($eventArgs->hasRecord()) {
+			$this->mRecords=&$eventArgs->getRecords();
+			return LEGACY_FRAME_VIEW_SUCCESS;
+		}
+		else {
+			return LEGACY_FRAME_VIEW_INPUT;
+		}
+	}
+	
+	function _processActionForm()
+	{
+		$this->mActionForm=new ActionSearchForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$renderSystem->setTemplateName("legacy_admin_actionsearch_success.html");
+		$renderSystem->setAttribute("records",$this->mRecords);
+		$renderSystem->setAttribute("actionForm",$this->mActionForm);
+	}
+
+	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
+	{
+		$renderSystem->setTemplateName("legacy_admin_actionsearch_input.html");
+		$renderSystem->setAttribute("actionForm",$this->mActionForm);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php:1.1.2.3	Wed Dec 28 22:52:16 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyModuleListAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,138 +0,0 @@
-<?php
-/**
- * @version $Id: LegacyModuleListAction.class.php,v 1.1.2.3 2005/12/28 13:52:16 minahito Exp $
- */
-
-require_once XOOPS_BASE_PATH."/admin/forms/ModuleListFilterForm.class.php";
-require_once XOOPS_BASE_PATH."/admin/forms/ModuleSettingsForm.class.php";
-
-class LegacyModuleListAction extends LegacyAdminAction
-{
-	var $mDB=null;
-	var $mModuleObjects=array();
-	var $mFilter=null;
-	var $mForm=null;
-
-	function prepare(&$controller,&$xoopsUser)
-	{
-		$this->mDB=&$controller->getDB();
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->mFilter=new ModuleListFilterForm();
-		$this->mFilter->fetch();
-		
-		$moduleHandler=&xoops_gethandler('module');
-
-		// dmy
-		$criteria=new Criteria('mid',0,'>');
-		$criteria->setSort($this->mFilter->getSort());
-		$criteria->setOrder($this->mFilter->getOrder());
-		
-		$this->mModuleObjects=&$moduleHandler->getObjects($criteria);
-
-		return LEGACY_ADMIN_FRAME_VIEW_INDEX;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objests=$moduleHandler->getObjects();
-
-		$this->mForm=new ModuleSettingsForm();
-		$this->mForm->prepare();
-		
-		$this->mForm->fetch();
-		$this->mForm->validate();
-
-		if($this->mForm->hasError() || !isset($_POST['dummy_ticket'])) {
-			return $this->_processConfirm($controller,$xoopsUser);
-		}
-		else {
-			return $this->_processSave($controller,$xoopsUser);
-		}
-
-	}
-	
-	function _processConfirm(&$controller,&$xoopsUser)
-	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objests=$moduleHandler->getObjects();
-
-		//
-		// Do mapping.
-		//
-		foreach($objests as $modObject) {
-			$this->mModuleObjects[$modObject->getVar('mid')]=&$modObject;
-			unset($modObject);
-		}
-
-		return LEGACY_ADMIN_FRAME_VIEW_INPUT;
-	}
-
-	function _processSave(&$controller,&$xoopsUser)
-	{
-		$moduleHandler=&xoops_gethandler('module');
-		$objects=$moduleHandler->getObjects();
-		
-		$successFlag=true;
-		foreach($objects as $modObject) {
-			$mid=$modObject->getVar('mid');
-			$modObject->setVar('name',$this->mForm->getVar('name',$mid));
-			$modObject->setVar('weight',$this->mForm->getVar('weight',$mid));
-			$modObject->setVar('isactive',$this->mForm->getVar('isactive',$mid));
-
-			//
-			// Store.
-			//
-			$successFlag&=$moduleHandler->insert($modObject);
-		}
-		
-		return $successFlag ? LEGACY_ADMIN_FRAME_VIEW_SUCCESS : LEGACY_ADMIN_FRAME_VIEW_ERROR;
-	}
-
-	/**
-	 * To support a template writer, this send the list of mid that actionForm kept.
-	 */
-	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("modulelist_confirm.html");
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
-		$renderer->setAttribute('actionForm',$this->mForm);
-		
-		//
-		// To support a template writer, this send the list of mid that
-		// actionForm kept.
-		//
-		$tarray=&$this->mForm->getVar('name');
-		$renderer->setAttribute('mids',array_keys($tarray));
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
-	{
-		$renderer->setTemplateName("module_list.html");
-
-		//
-		// Load adminmenu before we assign these to template.
-		//
-		foreach(array_keys($this->mModuleObjects) as $key) {
-			$this->mModuleObjects[$key]->loadAdminMenu();
-			$this->mModuleObjects[$key]->loadInfo($this->mModuleObjects[$key]->getVar('dirname'));
-		}
-
-		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
-	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*SUCCESS*");
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderer)
-	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList',1,"*ERROR*");
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.3	Thu Dec 29 16:24:46 2005
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php	Thu Jan 26 01:18:51 2006
@@ -6,7 +6,7 @@
 /**
  * This is abstract class for 3 action classes that are Install, Update and Uninstall.
  */
-class Legacy_AbstractModuleInstallAction extends LegacyAdminAction
+class Legacy_AbstractModuleInstallAction extends Legacy_Action
 {
 	/**
 	 * XoopsModule instance specified.
@@ -24,13 +24,13 @@
 
 		if (!is_object($this->mModuleObject)) {
 			$this->mLogLog =& $installer->getLog();
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
+			return LEGACY_FRAME_VIEW_ERROR;
 		}
 
 		$this->mModuleObject->loadAdminMenu();
 		$this->mModuleObject->loadInfo($dirname);
 		
-		return LEGACY_ADMIN_FRAME_VIEW_INDEX;
+		return LEGACY_FRAME_VIEW_INDEX;
 	}
 
 	function execute(&$controller, &$xoopsUser)
@@ -49,12 +49,12 @@
 		$this->mModuleObject =& $installer->loadModuleObject($dirname);
 		
 		if (!is_object($this->mModuleObject)) {
-			return LEGACY_ADMIN_FRAME_VIEW_ERROR;
+			return LEGACY_FRAME_VIEW_ERROR;
 		}
 
 		if ($installer->hasAgree() && !$agree) {
 			$this->_loadAgreement();
-			return LEGACY_ADMIN_FRAME_VIEW_INPUT;
+			return LEGACY_FRAME_VIEW_INPUT;
 		}
 		
 		$installer->setForceMode($force);
@@ -62,7 +62,7 @@
 
 		$this->mLog =& $installer->getLog();
 		
-		return LEGACY_ADMIN_FRAME_VIEW_SUCCESS;
+		return LEGACY_FRAME_VIEW_SUCCESS;
 	}
 
 	/**
Index: xoops2jp/html/modules/base/admin/actions/LegacyDefaultAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/LegacyDefaultAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/LegacyDefaultAction.class.php:removed
--- xoops2jp/html/modules/base/admin/actions/LegacyDefaultAction.class.php:1.1.2.2	Thu Dec  1 01:02:24 2005
+++ xoops2jp/html/modules/base/admin/actions/LegacyDefaultAction.class.php	Thu Jan 26 01:18:51 2006
@@ -1,36 +0,0 @@
-<?php
-
-class LegacyDefaultAction extends LegacyAdminAction
-{
-	function prepare(&$controller,&$xoopsUser)
-	{
-	}
-	
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return LEGACY_ADMIN_FRAME_VIEW_NONE;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		return LEGACY_ADMIN_FRAME_VIEW_NONE;
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php:1.1.2.1
--- /dev/null	Thu Jan 26 01:18:51 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleDeactiveListAction.class.php	Thu Jan 26 01:18:51 2006
@@ -0,0 +1,34 @@
+<?php
+
+require_once XOOPS_BASE_PATH."/admin/class/DeactiveModuleHandler.class.php";
+
+/**
+ * List up modules that are not installed yet.
+ */
+class Legacy_ModuleDeactiveListAction extends Legacy_Action
+{
+	var $mModuleObjects = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		
+		$db =& $controller->getDB();
+		$handler = new Legacy_DeactiveModuleHandler($db);
+		
+		$this->mModuleObjects =& $handler->getObjects();
+		
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
+	{
+		$renderer->setTemplateName("deactive_module_list.html");
+		$renderer->setAttribute('moduleObjects',$this->mModuleObjects);
+	}
+}
+
+?>
\ No newline at end of file


xoops-cvslog メーリングリストの案内
Back to archive index