From nobunobu ＠ users.sourceforge.jp  Wed Nov  1 00:03:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  1 Nov 2006 00:03:39 +0900
Subject: [xoops-cvslog 5534] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061031150339.C87032AC020@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.7 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.7	Tue Oct 31 16:04:22 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Wed Nov  1 00:03:39 2006
@@ -154,7 +154,7 @@
 		ksort($this->_mMilestone);
 		
 		foreach ($this->_mMilestone as $t_version => $t_value) {
-			if ($t_version > $this->_mCurrentVersion) {
+			if ($t_version > $this->getCurrentVersion()) {
 				return $t_version;
 			}
 		}
@@ -170,7 +170,7 @@
 		ksort($this->_mMilestone);
 		
 		foreach ($this->_mMilestone as $t_version => $t_value) {
-			if ($t_version >= $this->_mCurrentVersion) {
+			if ($t_version >= $this->getCurrentVersion()) {
 				if (is_callable(array($this, $t_value))) {
 					return true;
 				}
@@ -192,7 +192,7 @@
 		ksort($this->_mMilestone);
 		
 		foreach ($this->_mMilestone as $t_version => $t_value) {
-			if ($t_version > $this->_mCurrentVersion) {
+			if ($t_version > $this->getCurrentVersion()) {
 				if (is_callable(array($this, $t_value))) {
 					return $this->$t_value();
 				}
@@ -236,7 +236,7 @@
 			require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
 			$funcName = 'xoops_module_update_' . $module->getVar('dirname');
 			if (function_exists($funcName)) {
-				if (!call_user_func($funcName, $module, $this->mPreVersion)) {
+				if (!call_user_func($funcName, $module, $this->getCurrentVersion())) {
 					$log->addError("Failed to execute " . $funcName);
 				}
 			}

From minahito ＠ users.sourceforge.jp  Wed Nov  1 15:39:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 15:39:05 +0900
Subject: [xoops-cvslog 5535] CVS update:
	xoops2jp/html/modules/legacy/lib/ShadeSoap
Message-ID: <20061101063905.1FCD12AC033@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/ShadeSoap/index.html
diff -u /dev/null xoops2jp/html/modules/legacy/lib/ShadeSoap/index.html:1.1.2.1
--- /dev/null	Wed Nov  1 15:39:05 2006
+++ xoops2jp/html/modules/legacy/lib/ShadeSoap/index.html	Wed Nov  1 15:39:04 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov  1 15:39:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 15:39:05 +0900
Subject: [xoops-cvslog 5536] CVS update:
	xoops2jp/html/modules/legacy/lib/ShadePlus
Message-ID: <20061101063905.49DD62AC05F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/ShadePlus/index.html
diff -u /dev/null xoops2jp/html/modules/legacy/lib/ShadePlus/index.html:1.1.2.1
--- /dev/null	Wed Nov  1 15:39:05 2006
+++ xoops2jp/html/modules/legacy/lib/ShadePlus/index.html	Wed Nov  1 15:39:05 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov  1 15:46:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 15:46:56 +0900
Subject: [xoops-cvslog 5537] CVS update:
	xoops2jp/html/modules/legacy/lib/ShadePlus
Message-ID: <20061101064656.E0DB52AC05E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php
diff -u xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.2 xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.2	Tue Oct 31 19:30:53 2006
+++ xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php	Wed Nov  1 15:46:56 2006
@@ -34,9 +34,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-if (!defined('XCube_AbstractServiceClient')) exit();
+if (!class_exists('XCube_AbstractServiceClient')) exit();
 
-class ShadePlus_SoapClient extends XCube_AbstractServiceClient
+class Shade_SoapClient extends XCube_AbstractServiceClient
 {
 	var $mClient = null;
 	

From minahito ＠ users.sourceforge.jp  Wed Nov  1 15:47:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 15:47:54 +0900
Subject: [xoops-cvslog 5538] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061101064754.39C362AC033@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.2 xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.2	Sun Oct 15 01:43:37 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php	Wed Nov  1 15:47:54 2006
@@ -22,13 +22,13 @@
 		$root =& XCube_Root::getSingleton();
 		
 		if (is_object($service) && is_a($service, 'XCube_Service')) {
-			$client = new XCube_ServiceClient($service);
+			$client =& new XCube_ServiceClient($service);
 		}
 		else {
 			require_once XOOPS_ROOT_PATH . "/modules/legacy/lib/nusoap/nusoap.php";
 			require_once XOOPS_ROOT_PATH . "/modules/legacy/lib/ShadePlus/SoapClient.class.php";
 			
-			$client = new Shade_SoapClient($service);
+			$client =& new Shade_SoapClient($service);
 		}
 	}
 

From minahito ＠ users.sourceforge.jp  Wed Nov  1 15:50:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 15:50:45 +0900
Subject: [xoops-cvslog 5539] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061101065045.574C92AC05E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php
diff -u xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.3 xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.3	Tue Oct 31 15:06:17 2006
+++ xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php	Wed Nov  1 15:50:45 2006
@@ -112,13 +112,15 @@
 			if (!class_exists($className)) {
 				$filePath = XOOPS_ROOT_PATH . '/modules/' . $block->get('dirname') . '/blocks/' . $block->get('func_file');
 				if (!file_exists($filePath)) {
-					continue;
+					$retBlock =& new Legacy_BlockProcedureAdapter($block);
+					return $retBlock;
 				}
 				
 				require_once $filePath;
 				
 				if (!class_exists($className)) {
-					continue;
+					$retBlock =& new Legacy_BlockProcedureAdapter($block);
+					continue $retBlock;
 				}
 			}
 				

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:54:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:54:23 +0900
Subject: [xoops-cvslog 5540] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101115423.0908F2AC022@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.8 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.8	Wed Nov  1 00:03:39 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Wed Nov  1 20:54:22 2006
@@ -1,11 +1,44 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id$
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH."/admin/class/AbstractModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
 /**
- * This class is a framework for phased updating.
+ * @brief The framework for the phased update.
+ * 
+ * @section Description
+ * 
+ * You can make your own custom-update-installer for your modules with the
+ * sub-class of this class. It's easy to make by many utility functions. You
+ * can write your sub-class as well as batch files.
+ * 
+ * On Legacy System module, upgrade is called when users try to update. So you
+ * must implement your sub-class for also correct update. For example, the
+ * custom-update-install have to update module templates & block templates,
+ * because users expect that the module-update function does it.
+ * 
+ * For the custom-update-install, Legacy_ModuleInstallUtils is good for you.
+ * Plus, this class has some usefull static methods for upgrade. Such functions
+ * have notes as "The utility method for the custom-update-installer".
+ * 
+ * And, this class as the template-pattern has some methods you may override.
+ * These methods have note as "You may do custom".
+ * 
+ * @section Convention
+ * 
+ * Module Update function build the current-$xoopsModule from DB, and then sets
+ * it to this class through setCurrentXoopsModule(). Basically, you can access
+ * it by $this->_mCurrentXoopsModule. And, that function build the
+ * target-$xoopsModule from xoops_version, and then set it to this class through
+ * setTargetXoopsModule(). Also you can access it by $this->_mTargetXoopsModule.
+ * 
+ * @see Legacy_ModuleInstallUtils
  */
 class Legacy_ModulePhasedUpgrader
 {
@@ -77,7 +110,7 @@
 	 * the _mCurrentVersion as backup for the case where the value of this
 	 * object is changed for updating.
 	 * 
-	 * @access public
+	 * @public
 	 * @param XoopsModule $xoopsModule
 	 */
 	function setCurrentXoopsModule(&$xoopsModule)
@@ -254,6 +287,41 @@
 	}
 	
 	/**
+	 * Updates all of module templates.
+	 * 
+	 * @access protected
+	 * @note You may do custom
+	 */
+	function _updateModuleTemplates()
+	{
+		Legacy_ModuleInstallUtils::uninstallAllOfModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::installAllModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
+	}
+	
+	/**
+	 * Updates all of blocks.
+	 * 
+	 * @access protected
+	 * @note You may do custom
+	 */
+	function _updateBlocks()
+	{
+		Legacy_ModuleInstallUtils::uninstallAllOfBlocks($this->_mTargetXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::installAllOfBlocks($this->_mTargetXoopsModule, $this->mLog);
+	}
+	
+	/**
+	 * Updates all of preferences & notifications.
+	 * 
+	 * @access protected
+	 * @note You may do custom
+	 */
+	function _updatePreferences()
+	{
+		$this->_upgradePreference();
+	}
+	
+	/**
 	 * This method executes upgrading automatically by the diff of
 	 * xoops_version.
 	 * 
@@ -267,18 +335,9 @@
 		$this->mLog->addReport(_AD_LEGACY_MESSAGE_UPDATE_STARTED);
 		
 		//
-		// Uninstall all of existed module templates
-		//
-		Legacy_ModuleUtils::uninstallAllModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
-		if (!$this->_mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-		
-		//
-		// Install all of module templates.
+		// Updates all of module templates
 		//
-		Legacy_ModuleUtils::installAllModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
+		$this->_updateTemplates();
 		if (!$this->_mForceMode && $this->mLog->hasError()) {
 			$this->_processReport();
 			return false;
@@ -287,8 +346,7 @@
 		//
 		// Update blocks.
 		//
-		Legacy_ModuleUtils::uninstallAllBlocks($this->_mTargetXoopsModule, $this->mLog);
-		Legacy_ModuleUtils::installAllBlocks($this->_mTargetXoopsModule, $this->mLog);
+		$this->_updateBlocks();
 		if (!$this->_mForceMode && $this->mLog->hasError()) {
 			$this->_processReport();
 			return false;
@@ -297,7 +355,7 @@
 		//
 		// Update preferences & notifications.
 		//
-		$this->_upgradePreference();
+		$this->_updatePreferences();
 		if (!$this->_mForceMode && $this->mLog->hasError()) {
 			$this->_processReport();
 			return false;
@@ -322,7 +380,14 @@
 		return true;
 	}
 
-	function _upgradePreference()
+	/**
+	 * Tries to smart update all of preferences & notifications.
+	 * 
+	 * @todo This method is perhaps uncompleted. If you have written more smart
+	 *       function, please contribute it to us.
+	 * @note The utility method for the custom-update-installer.
+	 */
+	function _upgradePreferences()
 	{
 		$configHandler =& xoops_gethandler('config');
 		

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:54:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:54:30 +0900
Subject: [xoops-cvslog 5541] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101115430.B00242AC05E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdateFramework.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdateFramework.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/class/ModuleUpdateFramework.class.php:removed
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdateFramework.class.php:1.1.2.2	Thu Oct 26 00:27:23 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdateFramework.class.php	Wed Nov  1 20:54:30 2006
@@ -1,113 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
-
-class Legacy_ModuleUpdateFramework extends Legacy_ModuleUpdater
-{
-	/**
-	 * This is an array of milestone version informations. Key is a version
-	 * number. Value is a method name called by execute().
-	 * 
-	 * Format:
-	 * {version} => {methodName}
-	 * 
-	 * Example:
-	 * var $_mMilestone = array('020' => 'update020', '025' => 'update025');
-	 * 
-	 * @access protected
-	 */
-	var $_mMilestone = array();
-	
-	/**
-	 * @access protected
-	 */
-	var $_mTargetVersion = 0;
-
-	/**
-	 * @access protected
-	 */	
-	var $_mIsEnableFramework = false;
-	
-	function &loadModuleObject($dirname)
-	{
-		$ret = null;
-
-		$moduleHandler =& xoops_gethandler('module');
-		$module =& $moduleHandler->getByDirname($dirname);
-
-		if (!is_object($module)) {
-			return $ret;
-		}
-		
-		$this->mPreVersion = $module->get('version');
-        $name = $module->get('name','n');
-		$module->loadInfoAsVar($dirname);
-		$module->set('name', $name, true);
-		
-		ksort($this->_mMilestone);
-		
-		foreach ($this->_mMilestone as $version => $value) {
-			if ($version > $this->mPreVersion) {
-				$this->_mTargetVersion = $version;
-				$module->set('version', $version);
-				
-				$this->_mIsEnableFramework = true;
-				return $module;
-			}
-		}
-
-		$this->_mTargetVersion = intval($module->modinfo['version'] * 100);
-		
-		return $module;
-	}
-
-	function updateXoopsModule()
-	{
-		$moduleHandler =& xoops_gethandler('module');
-		if (!$moduleHandler->insert($this->mModule)) {
-			$this->mLog->addError("*Could not install module information*");
-			return false;
-		}
-
-		return true;
-	}
-	
-	function execute()
-	{
-		if ($this->_mIsEnableFramework) {
-			$this->mModule =& $this->loadModuleObject($this->mDirname);
-			
-			if (!is_object($this->mModule)) {
-				$this->_processReport();
-				return false;
-			}
-			
-			$method = $this->_mMilestone[$this->_mTargetVersion];
-
-			if (is_callable(array($this, $method))) {
-				$this->mModule->set('version', $this->_mTargetVersion);
-				
-				$this->$method();
-				
-				$this->_processReport();
-		
-				return true;
-			}
-			else {
-				//
-				// TODO need error message.
-				//
-				$this->mLog->addError('Update framework is a wrong.');
-				return false;
-			}
-		}
-		else {
-			parent::execute();
-		}
-	}
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:54:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:54:36 +0900
Subject: [xoops-cvslog 5542] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061101115436.AE5702AC022@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.5	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html	Wed Nov  1 20:54:36 2006
@@ -41,10 +41,7 @@
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACY_LANG_VERSION}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{math equation="v/100" v=$module->get('version') format="%.2f"}>
-      <{if $module->get('version') != $module->modinfo.version * 100 }>
-        &raquo; <b class="legacy_module_warning"><{math equation=$module->modinfo.version format="%.2f"}></b>
-      <{/if}>
+      <{$currentVersion}>
 	</td>
   </tr>
   <tr>

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:54:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:54:56 +0900
Subject: [xoops-cvslog 5543] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101115456.672912AC022@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u /dev/null xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.1
--- /dev/null	Wed Nov  1 20:54:56 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Wed Nov  1 20:54:56 2006
@@ -0,0 +1,183 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * This class is collection of static utility functions for module installation.
+ * These functions are useful for Legacy modules' system-fixed-installer and
+ * modules' custom-installer. All functions for the custom-installer are added
+ * notes as "FOR THE CUSTOM-ISNTALLER".
+ * 
+ * For more attentions, see base classes for the custom-installer.
+ * 
+ * @see Legacy_PhasedUpgrader
+ */
+class Legacy_ModuleInstallUtils
+{
+	/**
+	 * Installs all of module templates $module specify. This function is
+	 * usefull for installer and updater. In the case of updater, you should
+	 * uninstall all of module templates before this function.
+	 * 
+	 * This function gets informations about templates from xoops_version.
+	 * 
+	 * @section Attention
+	 * 
+	 * This function depends the specific spec of Legacy_RenderSystem, but this
+	 * static function is needed by the 2nd installer of Legacy System.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @note FOR THE CUSTOM-INSTALLER
+	 * @see Legacy_ModuleInstallUtils::uninstallAllOfModuleTemplates()
+	 */	
+	function installAllOfModuleTemplates(&$module, &$log)
+	{
+        $templates = $module->getInfo('templates');
+        if ($templates != false) {
+            foreach ($templates as $template) {
+                Legacy_ModuleUtils::installModuleTemplate($module, $template, $log);
+            }
+        }
+	}
+
+	/**
+	 * Uninstalls all of module templates $module specify. This function is
+	 * usefull for uninstaller and updater. In the case of update, you should
+	 * call this function before installAllOfModuleTemplates(). In the case of
+	 * uninstall, you must set 'false' to $defaultOnly.
+	 * 
+	 * This function gets informations about templates from the database.
+	 * 
+	 * @section Attention
+	 * 
+	 * This function depends the specific spec of Legacy_RenderSystem, but this
+	 * static function is needed by the 2nd installer of Legacy System.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param bool $defaultOnly Indicates whether this function deletes templates from all of tplsets.
+	 * @note FOR THE CUSTOM-INSTALLER
+	 * @see Legacy_ModuleInstallUtils::installAllOfModuleTemplates()
+	 */	
+	function uninstallAllOfModuleTemplates(&$module, &$log, $defaultOnly = true)
+	{
+		$tplHandler =& xoops_gethandler('tplfile');
+
+		//
+		// The following processing depends on the structure of Legacy_RenderSystem.
+		//
+		$tplHandler =& xoops_gethandler('tplfile');
+		$delTemplates = null;
+		
+		if ($defaultOnly) {
+			$delTemplates =& $tplHandler->find('default', 'module', $module->get('mid'));
+		}
+		else {
+			$delTemplates =& $tplHandler->find(null, 'module', $module->get('mid'));
+		}
+		
+		if (is_array($delTemplates) && count($delTemplates) > 0) {
+			//
+			// clear cache
+			//
+			$xoopsTpl =& new XoopsTpl();
+			$xoopsTpl->clear_cache(null, "mod_" . $module->get('dirname'));
+			
+			foreach ($delTemplates as $tpl) {
+				if (!$tplHandler->delete($tpl)) {
+					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->get('tpl_file')));
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Installs all of blocks $module specify.
+	 * 
+	 * This function gets informations about blocks from xoops_version.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @note FOR THE CUSTOM-INSTALLER
+	 * @see Legacy_ModuleInstallUtils::uninstallAllOfBlocks()
+	 */	
+	function installAllOfBlocks(&$module, &$log)
+	{
+		$definedBlocks = $module->getInfo('blocks');
+		if($definedBlocks == false) {
+			return true;
+		}
+		
+		$handler =& xoops_gethandler('block');
+
+		$func_num = 0;
+		foreach ($definedBlocks as $block) {
+			$func_num++;
+			$newBlock =& Legacy_ModuleUtils::createBlockByInfo($module, $block, $func_num);
+			Legacy_ModuleUtils::installBlock($module, $newBlock, $block, $this->mLog);
+        }
+	}
+
+	/**
+	 * Uninstalls all of blocks which $module specifies, and its permissions.
+	 * 
+	 * This function gets informations about templates from the database.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @return bool
+	 * 
+	 * @note FOR THE CUSTOM-INSTALLER
+	 * @see Legacy_ModuleInstallUtils::installAllOfBlocks()
+	 * @see Legacy_ModuleInstallUtils::uninstallBlock()
+	 */	
+	function uninstallAllOfBlocks(&$module, &$log)
+	{
+		$handler =& xoops_gethandler('block');
+		$criteria = new Criteria('mid', $module->get('mid'));
+
+		$blockArr =& $handler->getObjectsDirectly($criteria);
+		
+		$successFlag = true;
+		
+		foreach (array_keys($blockArr) as $idx) {
+			$successFlag &= Legacy_ModuleInstallUtils::uninstallBlock($blockArr[$idx], $log);
+		}
+		
+		return $successFlag;
+	}
+	
+	/**
+	 * Uninstalls a block which $block specifies. In the same time, deletes
+	 * permissions for the block.
+	 * 
+	 * @param XoopsBlock $block
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @note FOR THE CUSTOM-INSTALLER
+	 * 
+	 * @todo error handling & delete the block's template.
+	 */
+	function uninstallBlock(&$block, &$log)
+	{
+		$blockHandler =& xoops_gethandler('block');
+		$blockHandler->delete($block);
+		$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
+		
+		//
+		// Deletes permissions
+		//
+		$gpermHandler =& xoops_gethandler('groupperm');
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('gperm_name', 'block_read'));
+		$criteria->add(new Criteria('gperm_itemid', $block->get('bid')));
+		$criteria->add(new Criteria('gperm_modid', 1));
+		$gpermHandler->deleteAll($criteria);
+    }
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:55:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:55:09 +0900
Subject: [xoops-cvslog 5544] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101115509.B83AF2AC05E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u 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.3
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.2	Sun Oct 15 01:00:51 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Wed Nov  1 20:55:09 2006
@@ -2,58 +2,62 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH."/admin/class/AbstractModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
-class Legacy_ModuleUninstaller extends Legacy_AbstractModuleInstaller
+class Legacy_ModuleUninstaller
 {
-	function Legacy_ModuleUninstaller($dirname)
+	/**
+	 * This instance is prepared automatically in the constructor.
+	 * 
+	 * @public
+	 * @var Legacy_ModuleUtilsSimpleLog
+	 */
+	var $mLog = null;
+	
+	var $_mForceMode = false;
+	
+	/**
+	 * @protected
+	 * @var XoopsModule
+	 */
+	var $_mXoopsModule = null;
+	
+	function Legacy_ModuleUninstaller()
 	{
-		parent::Legacy_AbstractModuleInstaller($dirname);
-		
-		$this->mProcessScript->register('Legacy_ModuleUninstaller.ProcessScript');
-		$this->mProcessScript->add('Legacy_ModuleUninstaller::_processScript');
-		
-		$this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable');
-		$this->mInstallTable->add('Legacy_ModuleUninstaller::_uninstallTable');
-
-		$this->mInstallTemplate->register('Legacy_ModuleUninstaller.InstallTemplate');
-		$this->mInstallTemplate->add('Legacy_ModuleUninstaller::_uninstallTemplate');
+		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
 	}
 	
 	/**
-	 * Load xoops module object that isn't installed and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
+	 * Sets the current XoopsModule.
+	 * 
+	 * @public
+	 * @param XoopsModule $xoopsModule
 	 */
-	function &loadModuleObject($dirname)
+	function setCurrentXoopsModule(&$xoopsModule)
 	{
-		$error = null;
-
-		$moduleHandler =& xoops_gethandler('module');
-		$module =& $moduleHandler->getByDirname($dirname);
-
-		if (!is_object($module)) {
-			$this->mLog->addError(_AD_LEGACY_ERROR_MODULE_NOT_FOUND);
-			return $error;
-		}
-		
-		if ($module->getVar('isactive') != 0) {
-			$this->mLog->addError(_AD_LEGACY_ERROR_CASE_OF_ACTIVE_MODULE);
-			return $error;
-		}
-
-		return $module;
+		$this->_mXoopsModule =& $xoopsModule;
+	}
+	
+	/**
+	 * Sets a value indicating whether the force mode is on.
+	 * @param bool $isForceMode
+	 */
+	function setForceMode($isForceMode)
+	{
+		$this->_mForceMode = $isForceMode;
 	}
 	
 	/**
-	 * Delete module information from XOOPS database because this class is uninstaller.
+	 * Deletes module information from XOOPS database because this class is
+	 * uninstaller.
+	 * 
+	 * @protected
 	 */
-	function _installModule()
+	function _uninstallModule()
 	{
 		$moduleHandler =& xoops_gethandler('module');
-		if (!$moduleHandler->delete($this->mModule)) {
+		if (!$moduleHandler->delete($this->_mXoopsModule)) {
 			$this->mLog->addError(_AD_LEGACY_ERROR_DELETE_MODULEINFO_FROM_DB);
 		}
 		else {
@@ -63,13 +67,15 @@
 
 	/**
 	 * Drop table because this class is uninstaller.
+	 * 
+	 * @protected
 	 */
-	function _uninstallTable(&$module, &$log)
+	function _uninstallTables()
 	{
 		$root =& XCube_Root::getSingleton();
 		$db =& $root->mController->getDB();
 
-		$tables = $module->getInfo('tables');
+		$tables = $this->_mXoopsModule->getInfo('tables');
 		if ($tables != false && is_array($tables)) {
 			foreach($tables as $table) {
 				//
@@ -77,10 +83,10 @@
 				//
 				$sql = "DROP TABLE " . $db->prefix($table);
 				if ($db->query($sql)) {
-					$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($table)));
+					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($table)));
 				}
 				else {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($table)));
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($table)));
 				}
 			}
 		}
@@ -88,66 +94,46 @@
 
 	/**
 	 * Delete template because this class is uninstaller.
+	 * @protected
 	 */
-	function _uninstallTemplate(&$module, &$log)
+	function _uninstallTemplates()
 	{
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$deleteTemplates =& $tplHandler->find(null, 'module', $module->getVar('mid'));
-		
-		foreach($deleteTemplates as $tpl) {
-			if (!$tplHandler->delete($tpl)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
-			}
-		}
+		Legacy_ModuleInstallUtils::uninstallAllOfModuleTemplates($this->_mXoopsModule, $this->mLog, false);
 	}
 
 	/**
 	 * Delete all of module's blocks.
+	 * 
+	 * @note Templates Delete is move into Legacy_ModuleInstallUtils.
 	 */
-	function _installBlock()
+	function _uninstallBlocks()
 	{
-		$blockHandler =& xoops_gethandler('block');
-		$criteria = new Criteria('mid', $this->mModule->getVar('mid'));
-
-		$blocks =& $blockHandler->getObjectsDirectly($criteria);
-		
-		$gpermHandler =& xoops_gethandler('groupperm');
-		foreach ($blocks as $block) {
-			$blockHandler->delete($block);
-			$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED, $block->get('name')));
-
-			//
-			// delete permission
-			//
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_name', 'block_read'));
-			$criteria->add(new Criteria('gperm_itemid', $block->getVar('bid')));
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$gpermHandler->deleteAll($criteria);
-		}
+		Legacy_ModuleInstallUtils::uninstallAllOfBlocks($this->_mXoopsModule, $this->mLog);
 
+		//
+		// Additional
+		//
 		$tplHandler =& xoops_gethandler('tplfile');
-		$criteria =& new Criteria('tpl_module', $this->mModule->getVar('dirname'));
+		$criteria =& new Criteria('tpl_module', $this->_mXoopsModule->get('dirname'));
 		if(!$tplHandler->deleteAll($criteria)) {
 			$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
 		}
 	}
 
-	function _installPreference()
+	function _uninstallPreferences()
 	{
 		Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog);
 	}
 
-	function _processScript(&$module, &$log)
+	function _processScript()
 	{
-		$installScript = trim($module->getInfo('onUninstall'));
+		$installScript = trim($this->_mXoopsModule->getInfo('onUninstall'));
 		if ($installScript != false) {
-			require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-			$funcName = 'xoops_module_uninstall_' . $module->getVar('dirname');
+			require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
+			$funcName = 'xoops_module_uninstall_' . $this->_mXoopsModule->get('dirname');
 			if (function_exists($funcName)) {
-				if (!call_user_func($funcName, $module)) {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+				if (!call_user_func($funcName, $this->_mXoopsModule)) {
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
 				}
 			}
 		}
@@ -156,17 +142,59 @@
 	function _processReport()
 	{
 		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
 		}
 		else {
-			if (is_object($this->mModule)) {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+			if (is_object($this->_mXoopsModule)) {
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
 			}
 			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname));
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('dirname')));
 			}
 		}
 	}
+
+	/**
+	 * @todo Check whether $this->_mXoopsObject is ready.
+	 */
+	function executeUninstall()
+	{
+		$this->_uninstallTables();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_uninstallModule();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_uninstallTemplates();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_uninstallBlocks();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+		
+		$this->_uninstallPreferences();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+		
+		$this->_processScript();
+		
+		$this->_processReport();
+		
+		return true;
+	}
 }
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.4	Tue Oct 31 16:21:47 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php	Wed Nov  1 20:55:09 2006
@@ -44,8 +44,12 @@
 }
 
 /**
+ * @brief Old utility class with static methods for installation.
+ * 
  * This provides static methods for the module installation. Methods of this
  * class may move to base class of installers. 
+ * 
+ * @deprecated see Legacy_ModuleInstallUtils
  */
 class Legacy_ModuleUtils
 {
@@ -574,12 +578,12 @@
 	 */
 	function deleteAllConfigs(&$module, &$log)
 	{
-		if ($this->mModule->getVar('hasconfig') == 0) {
+		if ($module->get('hasconfig') == 0) {
 			return;
 		}
 
 		$configHandler =& xoops_gethandler('config');
-		$configs =& $configHandler->getConfigs(new Criteria('conf_modid', $this->mModule->getVar('mid')));
+		$configs =& $configHandler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
 
 		if (count($configs) == 0) {
 			return;

From minahito ＠ users.sourceforge.jp  Wed Nov  1 20:55:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 20:55:09 +0900
Subject: [xoops-cvslog 5545] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061101115509.E47772AC05F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.5	Mon Oct 30 18:52:32 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Wed Nov  1 20:55:09 2006
@@ -10,6 +10,56 @@
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/forms/ModuleUpdateForm.class.php";
 
+/**
+ * @brief Module Update function having possibility to extend by module developers.
+ * 
+ * The precondition is that the specified module has been installed.
+ * 
+ * @section cupdate The custom-update-installer
+ * 
+ * Module developers can use their own custom-update-installer in this action.
+ * This function uses Legacy_ModulePhasedUpgrader to update moudles. But, this
+ * class can't smart update modules correctly & automatically, because the
+ * module updat function bases on XOOPS2 JP spec. We have no rules to declare
+ * modules strictly.
+ * 
+ * To solve it, module developers should use the custom-update-installer,
+ * because module developers know detail changelog of their module.
+ * 
+ * @subsection convention Convention
+ * 
+ * See Legacy_ModuleUpdateAction::_getInstaller().
+ * 
+ * \li $modversion['legacy_installer']['updater']['class'] = {classname};
+ * \li $modversion['legacy_installer']['updater']['namespace'] = {namespace}; (Optional)
+ * \li $modversion['legacy_installer']['updater']['filepath'] = {filepath}; (Optional)
+ * 
+ * You must declare your sub-class of Legacy_ModulePhasedUpgrader as
+ * {namespace}_{classname} in {filepath}. You must specify classname. Others
+ * are decided by the naming convention without your descriptions. Namespace
+ * is ucfirst(dirname). Filepath is "admin/class/{classname}.class.php".
+ * 
+ * For example, "news" module.
+ * 
+ * $modversion['legacy_installer']['updater']['class'] = "Updater";
+ * 
+ * You must declare News_Updater in XOOPS_ROOT_PATH . "/modules/news/admin/class/Updater.class.php".
+ * 
+ * In the case where you specify the filepath, take care you describe the
+ * filepath with absolute path.
+ * 
+ * @subsection process Install Process
+ * 
+ * \li Gets a instance of the update installer class through Legacy_ModuleUpdateAction::_getInstaller().
+ * \li Sets the current XoopsModule to the instance.
+ * \li Builds the target XoopsModule from xoops_version, and sets it to the instance.
+ * \li Sets a value indicating whether an administrator hopes the force-mode, to the instance.
+ * \li Calls executeUpgrade().
+ * 
+ * @see Legacy_ModuleUpdateAction::_getInstaller()
+ * @see Legacy_ModulePhasedUpgrader
+ * @see Legacy_ModuleInstallUtils
+ */
 class Legacy_ModuleUpdateAction extends Legacy_Action
 {
 	/**
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.2	Sun Oct 15 00:55:35 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Wed Nov  1 20:55:09 2006
@@ -10,24 +10,83 @@
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/forms/ModuleUninstallForm.class.php";
 
+
 /**
- * Uninstall module
+ * @brief Module Uninstall function having possibility to extend by module developers.
+ * 
+ * The precondition is that the specified module has been installed && none-actived.
+ * 
+ * @section cuninstall The custom-uninstaller
+ * 
+ * Module developers can use their own custom-uninstaller in this action.
+ * Unlike the module update function, the standard uninstaller in this action
+ * is perhaps no problems. But, duplicatable modules or some modules with the
+ * special framework may need the custom-uninstaller.
+ * 
+ * @subsection convention Convention
+ * 
+ * See Legacy_ModuleUninstallAction::_getInstaller().
+ * 
+ * \li $modversion['legacy_installer']['uninstaller']['class'] = {classname};
+ * \li $modversion['legacy_installer']['uninstaller']['namespace'] = {namespace}; (Optional)
+ * \li $modversion['legacy_installer']['uninstaller']['filepath'] = {filepath}; (Optional)
+ * 
+ * You must declare your sub-class of Legacy_ModuleUninstaller as
+ * {namespace}_{classname} in {filepath}. You must specify classname. Others
+ * are decided by the naming convention without your descriptions. Namespace
+ * is ucfirst(dirname). Filepath is "admin/class/{classname}.class.php".
+ * 
+ * For example, "news" module.
+ * 
+ * $modversion['legacy_installer']['uninstaller']['class'] = "Uninstaller";
+ * 
+ * You must declare News_Uninstaller in XOOPS_ROOT_PATH . "/modules/news/admin/class/Uninstallerr.class.php".
+ * 
+ * In the case where you specify the filepath, take care you describe the
+ * filepath with absolute path.
+ * 
+ * @subsection process Uninstall Process
+ * 
+ * \li Gets a instance of the uninstaller class through Legacy_ModuleUninstallAction::_getInstaller().
+ * \li Sets the current XoopsModule to the instance.
+ * \li Sets a value indicating whether an administrator hopes the force-mode, to the instance.
+ * \li Calls executeUninstall().
+ * 
+ * @see Legacy_ModuleUpdateAction::_getInstaller()
+ * @see Legacy_ModuleUninstaller
+ * @see Legacy_ModuleInstallUtils
+ * 
+ * @todo These classes are good to abstract again.
  */
-class Legacy_ModuleUninstallAction extends Legacy_AbstractModuleInstallAction
+class Legacy_ModuleUninstallAction extends Legacy_Action
 {
 	/**
+	 * @private
 	 * @var XCube_Delegate
 	 */
 	var $mUninstallSuccess = null;
 	
 	/**
+	 * @private
 	 * @var XCube_Delegate
 	 */
 	var $mUninstallFail = null;
 	
+	/**
+	 * @private
+	 * @var XoopsModule
+	 */
+	var $mXoopsModule = null;
+	
+	/**
+	 * @private
+	 * @var Legacy_ModuleUinstaller
+	 */
+	var $mInstaller = null;
+	
 	function Legacy_ModuleUninstallAction($flag)
 	{
-		parent::Legacy_AbstractModuleInstallAction($flag);
+		parent::Legacy_Action($flag);
 		
 		$this->mUninstallSuccess =& new XCube_Delegate();
 		$this->mUninstallSuccess->register('Legacy_ModuleUninstallAction.UninstallSuccess');
@@ -36,9 +95,58 @@
 		$this->mUninstallFail->register('Legacy_ModuleUninstallAction.UninstallFail');
 	}
 
-	function &_getInstaller($dirname)
+	function prepare(&$controller, &$xoopsUser)
 	{
-		$installer =& new Legacy_ModuleUninstaller($dirname);
+		$dirname = $controller->mRoot->mContext->mRequest->getRequest('dirname');
+		
+		$handler =& xoops_gethandler('module');
+		$this->mXoopsModule =& $handler->getByDirname($dirname);
+		
+		if (!(is_object($this->mXoopsModule) && $this->mXoopsModule->get('isactive') == 0)) {
+			return false;
+		}
+		
+		$this->_setupActionForm();
+		
+		$this->mInstaller =& $this->_getInstaller();
+		
+		//
+		// Set the current object.
+		//
+		$this->mInstaller->setCurrentXoopsModule($this->mXoopsModule);
+		
+		return true;
+	}
+	
+	function &_getInstaller()
+	{
+		$dirname = $this->mXoopsModule->get('dirname');
+		$this->mXoopsModule->loadInfo($dirname, false);
+
+		$info = $this->mXoopsModule->modinfo;
+			
+		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer']['uninstaller'])) {
+			$updateInfo = $info['legacy_installer']['uninstaller'];
+				
+			$className = $updateInfo['class'];
+			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
+			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
+				
+			if ($namespace != null) {
+				$className = "${namespace}_${className}";
+			}
+				
+			if (!class_exists($className) && file_exists($filePath)) {
+				require_once $filePath;
+			}
+				
+			if (class_exists($className)) {
+				$installer =& new $className();
+				return $installer;
+			}
+		}
+		
+		$installer =& new Legacy_ModuleUninstaller();
 		return $installer;
 	}
 	
@@ -48,32 +156,54 @@
 		$this->mActionForm->prepare();
 	}
 
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm->load($this->mXoopsModule);
+		
+		return LEGACY_FRAME_VIEW_INPUT;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		if (isset($_REQUEST['_form_control_cancel'])) {
+			return LEGACY_FRAME_VIEW_CANCEL;
+		}
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
+		
+		$this->mInstaller->setForceMode($this->mActionForm->get('force'));
+		$this->mInstaller->executeUninstall();
+
+		return LEGACY_FRAME_VIEW_SUCCESS;
+	}
+	
 	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
 	{
-		if (!$this->mLog->hasError()) {
-			$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));
+		if (!$this->mInstaller->mLog->hasError()) {
+			$this->mUninstallSuccess->call(new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mXoopsModule->get('dirname') . '.Success'), new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
 		}
 		else {
-			$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));
+			$this->mUninstallFail->call(new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mXoopsModule->get('dirname') . '.Fail'), new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
 		}
 
 		$renderer->setTemplateName("module_uninstall_success.html");
-		$renderer->setAttribute('module',$this->mModuleObject);
-		$renderer->setAttribute('log', $this->mLog->mMessages);
+		$renderer->setAttribute('module',$this->mXoopsModule);
+		$renderer->setAttribute('log', $this->mInstaller->mLog->mMessages);
 	}
 
-	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
+	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
 	{
 		$renderer->setTemplateName("module_uninstall.html");
 		$renderer->setAttribute('actionForm', $this->mActionForm);
-		$renderer->setAttribute('module', $this->mModuleObject);
-	}
-
-	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
-	{
-		$this->executeViewIndex(&$controller, &$xoopsUser, &$renderer);
+		$renderer->setAttribute('module', $this->mXoopsModule);
+		$renderer->setAttribute('currentVersion', round($this->mXoopsModule->get('version') / 100, 2));
 	}
 
 	function executeViewCancel(&$controller, &$xoopsUser, &$renderer)

From minahito ＠ users.sourceforge.jp  Wed Nov  1 22:42:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 22:42:17 +0900
Subject: [xoops-cvslog 5546] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101134217.71AE32AC014@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.3	Wed Nov  1 20:55:09 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Wed Nov  1 22:42:17 2006
@@ -122,7 +122,7 @@
 
 	function _uninstallPreferences()
 	{
-		Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog);
+		Legacy_ModuleUtils::deleteAllConfigs($this->_mXoopsModule, $this->mLog);
 	}
 
 	function _processScript()

From minahito ＠ users.sourceforge.jp  Wed Nov  1 23:56:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  1 Nov 2006 23:56:56 +0900
Subject: [xoops-cvslog 5547] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061101145656.C298A2AC014@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/module_install.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_install.html	Wed Nov  1 23:56:56 2006
@@ -40,10 +40,8 @@
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->get('version') format="%.2f"}>
-	<{if $module->get('version') != $module->modinfo.version * 100 }>
-	  &raquo; <b class="legacy_module_warning"><{math equation=$module->modinfo.version format="%.2f"}></b>
-	<{/if}>
+	<td class="<{cycle values='odd,even'}>">
+	  <{$currentVersion}>
 	</td>
   </tr>
   <tr>

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:01:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:01:08 +0900
Subject: [xoops-cvslog 5548] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061101150108.AA6BC2AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.2	Sun Oct 15 00:54:58 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php	Thu Nov  2 00:01:08 2006
@@ -11,13 +11,54 @@
 require_once XOOPS_LEGACY_PATH."/admin/forms/ModuleInstallForm.class.php";
 
 /**
- * Install module
+ * @brief Module Install function having possibility to extend by module developers.
+ * 
+ * The precondition is that the specified module has been not installed.
+ * 
+ * @section cinstall The custom-installer
+ * 
+ * Module developers can use their own custom-installer in this action. Unlike
+ * the module update function, the standard installer in this action is perhaps
+ * no problems. But, duplicatable modules or some modules with the special
+ * framework may need the custom-installer.
+ * 
+ * @subsection convention Convention
+ * 
+ * See Legacy_ModuleInstallAction::_getInstaller().
+ * 
+ * \li $modversion['legacy_installer']['installer']['class'] = {classname};
+ * \li $modversion['legacy_installer']['installer']['namespace'] = {namespace}; (Optional)
+ * \li $modversion['legacy_installer']['installer']['filepath'] = {filepath}; (Optional)
+ * 
+ * You must declare your sub-class of Legacy_ModuleInstaller as
+ * {namespace}_{classname} in {filepath}. You must specify classname. Others
+ * are decided by the naming convention without your descriptions. Namespace
+ * is ucfirst(dirname). Filepath is "admin/class/{classname}.class.php".
+ * 
+ * For example, "news" module.
+ * 
+ * $modversion['legacy_installer']['installer']['class'] = "Installer";
+ * 
+ * You must declare News_Installer in XOOPS_ROOT_PATH . "/modules/news/admin/class/Installerr.class.php".
+ * 
+ * In the case where you specify the filepath, take care you describe the
+ * filepath with absolute path.
+ * 
+ * @subsection process Install Process
+ * 
+ * \li Gets a instance of the installer class through Legacy_ModuleInstallAction::_getInstaller().
+ * \li Sets the new XoopsModule built from xoops_version, to the instance.
+ * \li Sets a value indicating whether an administrator hopes the force-mode, to the instance.
+ * \li Calls executeInstall().
+ * 
+ * @see Legacy_ModuleInstallAction::_getInstaller()
+ * @see Legacy_ModuleInstaller
+ * @see Legacy_ModuleInstallUtils
+ * 
+ * @todo These classes are good to abstract again.
  */
-class Legacy_ModuleInstallAction extends Legacy_AbstractModuleInstallAction
+class Legacy_ModuleInstallAction extends Legacy_Action
 {
-	var $mLicence;
-	var $mLicenceText;
-
 	/**
 	 * @var XCube_Delegate
 	 */
@@ -28,9 +69,21 @@
 	 */
 	var $mInstallFail = null;
 	
+	/**
+	 * @private
+	 * @var XoopsModule
+	 */
+	var $mXoopsModule = null;
+	
+	/**
+	 * @private
+	 * @var Legacy_ModuleUinstaller
+	 */
+	var $mInstaller = null;
+	
 	function Legacy_ModuleInstallAction($flag)
 	{
-		parent::Legacy_AbstractModuleInstallAction($flag);
+		parent::Legacy_Action($flag);
 		
 		$this->mInstallSuccess =& new XCube_Delegate();
 		$this->mInstallSuccess->register('Legacy_ModuleInstallAction.InstallSuccess');
@@ -39,58 +92,136 @@
 		$this->mInstallFail->register('Legacy_ModuleInstallAction.InstallFail');
 	}
 	
-	function &_getInstaller($dirname)
+	function prepare(&$controller, &$xoopsUser)
 	{
-		$installer =& new Legacy_ModuleInstaller($dirname);
+		$dirname = $controller->mRoot->mContext->mRequest->getRequest('dirname');
+		
+		$handler =& xoops_gethandler('module');
+		$this->mXoopsModule =& $handler->getByDirname($dirname);
+		
+		if (is_object($this->mXoopsModule)) {
+			return false;
+		}
+		
+        $this->mXoopsModule =& $handler->create();
+        $this->mXoopsModule->set('weight', 1);
+        $this->mXoopsModule->loadInfoAsVar($dirname);
+        
+        if ($this->mXoopsModule->get('dirname') == null) {
+            return null;
+        }
+        
+        if ($this->mXoopsModule->get('dirname') == 'system') {
+            $this->mXoopsModule->set('mid', 1);
+        }
+		
+		$this->_setupActionForm();
+		
+		$this->mInstaller =& $this->_getInstaller();
+		
+		//
+		// Set the current object.
+		//
+		$this->mInstaller->setCurrentXoopsModule($this->mXoopsModule);
+		
+		return true;
+	}
+
+	function &_getInstaller()
+	{
+		$dirname = $this->mXoopsModule->get('dirname');
+		$this->mXoopsModule->loadInfo($dirname, false);
+
+		$info = $this->mXoopsModule->modinfo;
+			
+		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer']['installer'])) {
+			$updateInfo = $info['legacy_installer']['installer'];
+				
+			$className = $updateInfo['class'];
+			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
+			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
+				
+			if ($namespace != null) {
+				$className = "${namespace}_${className}";
+			}
+				
+			if (!class_exists($className) && file_exists($filePath)) {
+				require_once $filePath;
+			}
+				
+			if (class_exists($className)) {
+				$installer =& new $className();
+				return $installer;
+			}
+		}
+		
+		$installer =& new Legacy_ModuleInstaller();
 		return $installer;
 	}
-	
+		
 	function _setupActionForm()
 	{
 		$this->mActionForm =& new Legacy_ModuleInstallForm();
 		$this->mActionForm->prepare();
 	}
 
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm->load($this->mXoopsModule);
+		
+		return LEGACY_FRAME_VIEW_INPUT;
+	}
+
+	function execute(&$controller, &$xoopsUser)
 	{
-		if (!$this->mLog->hasError()) {
-			$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));
+		if (isset($_REQUEST['_form_control_cancel'])) {
+			return LEGACY_FRAME_VIEW_CANCEL;
 		}
-		else {
-			$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));
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
 		}
+		
+		$this->mInstaller->setForceMode($this->mActionForm->get('force'));
+		$this->mInstaller->executeInstall();
 
-		$renderer->setTemplateName("module_install_success.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('log', $this->mLog->mMessages);
+		return LEGACY_FRAME_VIEW_SUCCESS;
 	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	
+	/**
+	 * @todo no $renderer. It should be $render.
+	 */
+	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
 	{
-		$renderer->setAttribute('module', $this->mModuleObject);
-		$renderer->setAttribute('actionForm', $this->mActionForm);
-
-		if (isset($this->mModuleObject->modinfo['installer'])) {
-			//
-			// Jump
-			//
-			$controller->executeForward('index.php?action=InstallWizard&dirname=' . $this->mModuleObject->get('dirname'));
+		if (!$this->mInstaller->mLog->hasError()) {
+			$this->mInstallSuccess->call(new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mXoopsModule->get('dirname') . '.Success'), new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
 		}
 		else {
-			$renderer->setTemplateName("module_install.html");
+			$this->mInstallFail->call(new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mXoopsModule->get('dirname') . '.Fail'), new XCube_Ref($this->mXoopsModule), new XCube_Ref($this->mInstaller->mLog));
 		}
+
+		$renderer->setTemplateName("module_install_success.html");
+		$renderer->setAttribute('module', $this->mXoopsModule);
+		$renderer->setAttribute('log', $this->mInstaller->mLog->mMessages);
 	}
 
-	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
+	/**
+	 * @todo no $renderer. It should be $render.
+	 */
+	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
 	{
 		$renderer->setTemplateName("module_install.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('module', $this->mXoopsModule);
 		$renderer->setAttribute('actionForm', $this->mActionForm);
+		$renderer->setAttribute('currentVersion', round($this->mXoopsModule->get('version') / 100, 2));
 	}
-	
-	function executeViewCancel(&$controller, &$xoopsUser, &$renderer)
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
 	{
 		$controller->executeForward("./index.php?action=InstallList");
 	}

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:01:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:01:25 +0900
Subject: [xoops-cvslog 5549] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061101150125.A5B782AC068@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.3	Wed Nov  1 20:55:09 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Thu Nov  2 00:01:25 2006
@@ -52,7 +52,7 @@
  * \li Sets a value indicating whether an administrator hopes the force-mode, to the instance.
  * \li Calls executeUninstall().
  * 
- * @see Legacy_ModuleUpdateAction::_getInstaller()
+ * @see Legacy_ModuleUninstallAction::_getInstaller()
  * @see Legacy_ModuleUninstaller
  * @see Legacy_ModuleInstallUtils
  * 

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:01:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:01:42 +0900
Subject: [xoops-cvslog 5550] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101150142.8859F2AC06D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.3	Tue Oct 31 16:21:21 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Thu Nov  2 00:01:42 2006
@@ -1,141 +1,146 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id$
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH."/admin/class/AbstractModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
 /**
  * This class extends a base class for the process of install module. This is added
  * some private functions.
+ * 
+ * @todo It seems possibility to abstract with other installer classes.
  */
-class Legacy_ModuleInstaller extends Legacy_AbstractModuleInstaller
+class Legacy_ModuleInstaller
 {
-    var $mAgree = false;
+	/**
+	 * @public
+	 * @var Legacy_ModuleUtilsSimpleLog
+	 */
+	var $mLog = null;
+	
+	var $_mForceMode = false;
 	
-	function Legacy_ModuleInstaller($dirname)
+	/**
+	 * @var XoopsModule
+	 */
+	var $_mXoopsModule = null;
+	
+	function Legacy_ModuleInstaller()
 	{
-		parent::Legacy_AbstractModuleInstaller($dirname);
-		
-		$this->mProcessScript->register('Legacy_ModuleInstaller.ProcessScript');
-		$this->mProcessScript->add('Legacy_ModuleInstaller::_processScript');
-		
-		$this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable');
-		$this->mInstallTable->add('Legacy_ModuleUtils::installTable');
-		
-		$this->mInstallTemplate->register('Legacy_ModuleInstaller.InstallTemplate');
-		$this->mInstallTemplate->add('Legacy_ModuleInstaller::_installTemplate');
+		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
 	}
 
-    /**
-     * Load xoops module object that isn't installed and return it.
-     * @static
-     * @access public
-     * @param $dirname string
-     * @return XoopsModule
-     */
-    function &loadModuleObject($dirname)
-    {
-        $ret = null;
-
-        $moduleHandler =& xoops_gethandler('module');
-        $module =& $moduleHandler->getByDirname($dirname);
-
-        if (is_object($module))
-            return $ret;
-
-        $module =& $moduleHandler->create();
-        $module->setVar('weight', 1);
-        $module->loadInfoAsVar($this->mDirname);
-        
-        if ($module->get('dirname') == null) {
-            return $ret;
-        }
-        
-        if ($module->get('dirname') == 'system') {
-            $module->setVar('mid', 1);
-        }
-        
-        if (isset($module->modinfo['installer']) && isset($module->modinfo['installer']['licence']) ) {
-            $this->mAgree = true;
-        }
-        
-        return $module;
-    }
-    
+	/**
+	 * Sets the current XoopsModule.
+	 * 
+	 * @public
+	 * @param XoopsModule $xoopsModule
+	 */
+	function setCurrentXoopsModule(&$xoopsModule)
+	{
+		$this->_mXoopsModule =& $xoopsModule;
+	}
+	
+	/**
+	 * Sets a value indicating whether the force mode is on.
+	 * @param bool $isForceMode
+	 */
+	function setForceMode($isForceMode)
+	{
+		$this->_mForceMode = $isForceMode;
+	}
+	
+	function _installTables()
+	{
+		Legacy_ModuleInstallUtils::installSQLAutomatically($this->_mXoopsModule, $this->mLog);
+	}
+	
+	/**
+	 * @todo Do rewrite.
+	 */
     function _installModule()
     {
-        if (parent::_installModule()) {
-            $gpermHandler =& xoops_gethandler('groupperm');
+		$moduleHandler =& xoops_gethandler('module');
+		if (!$moduleHandler->insert($this->_mXoopsModule)) {
+			$this->mLog->addError("*Could not install module information*");
+			return false;
+		}
+		
+        $gpermHandler =& xoops_gethandler('groupperm');
 
-            //
-            // Add a permission which administrators can manage.
-            //
-            if ($this->mModule->getInfo('hasAdmin')) {
-                $adminPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-                $adminPerm->setVar('gperm_name', 'module_admin');
+        //
+        // Add a permission which administrators can manage.
+        //
+        if ($this->_mXoopsModule->getInfo('hasAdmin')) {
+            $adminPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
+            $adminPerm->setVar('gperm_name', 'module_admin');
 
-                if (!$gpermHandler->insert($adminPerm)) {
-                    $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_ADMIN_PERMISSION);
-                }
+            if (!$gpermHandler->insert($adminPerm)) {
+                $this->mLog->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_ADMIN_PERMISSION);
             }
+        }
 
-            //
-            // Add a permission which administrators can manage. (Special for Legacy System Module)
-            //
-            if ($this->mModule->getVar('dirname') == 'system') {
-				$root =& XCube_Root::getSingleton();
-				$root->mLanguageManager->loadModuleAdminMessageCatalog('system');
-
-                require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
-				
-                $fileHandler = opendir(XOOPS_ROOT_PATH . "/modules/system/admin");
-                while ($file = readdir($fileHandler)) {
-                    $infoFile = XOOPS_ROOT_PATH . "/modules/system/admin/" . $file . "/xoops_version.php";
-                    if (file_exists($infoFile)) {
-                        require_once $infoFile;
-                        if (!empty($modversion['category'])) {
-                            $sysAdminPerm  =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-                            $adminPerm->setVar('gperm_itemid', $modversion['category']);
-                            $adminPerm->setVar('gperm_name', 'system_admin');
-                            if (!$gpermHandler->insert($adminPerm)) {
-                                $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION);
-                            }
-                            unset($sysAdminPerm);
+        //
+        // Add a permission which administrators can manage. (Special for Legacy System Module)
+        //
+        if ($this->_mXoopsModule->getVar('dirname') == 'system') {
+			$root =& XCube_Root::getSingleton();
+			$root->mLanguageManager->loadModuleAdminMessageCatalog('system');
+
+            require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
+			
+            $fileHandler = opendir(XOOPS_ROOT_PATH . "/modules/system/admin");
+            while ($file = readdir($fileHandler)) {
+                $infoFile = XOOPS_ROOT_PATH . "/modules/system/admin/" . $file . "/xoops_version.php";
+                if (file_exists($infoFile)) {
+                    require_once $infoFile;
+                    if (!empty($modversion['category'])) {
+                        $sysAdminPerm  =& $this->_createPermission(XOOPS_GROUP_ADMIN);
+                        $adminPerm->setVar('gperm_itemid', $modversion['category']);
+                        $adminPerm->setVar('gperm_name', 'system_admin');
+                        if (!$gpermHandler->insert($adminPerm)) {
+                            $this->mLog->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION);
                         }
-                        unset($modversion);
+                        unset($sysAdminPerm);
                     }
+                    unset($modversion);
                 }
             }
-            
-            if ($this->mModule->getInfo('hasMain')) {
-                $read_any = $this->mModule->getInfo('read_any');
-                if ($read_any) {
-                    $memberHandler =& xoops_gethandler('member');
-                    $groupObjects =& $memberHandler->getGroups();
-                    //
-                    // Add a permission all group members and guest can read.
-                    //
-                    foreach($groupObjects as $group) {
-                        $readPerm =& $this->_createPermission($group->getVar('groupid'));
-                        $readPerm->setVar('gperm_name', 'module_read');
+        }
+        
+        if ($this->_mXoopsModule->getInfo('hasMain')) {
+            $read_any = $this->_mXoopsModule->getInfo('read_any');
+            if ($read_any) {
+                $memberHandler =& xoops_gethandler('member');
+                $groupObjects =& $memberHandler->getGroups();
+                //
+                // Add a permission all group members and guest can read.
+                //
+                foreach($groupObjects as $group) {
+                    $readPerm =& $this->_createPermission($group->getVar('groupid'));
+                    $readPerm->setVar('gperm_name', 'module_read');
 
-                        if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
-                        }
+                    if (!$gpermHandler->insert($readPerm)) {
+                        $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
                     }
-                } else {
-                    //
-                    // Add a permission which administrators can read.
-                    //
-                    $root =& XCube_Root::getSingleton();
-                    $groups = $root->mContext->mXoopsUser->getGroups();
-                    foreach($groups as $mygroup) {
-                        $readPerm =& $this->_createPermission($mygroup);
-                        $readPerm->setVar('gperm_name', 'module_read');
+                }
+            } else {
+                //
+                // Add a permission which administrators can read.
+                //
+                $root =& XCube_Root::getSingleton();
+                $groups = $root->mContext->mXoopsUser->getGroups();
+                foreach($groups as $mygroup) {
+                    $readPerm =& $this->_createPermission($mygroup);
+                    $readPerm->setVar('gperm_name', 'module_read');
 
-                        if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
-                        }
+                    if (!$gpermHandler->insert($readPerm)) {
+                        $this->mLog->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
                     }
                 }
             }
@@ -155,7 +160,7 @@
         $perm =& $gpermHandler->create();
 
         $perm->setVar('gperm_groupid', $group);
-        $perm->setVar('gperm_itemid', $this->mModule->getVar('mid'));
+        $perm->setVar('gperm_itemid', $this->_mXoopsModule->getVar('mid'));
         $perm->setVar('gperm_modid', 1);
         
         return $perm;
@@ -164,46 +169,30 @@
 	/**
 	 * @static
 	 */
-	function _installTemplate(&$module, &$log)
+	function _installTemplates()
 	{
-		Legacy_ModuleUtils::installAllModuleTemplates($module, $log);
+		Legacy_ModuleInstallUtils::installAllOfModuleTemplates($this->_mXoopsModule, $this->mLog);
 	}
 
-    function _installBlock()
+    function _installBlocks()
     {
-        $definedBlocks = $this->mModule->getInfo('blocks');
-        if($definedBlocks == false)
-            return true;
-
-        $blockHandler =& xoops_gethandler('block');
-
-        $func_num=0;
-        foreach ($definedBlocks as $block) {
-            $func_num++;
-            $newBlock =& Legacy_ModuleUtils::createBlockByInfo($this->mModule, $block, $func_num);
-
-            Legacy_ModuleUtils::installBlock($this->mModule, $newBlock, $block, $this->mLog);
-        }
+		Legacy_ModuleInstallUtils::installAllOfBlocks($this->_mXoopsModule, $this->mLog);
     }
 
-	function _installNotification()
-	{
-	}
-	
-    function _installPreference()
+    function _installPreferences()
     {
-        Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
+        Legacy_ModuleInstallUtils::installAllOfConfigs($this->_mXoopsModule, $this->mLog);
     }
     
-    function _processScript(&$module, &$log)
+    function _processScript()
     {
-        $installScript = trim($module->getInfo('onInstall'));
+        $installScript = trim($this->_mXoopsModule->getInfo('onInstall'));
         if ($installScript != false) {
-            require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-            $funcName = 'xoops_module_install_' . $module->getVar('dirname');
+            require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
+            $funcName = 'xoops_module_install_' . $this->_mXoopsModule->get('dirname');
             if (function_exists($funcName)) {
                 if (!call_user_func($funcName, $module)) {
-                    $log->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+                    $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
                 }
             }
         }
@@ -212,11 +201,11 @@
 	function _processReport()
 	{
 		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+			$this->mLog->add(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->_mXoopsModule->get('name')));
 		}
 		else {
-			if (is_object($this->mModule)) {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+			if (is_object($this->_mXoopsModule)) {
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->_mXoopsModule->get('name')));
 			}
 			else {
 				$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE, $this->mDirname));
@@ -224,10 +213,47 @@
 		}
 	}
 
-    function hasAgree()
-    {
-        return $this->mAgree;
-    }
+	/**
+	 * @todo Check whether $this->_mXoopsObject is ready.
+	 */
+	function executeInstall()
+	{
+		$this->_installTables();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_installModule();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_installTemplates();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+
+		$this->_installBlocks();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+		
+		$this->_installPreferences();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
+		
+		$this->_processScript();
+		
+		$this->_processReport();
+		
+		return true;
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:02:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:02:00 +0900
Subject: [xoops-cvslog 5551] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101150200.35BD82AC068@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.1	Wed Nov  1 20:54:56 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Nov  2 00:02:00 2006
@@ -15,6 +15,54 @@
 class Legacy_ModuleInstallUtils
 {
 	/**
+	 * Executes SQL file which xoops_version of $module specifies. This
+	 * function is usefull for installers, but it's impossible to control
+	 * for detail.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @note FOR THE CUSTOM-INSTALLER
+	 */
+	function installSQLAutomatically(&$module, &$log)
+	{
+		$sqlfileInfo =& $module->getInfo('sqlfile');
+		$dirname = $module->getVar('dirname');
+
+		if (!isset($sqlfileInfo[XOOPS_DB_TYPE])) {
+			return;
+		}
+		
+		require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
+		$scanner =& new Legacy_SQLScanner();
+		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
+		
+		$sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
+		if (!$scanner->loadFile(XOOPS_MODULE_PATH . "/${dirname}/" . $sqlfile)) {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
+			return false;
+		}
+
+		$scanner->parse();
+		$sqls = $scanner->getSQL();
+		
+		$root =& XCube_Root::getSingleton();
+		$db =& $root->mController->getDB();
+		
+		//
+		// TODO The following variable exists for rollback, but it is not implemented.
+		//
+		foreach ($sqls as $sql) {
+			if (!$db->query($sql)) {
+				$log->addError($db->error());
+				return;
+			}
+		}
+		
+		$log->addReport(_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED);
+	}
+	
+	/**
 	 * Installs all of module templates $module specify. This function is
 	 * usefull for installer and updater. In the case of updater, you should
 	 * uninstall all of module templates before this function.
@@ -37,10 +85,69 @@
         $templates = $module->getInfo('templates');
         if ($templates != false) {
             foreach ($templates as $template) {
-                Legacy_ModuleUtils::installModuleTemplate($module, $template, $log);
+                Legacy_ModuleInstallUtils::installModuleTemplate($module, $template, $log);
             }
         }
 	}
+	
+	/**
+	 * Inserts the specified template to DB.
+	 * 
+	 * @section Attention
+	 * 
+	 * This function depends the specific spec of Legacy_RenderSystem, but this
+	 * static function is needed by the 2nd installer of Legacy System.
+	 * 
+	 * @static
+	 * @param XoopsModule $module
+	 * @param string[][] $template
+	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @return bool
+	 * 
+	 * @note This is not usefull a litte for custom-installers.
+	 * @todo We'll need the way to specify the template by identity or others.
+	 */
+	function installModuleTemplate($module, $template, &$log)
+	{
+		$tplHandler =& xoops_gethandler('tplfile');
+
+		$fileName = trim($template['file']);
+
+		$tpldata = Legacy_ModuleInstallUtils::readTemplateFile($module->get('dirname'), $fileName);
+		if ($tpldata == false)
+			return false;
+
+		//
+		// Create template file object, then store it.
+		//
+		$tplfile =& $tplHandler->create();
+		$tplfile->setVar('tpl_refid', $module->getVar('mid'));
+		$tplfile->setVar('tpl_lastimpoerted', 0);
+		$tplfile->setVar('tpl_lastmodified', time());
+
+		if (preg_match("/\.css$/i", $fileName)) {
+			$tplfile->setVar('tpl_type', 'css');
+		}
+		else {
+			$tplfile->setVar('tpl_type', 'module');
+		}
+
+		$tplfile->setVar('tpl_source', $tpldata, true);
+		$tplfile->setVar('tpl_module', $module->getVar('dirname'));
+		$tplfile->setVar('tpl_tplset', 'default');
+		$tplfile->setVar('tpl_file', $fileName, true);
+
+		$description = isset($tpl['description']) ? $tpl['description'] : '';
+		$tplfile->setVar('tpl_desc', $description, true);
+		
+		if ($tplHandler->insert($tplfile)) {
+			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_TEMPLATE_INSTALLED, $fileName));
+		}
+		else {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
+			return false;
+		}
+	}
 
 	/**
 	 * Uninstalls all of module templates $module specify. This function is
@@ -117,8 +224,8 @@
 		$func_num = 0;
 		foreach ($definedBlocks as $block) {
 			$func_num++;
-			$newBlock =& Legacy_ModuleUtils::createBlockByInfo($module, $block, $func_num);
-			Legacy_ModuleUtils::installBlock($module, $newBlock, $block, $this->mLog);
+			$newBlock =& Legacy_ModuleInstallUtils::createBlockByInfo($module, $block, $func_num);
+			Legacy_ModuleInstallUtils::installBlock($module, $newBlock, $block, $this->mLog);
         }
 	}
 
@@ -153,6 +260,128 @@
 	}
 	
 	/**
+	 * Create XoopsBlock object by array that is defined in xoops_version, return it.
+	 * @param $module XoopsModule
+	 * @param $block array
+	 * @return XoopsBlock
+	 */
+	function &createBlockByInfo(&$module, $block, $func_num)
+	{
+		$options = isset($block['options']) ? $block['options'] : null;
+		$edit_func = isset($block['edit_func']) ? $block['edit_func'] : null;
+		$template = isset($block['template']) ? $block['template'] : null;
+		$visible = isset($block['visible']) ? $block['visible'] : (isset($block['visible_any']) ? $block['visible_any']: 0);
+		$blockHandler =& xoops_gethandler('block');
+		$blockObj =& $blockHandler->create();
+
+		$blockObj->set('mid', $module->getVar('mid'));
+		$blockObj->set('options', $options);
+		$blockObj->set('name', $block['name']);
+		$blockObj->set('title', $block['name']);
+		$blockObj->set('block_type', 'M');
+		$blockObj->set('c_type', 1);
+		$blockObj->set('isactive', 1);
+		$blockObj->set('dirname', $module->getVar('dirname'));
+		$blockObj->set('func_file', $block['file']);
+		
+		//
+		// IMPORTANT CONVENTION
+		//
+		$show_func = "";
+		if (isset($block['class'])) {
+			$show_func = "cl::" . $block['class'];
+		}
+		else {
+			$show_func = $block['show_func'];
+		}
+		
+		$blockObj->set('show_func', $show_func);
+		$blockObj->set('edit_func', $edit_func);
+		$blockObj->set('template', $template);
+		$blockObj->set('last_modified', time());
+		$blockObj->set('visible', $visible);
+		
+		$func_num = isset($block['func_num']) ? intval($block['func_num']) : $func_num;
+		$blockObj->set('func_num', $func_num);
+
+		return $blockObj;
+	}
+	
+	/**
+	 * This function can receive both new and update.
+	 * @param $module XoopsModule
+	 * @param $blockObj XoopsBlock
+	 * @param $block array
+	 * @return bool
+	 */
+	function installBlock(&$module, &$blockObj, &$block, &$log)
+	{
+		$isNew = $blockObj->isNew();
+		$blockHandler =& xoops_gethandler('block');
+
+        if (!empty($block['show_all_module'])) {
+            $autolink = false;
+        } else {
+            $autolink = true;
+        }
+		if (!$blockHandler->insert($blockObj, $autolink)) {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
+
+			return false;
+		}
+		else {
+			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
+
+			$tplHandler =& xoops_gethandler('tplfile');
+
+			if (!Legacy_ModuleInstallUtils::installAllOfBlockTemplates($module, $blockObj)) {
+				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->getVar('name')));
+			}
+			
+			//
+			// Process of a permission.
+			//
+			if ($isNew) {
+                if (!empty($block['show_all_module'])) {
+        			$link_sql = "INSERT INTO " . $blockHandler->db->prefix('block_module_link') . " (block_id, module_id) VALUES (".$blockObj->getVar('bid').", 0)";
+		        	if (!$blockHandler->db->query($link_sql)) {
+       					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
+		        	}
+    			}
+   				$gpermHandler =& xoops_gethandler('groupperm');
+   				$bperm =& $gpermHandler->create();
+				$bperm->setVar('gperm_itemid', $blockObj->getVar('bid'));
+				$bperm->setVar('gperm_name', 'block_read');
+				$bperm->setVar('gperm_modid', 1);
+				
+				if (!empty($block['visible_any'])) {
+    				$memberHandler =& xoops_gethandler('member');
+    				$groupObjects =& $memberHandler->getGroups();
+    				foreach($groupObjects as $group) {
+        				$bperm->setVar('gperm_groupid', $group->getVar('groupid'));
+        				$bperm->setNew();
+        				if (!$gpermHandler->insert($bperm)) {
+        					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
+        				}
+        			}
+				} else {
+				    $root =& XCube_Root::getSingleton();
+                    $groups = $root->mContext->mXoopsUser->getGroups();
+                    foreach ($groups as $mygroup) {
+        				$bperm->setVar('gperm_groupid', $mygroup);
+        				$bperm->setNew();
+        				if (!$gpermHandler->insert($bperm)) {
+        					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
+    				    }
+    				}
+				}
+			}
+
+			return true;
+		}
+	}
+	
+	/**
 	 * Uninstalls a block which $block specifies. In the same time, deletes
 	 * permissions for the block.
 	 * 
@@ -178,6 +407,252 @@
 		$criteria->add(new Criteria('gperm_modid', 1));
 		$gpermHandler->deleteAll($criteria);
     }
+	
+	/**
+	 * Save the information of block's template specified and the source code of it
+	 * to database.
+	 * @return bool
+	 */
+	function installAllOfBlockTemplates(&$module, &$block)
+	{
+		if ($block->get('template') == null) {
+			return true;
+		}
+		
+		$tplHandler =& xoops_gethandler('tplfile');
+
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('tpl_type', 'block'));
+		$criteria->add(new Criteria('tpl_tplset', 'default'));
+		$criteria->add(new Criteria('tpl_module', $module->getVar('dirname')));
+		$criteria->add(new Criteria('tpl_file', $block->getVar('template')));
+		$tplfiles =& $tplHandler->getObjects($criteria);
+
+		if (count($tplfiles) > 0) {
+			$tplfile =& $tplfiles[0];
+		}
+		else {
+			$tplfile =& $tplHandler->create();
+			$tplfile->setVar('tpl_refid', $block->getVar('bid'));
+			$tplfile->setVar('tpl_tplset', 'default');
+			$tplfile->setVar('tpl_file', $block->getVar('template'));
+			$tplfile->setVar('tpl_module', $module->getVar('dirname'));
+			$tplfile->setVar('tpl_type', 'block');
+			// $tplfile->setVar('tpl_desc', $tpl_desc);
+			$tplfile->setVar('tpl_lastimported', 0);
+		}
+		
+		$tplSource = Legacy_ModuleInstallUtils::readTemplateFile($module->getVar('dirname'), $block->getVar('template'), true);
+		$tplfile->setVar('tpl_source', $tplSource);
+		$tplfile->setVar('tpl_lastmodified', time());
+
+		return $tplHandler->insert($tplfile);
+	}
+	
+	/**
+	 * Read template file, return it.
+	 * 
+	 * @note This is must, but it depends on ...
+	 */
+	function readTemplateFile($dirname, $fileName, $isblock = false)
+	{
+		//
+		// Load template data
+		//
+		if ($isblock) {
+			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/blocks/" . $fileName;
+		}
+		else {
+			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/" . $fileName;
+		}
+
+		if (!file_exists($filePath)) {
+			return false;
+		}
+
+		$lines = file($filePath);
+		if ($lines == false) {
+			return false;
+		}
+
+		$tpldata = "";
+		foreach ($lines as $line) {
+			//
+			// Unify linefeed to "\r\n" 
+			//
+			$tpldata .= str_replace("\n", "\r\n", str_replace("\r\n", "\n", $line));
+		}
+		
+		return $tpldata;
+	}
+
+	function installAllOfConfigs(&$module, &$log)
+	{
+		$configInfos = Legacy_ModuleInstallUtils::getConfigInfosFromManifesto($module);
+
+		$count = 0;
+		if (is_array($configInfos)) {
+			$configHandler =& xoops_gethandler('config');
+			
+			foreach ($configInfos as $configInfo) {
+				$config =& $configHandler->createConfig();
+				
+				$config->loadFromConfigInfo($module->get('mid'), $configInfo, $count++);
+				
+				if ($configHandler->insertConfig($config)) {
+					$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $configInfo['name']));
+				}
+				else {
+					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
+				}
+				
+				unset($config);
+			}
+		}
+	}
+	
+	/**
+	 * Get & build config items from Manifesto by specific module object.
+	 */	
+	function &getConfigInfosFromManifesto(&$module)
+	{
+		$configInfos = $module->getInfo('config');
+		
+		//
+		// Insert comment config by old style.
+		//
+		if ($module->getVar('hascomments') !=0 ) {
+			require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
+
+			$configInfos[] = array('name' => 'com_rule',
+			                         'title' => '_CM_COMRULES',
+			                         'description' => '',
+			                         'formtype' => 'select',
+			                         'valuetype' => 'int',
+			                         'default' => 1,
+			                         'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
+			                   );
+
+			$configInfos[] = array('name' => 'com_anonpost',
+			                         'title' => '_CM_COMANONPOST',
+			                         'description' => '',
+			                         'formtype' => 'yesno',
+			                         'valuetype' => 'int',
+			                         'default' => 0
+			                   );
+		}
+
+		//
+		// Insert comment config by old style.
+		//
+		if ($module->get('hasnotification') != 0) {
+			require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+			require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			
+			$t_options = array();
+			$t_options['_NOT_CONFIG_DISABLE'] = XOOPS_NOTIFICATION_DISABLE;
+			$t_options['_NOT_CONFIG_ENABLEBLOCK'] = XOOPS_NOTIFICATION_ENABLEBLOCK;
+			$t_options['_NOT_CONFIG_ENABLEINLINE'] = XOOPS_NOTIFICATION_ENABLEINLINE;
+			$t_options['_NOT_CONFIG_ENABLEBOTH'] = XOOPS_NOTIFICATION_ENABLEBOTH;
+			
+			$configInfos[] = array(
+				'name' => 'notification_enabled',
+				'title' => '_NOT_CONFIG_ENABLE',
+				'description' => '_NOT_CONFIG_ENABLEDSC',
+				'formtype' => 'select',
+				'valuetype' => 'int',
+				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
+				'options' => $t_options
+			);
+			
+			//
+			// FIXME: doesn't work when update module... can't read back the
+			//        array of options properly...  " changing to &quot;
+			//
+			
+			unset ($t_options);
+			
+			$t_options = array();
+			$t_categoryArr =& notificationCategoryInfo('', $module->get('mid'));
+			foreach ($t_categoryArr as $t_category) {
+				$t_eventArr =& notificationEvents($t_category['name'], false, $module->get('mid'));
+				foreach ($t_eventArr as $t_event) {
+					if (!empty($event['invisible'])) {
+						continue;
+					}
+					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
+					$t_options[$t_optionName] = $t_category['name'] . '-' . $t_event['name'];
+				}
+			}
+				
+			$configInfos[] = array(
+				'name' => 'notification_events',
+				'title' => '_NOT_CONFIG_EVENTS',
+				'description' => '_NOT_CONFIG_EVENTSDSC',
+				'formtype' => 'select_multi',
+				'valuetype' => 'array',
+				'default' => array_values($t_options),
+				'options' => $t_options
+			);
+		}
+		
+		return $configInfos;
+	}
+	
+	/**
+	 * Delete all configs of $module.
+	 *
+	 * @param $module XoopsModule
+	 */
+	function uninstallAllOfConfigs(&$module, &$log)
+	{
+		if ($module->get('hasconfig') == 0) {
+			return;
+		}
+
+		$configHandler =& xoops_gethandler('config');
+		$configs =& $configHandler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
+
+		if (count($configs) == 0) {
+			return;
+		}
+
+		foreach ($configs as $config) {
+			$configHandler->deleteConfig($config);
+		}
+	}
+	
+	/**
+	 * Executes SQL query as cube style.
+	 */
+	function DBquery($query, &$module, $log)
+	{
+		require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
+		
+		$successFlag = true;
+		
+		$scanner =& new Legacy_CubeStyleSQLScanner();
+		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
+		$scanner->setDirname($module->get('dirname'));
+		$scanner->setBuffer($query);
+		$scanner->parse();
+		$sqlArr = $scanner->getSQL();
+
+		$root =& XCube_Root::getSingleton();
+		
+		foreach ($sqlArr as $sql) {		
+			if ($root->mController->mDB->query($sql)) {
+				$log->addReport("Success: ${sql}");
+				$successFlag &= true;
+			}
+			else {
+				$log->addError("Failure: ${sql}");
+				$successFlag = false;
+			}
+		}
+		
+		return $successFlag;
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:02:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:02:14 +0900
Subject: [xoops-cvslog 5552] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101150214.7D4802AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.5	Wed Nov  1 20:55:09 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php	Thu Nov  2 00:02:14 2006
@@ -53,209 +53,14 @@
  */
 class Legacy_ModuleUtils
 {
-	/**
-	 */
-	function installTable(&$module, &$log)
-	{
-		$sqlfileInfo =& $module->getInfo('sqlfile');
-		$dirname = $module->getVar('dirname');
-
-		if (!isset($sqlfileInfo[XOOPS_DB_TYPE])) {
-			return;
-		}
-		
-		require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
-		$scanner =& new Legacy_SQLScanner();
-		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
-		
-		$sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
-		if (!$scanner->loadFile(XOOPS_MODULE_PATH . "/${dirname}/" . $sqlfile)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
-			return false;
-		}
-
-		$scanner->parse();
-		$sqls = $scanner->getSQL();
-		
-		$root =& XCube_Root::getSingleton();
-		$db =& $root->mController->getDB();
-		
-		//
-		// TODO The following variable exists for rollback, but it is not implemented.
-		//
-		foreach ($sqls as $sql) {
-			if (!$db->query($sql)) {
-				$log->addError($db->error());
-				return;
-			}
-		}
-		
-		$log->addReport(_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED);
-	}
-
-	/**
-	 *  Insert template to DB.
-	 *  This function depends on the structure of Legacy_RenderSystem. We should
-	 * move this to another mechanism.
-	 *
-	 * @param $dirname string
-	 * @param $$template string[][]
-	 * @param $log Legacy_ModuleUtilsSimpleLog *
-	 * @param bool
-	 * 
-	 * @deprecated see installModuleTemplate()
-	 */
-	function installTemplate($module, $template, &$log)
-	{
-		return Legacy_ModuleUtils::installModuleTemplate($module, $template, $log);
-	}
-	
-	function installModuleTemplate($module, $template, &$log)
-	{
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$fileName = trim($template['file']);
-
-		$tpldata = Legacy_ModuleUtils::readTemplateFile($module->get('dirname'), $fileName);
-		if ($tpldata == false)
-			return false;
-
-		//
-		// Create template file object, then store it.
-		//
-		$tplfile =& $tplHandler->create();
-		$tplfile->setVar('tpl_refid', $module->getVar('mid'));
-		$tplfile->setVar('tpl_lastimpoerted', 0);
-		$tplfile->setVar('tpl_lastmodified', time());
-
-		if (preg_match("/\.css$/i", $fileName)) {
-			$tplfile->setVar('tpl_type', 'css');
-		}
-		else {
-			$tplfile->setVar('tpl_type', 'module');
-		}
-
-		$tplfile->setVar('tpl_source', $tpldata, true);
-		$tplfile->setVar('tpl_module', $module->getVar('dirname'));
-		$tplfile->setVar('tpl_tplset', 'default');
-		$tplfile->setVar('tpl_file', $fileName, true);
-
-		$description = isset($tpl['description']) ? $tpl['description'] : '';
-		$tplfile->setVar('tpl_desc', $description, true);
-		
-		if ($tplHandler->insert($tplfile)) {
-			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_TEMPLATE_INSTALLED, $fileName));
-		}
-		else {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
-			return false;
-		}
-	}
-
-	/**
-	 * Installs all of module templates.
-	 */	
-	function installAllModuleTemplates(&$module, &$log)
-	{
-        $templates = $module->getInfo('templates');
-        if ($templates != false) {
-            foreach ($templates as $template) {
-                Legacy_ModuleUtils::installModuleTemplate($module, $template, $log);
-            }
-        }
-	}
-	
-	/**
-	 * Read template file, return it.
-	 *
-	 * @return string or false
-	 */
-	function readTemplateFile($dirname, $fileName, $isblock = false)
-	{
-		//
-		// Load template data
-		//
-		if ($isblock) {
-			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/blocks/" . $fileName;
-		}
-		else {
-			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/" . $fileName;
-		}
-
-		if (!file_exists($filePath)) {
-			return false;
-		}
-
-		$lines = file($filePath);
-		if ($lines == false) {
-			return false;
-		}
-
-		$tpldata = "";
-		foreach ($lines as $line) {
-			//
-			// Unify linefeed to "\r\n" 
-			//
-			$tpldata .= str_replace("\n", "\r\n", str_replace("\r\n", "\n", $line));
-		}
-		
-		return $tpldata;
-	}
-	
-	/**
-	 * Create XoopsBlock object by array that is defined in xoops_version, return it.
-	 * @param $module XoopsModule
-	 * @param $block array
-	 * @return XoopsBlock
-	 */
-	function &createBlockByInfo(&$module, $block, $func_num)
-	{
-		$options = isset($block['options']) ? $block['options'] : null;
-		$edit_func = isset($block['edit_func']) ? $block['edit_func'] : null;
-		$template = isset($block['template']) ? $block['template'] : null;
-		$visible = isset($block['visible']) ? $block['visible'] : (isset($block['visible_any']) ? $block['visible_any']: 0);
-		$blockHandler =& xoops_gethandler('block');
-		$blockObj =& $blockHandler->create();
-
-		$blockObj->set('mid', $module->getVar('mid'));
-		$blockObj->set('options', $options);
-		$blockObj->set('name', $block['name']);
-		$blockObj->set('title', $block['name']);
-		$blockObj->set('block_type', 'M');
-		$blockObj->set('c_type', 1);
-		$blockObj->set('isactive', 1);
-		$blockObj->set('dirname', $module->getVar('dirname'));
-		$blockObj->set('func_file', $block['file']);
-		
-		//
-		// IMPORTANT CONVENTION
-		//
-		$show_func = "";
-		if (isset($block['class'])) {
-			$show_func = "cl::" . $block['class'];
-		}
-		else {
-			$show_func = $block['show_func'];
-		}
-		
-		$blockObj->set('show_func', $show_func);
-		$blockObj->set('edit_func', $edit_func);
-		$blockObj->set('template', $template);
-		$blockObj->set('last_modified', time());
-		$blockObj->set('visible', $visible);
-		
-		$func_num = isset($block['func_num']) ? intval($block['func_num']) : $func_num;
-		$blockObj->set('func_num', $func_num);
-
-		return $blockObj;
-	}
-
     /**
      * Merge existing block XoopsBlock object and new XoopsBlock object from xoops_verion
      * @param $oldBlock XoopsBlock
      * @param $newBlock XoopsBlock
      * @param $changedFlag bool
      * @return XoopsBlock
+     * 
+     * @deprecated
      */
 	function &mergeBlockObject(&$oldBlock, &$newBlock, &$changedFlag)
     {
@@ -287,371 +92,9 @@
 		return $blockObj;
     }
 
-	/**
-	 * This function can receive both new and update.
-	 * @param $module XoopsModule
-	 * @param $blockObj XoopsBlock
-	 * @param $block array
-	 * @return bool
-	 */
-	function installBlock(&$module, &$blockObj, &$block, &$log)
-	{
-		$isNew = $blockObj->isNew();
-		$blockHandler =& xoops_gethandler('block');
-
-        if (!empty($block['show_all_module'])) {
-            $autolink = false;
-        } else {
-            $autolink = true;
-        }
-		if (!$blockHandler->insert($blockObj, $autolink)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
-
-			return false;
-		}
-		else {
-			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
-
-			$tplHandler =& xoops_gethandler('tplfile');
-
-			if (!Legacy_ModuleUtils::installBlockTemplate($module, $blockObj)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->getVar('name')));
-			}
-			
-			//
-			// Process of a permission.
-			//
-			if ($isNew) {
-                if (!empty($block['show_all_module'])) {
-        			$link_sql = "INSERT INTO " . $blockHandler->db->prefix('block_module_link') . " (block_id, module_id) VALUES (".$blockObj->getVar('bid').", 0)";
-		        	if (!$blockHandler->db->query($link_sql)) {
-       					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
-		        	}
-    			}
-   				$gpermHandler =& xoops_gethandler('groupperm');
-   				$bperm =& $gpermHandler->create();
-				$bperm->setVar('gperm_itemid', $blockObj->getVar('bid'));
-				$bperm->setVar('gperm_name', 'block_read');
-				$bperm->setVar('gperm_modid', 1);
-				
-				if (!empty($block['visible_any'])) {
-    				$memberHandler =& xoops_gethandler('member');
-    				$groupObjects =& $memberHandler->getGroups();
-    				foreach($groupObjects as $group) {
-        				$bperm->setVar('gperm_groupid', $group->getVar('groupid'));
-        				$bperm->setNew();
-        				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
-        				}
-        			}
-				} else {
-				    $root =& XCube_Root::getSingleton();
-                    $groups = $root->mContext->mXoopsUser->getGroups();
-                    foreach ($groups as $mygroup) {
-        				$bperm->setVar('gperm_groupid', $mygroup);
-        				$bperm->setNew();
-        				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
-    				    }
-    				}
-				}
-			}
-
-			return true;
-		}
-	}
-
-	/**
-	 * Installs all of blocks of the specified module.
-	 */	
-	function installAllBlocks(&$module, &$log)
-	{
-		$definedBlocks = $module->getInfo('blocks');
-		if($definedBlocks == false) {
-			return true;
-		}
-		
-		$handler =& xoops_gethandler('block');
-
-		$func_num = 0;
-		foreach ($definedBlocks as $block) {
-			$func_num++;
-			$newBlock =& Legacy_ModuleUtils::createBlockByInfo($module, $block, $func_num);
-			Legacy_ModuleUtils::installBlock($module, $newBlock, $block, $this->mLog);
-        }
-	}
-	
-	function uninstallBlock(&$block, &$log)
-	{
-		$blockHandler =& xoops_gethandler('block');
-		$blockHandler->delete($block);
-		$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
-		//
-		// delete permission
-		//
-		$gpermHandler =& xoops_gethandler('groupperm');
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('gperm_name', 'block_read'));
-		$criteria->add(new Criteria('gperm_itemid', $block->getVar('bid')));
-		$criteria->add(new Criteria('gperm_modid', 1));
-		$gpermHandler->deleteAll($criteria);
-    }
-    
-	/**
-	 * Uninstalls all of blocks installing now.
-	 * 
-	 * @note check at Beta 3.
-	 */
-	function uninstallAllBlocks(&$module, &$log)
-	{
-		$handler =& xoops_gethandler('block');
-		$blockArr =& $handler->getByModule($module->get('mid'));
-		
-		$successFlag = true;
-		
-		foreach (array_keys($blockArr) as $idx) {
-			$successFlag &= Legacy_ModuleUtils::uninstallBlock($blockArr[$idx], $log);
-		}
-		
-		return $successFlag;
-	}
-	
-	/**
-	 * Save the information of block's template specified and the source code of it
-	 * to database.
-	 * @return bool
-	 */
-	function installBlockTemplate(&$module, &$block)
-	{
-		if ($block->get('template') == null) {
-			return true;
-		}
-		
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('tpl_type', 'block'));
-		$criteria->add(new Criteria('tpl_tplset', 'default'));
-		$criteria->add(new Criteria('tpl_module', $module->getVar('dirname')));
-		$criteria->add(new Criteria('tpl_file', $block->getVar('template')));
-		$tplfiles =& $tplHandler->getObjects($criteria);
-
-		if (count($tplfiles) > 0) {
-			$tplfile =& $tplfiles[0];
-		}
-		else {
-			$tplfile =& $tplHandler->create();
-			$tplfile->setVar('tpl_refid', $block->getVar('bid'));
-			$tplfile->setVar('tpl_tplset', 'default');
-			$tplfile->setVar('tpl_file', $block->getVar('template'));
-			$tplfile->setVar('tpl_module', $module->getVar('dirname'));
-			$tplfile->setVar('tpl_type', 'block');
-			// $tplfile->setVar('tpl_desc', $tpl_desc);
-			$tplfile->setVar('tpl_lastimported', 0);
-		}
-		
-		$tplSource = Legacy_ModuleUtils::readTemplateFile($module->getVar('dirname'), $block->getVar('template'), true);
-		$tplfile->setVar('tpl_source', $tplSource);
-		$tplfile->setVar('tpl_lastmodified', time());
-
-		return $tplHandler->insert($tplfile);
-	}
-
-	function insertAllConfigs(&$module, &$log)
-	{
-		$configInfos = Legacy_ModuleUtils::getConfigInfosFromManifesto($module);
-
-		$count = 0;
-		if (is_array($configInfos)) {
-			$configHandler =& xoops_gethandler('config');
-			
-			foreach ($configInfos as $configInfo) {
-				$config =& $configHandler->createConfig();
-				
-				$config->loadFromConfigInfo($module->get('mid'), $configInfo, $count++);
-				
-				if ($configHandler->insertConfig($config)) {
-					$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $configInfo['name']));
-				}
-				else {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
-				}
-				
-				unset($config);
-			}
-		}
-	}
-
-	/**
-	 * Get & build config items from Manifesto by specific module object.
-	 */	
-	function &getConfigInfosFromManifesto(&$module)
-	{
-		$configInfos = $module->getInfo('config');
-		
-		//
-		// Insert comment config by old style.
-		//
-		if ($module->getVar('hascomments') !=0 ) {
-			require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
-
-			$configInfos[] = array('name' => 'com_rule',
-			                         'title' => '_CM_COMRULES',
-			                         'description' => '',
-			                         'formtype' => 'select',
-			                         'valuetype' => 'int',
-			                         'default' => 1,
-			                         'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
-			                   );
-
-			$configInfos[] = array('name' => 'com_anonpost',
-			                         'title' => '_CM_COMANONPOST',
-			                         'description' => '',
-			                         'formtype' => 'yesno',
-			                         'valuetype' => 'int',
-			                         'default' => 0
-			                   );
-		}
-
-		//
-		// Insert comment config by old style.
-		//
-		if ($module->get('hasnotification') != 0) {
-			require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-			require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-			
-			$t_options = array();
-			$t_options['_NOT_CONFIG_DISABLE'] = XOOPS_NOTIFICATION_DISABLE;
-			$t_options['_NOT_CONFIG_ENABLEBLOCK'] = XOOPS_NOTIFICATION_ENABLEBLOCK;
-			$t_options['_NOT_CONFIG_ENABLEINLINE'] = XOOPS_NOTIFICATION_ENABLEINLINE;
-			$t_options['_NOT_CONFIG_ENABLEBOTH'] = XOOPS_NOTIFICATION_ENABLEBOTH;
-			
-			$configInfos[] = array(
-				'name' => 'notification_enabled',
-				'title' => '_NOT_CONFIG_ENABLE',
-				'description' => '_NOT_CONFIG_ENABLEDSC',
-				'formtype' => 'select',
-				'valuetype' => 'int',
-				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
-				'options' => $t_options
-			);
-			
-			//
-			// FIXME: doesn't work when update module... can't read back the
-			//        array of options properly...  " changing to &quot;
-			//
-			
-			unset ($t_options);
-			
-			$t_options = array();
-			$t_categoryArr =& notificationCategoryInfo('', $module->get('mid'));
-			foreach ($t_categoryArr as $t_category) {
-				$t_eventArr =& notificationEvents($t_category['name'], false, $module->get('mid'));
-				foreach ($t_eventArr as $t_event) {
-					if (!empty($event['invisible'])) {
-						continue;
-					}
-					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
-					$t_options[$t_optionName] = $t_category['name'] . '-' . $t_event['name'];
-				}
-			}
-				
-			$configInfos[] = array(
-				'name' => 'notification_events',
-				'title' => '_NOT_CONFIG_EVENTS',
-				'description' => '_NOT_CONFIG_EVENTSDSC',
-				'formtype' => 'select_multi',
-				'valuetype' => 'array',
-				'default' => array_values($t_options),
-				'options' => $t_options
-			);
-		}
-		
-		return $configInfos;
-	}
-	
-
-	/**
-	 * Delete all configs of $module.
-	 *
-	 * @param $module XoopsModule
-	 */
-	function deleteAllConfigs(&$module, &$log)
-	{
-		if ($module->get('hasconfig') == 0) {
-			return;
-		}
-
-		$configHandler =& xoops_gethandler('config');
-		$configs =& $configHandler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
-
-		if (count($configs) == 0) {
-			return;
-		}
-
-		foreach ($configs as $config) {
-			$configHandler->deleteConfig($config);
-		}
-	}
 	
-	/**
-	 * @static
-	 */
-	function uninstallAllModuleTemplates(&$module, &$log)
-	{
-		$tplHandler =& xoops_gethandler('tplfile');
 
-		//
-		// The following processing depends on the structure of Legacy_RenderSystem.
-		//
-		$tplHandler =& xoops_gethandler('tplfile');
-		$delTemplates =& $tplHandler->find('default', 'module', $module->get('mid'));
-		if (is_array($delTemplates) && count($delTemplates) > 0) {
-			//
-			// clear cache
-			//
-			$xoopsTpl =& new XoopsTpl();
-			$xoopsTpl->clear_cache(null, "mod_" . $module->get('dirname'));
-			
-			foreach ($delTemplates as $tpl) {
-				if (!$tplHandler->delete($tpl)) {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_TEMPLATE_UNINSTALLED, $tpl->get('tpl_file')));
-				}
-			}
-		}
-	}
 	
-	/**
-	 * 
-	 */
-	function DBquery($query, &$module, $log)
-	{
-		require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
-		
-		$successFlag = true;
-		
-		$scanner =& new Legacy_CubeStyleSQLScanner();
-		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
-		$scanner->setDirname($module->get('dirname'));
-		$scanner->setBuffer($query);
-		$scanner->parse();
-		$sqlArr = $scanner->getSQL();
-
-		$root =& XCube_Root::getSingleton();
-		
-		foreach ($sqlArr as $sql) {		
-			if ($root->mController->mDB->query($sql)) {
-				$log->addReport("Success: ${sql}");
-				$successFlag &= true;
-			}
-			else {
-				$log->addError("Failure: ${sql}");
-				$successFlag = false;
-			}
-		}
-		
-		return $successFlag;
-	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:02:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:02:25 +0900
Subject: [xoops-cvslog 5553] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101150225.9E0E52AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.9 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.9	Wed Nov  1 20:54:22 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Thu Nov  2 00:02:25 2006
@@ -295,7 +295,7 @@
 	function _updateModuleTemplates()
 	{
 		Legacy_ModuleInstallUtils::uninstallAllOfModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
-		Legacy_ModuleInstallUtils::installAllModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::installAllOfModuleTemplates($this->_mTargetXoopsModule, $this->mLog);
 	}
 	
 	/**
@@ -318,7 +318,7 @@
 	 */
 	function _updatePreferences()
 	{
-		$this->_upgradePreference();
+		$this->_upgradePreferences();
 	}
 	
 	/**
@@ -337,7 +337,7 @@
 		//
 		// Updates all of module templates
 		//
-		$this->_updateTemplates();
+		$this->_updateModuleTemplates();
 		if (!$this->_mForceMode && $this->mLog->hasError()) {
 			$this->_processReport();
 			return false;
@@ -404,7 +404,7 @@
 		// Next, load config item from xoops_version.php.
 		//
 		$newConfigArr = array();
-		$t_configInfoArr = Legacy_ModuleUtils::getConfigInfosFromManifesto($this->_mTargetXoopsModule);
+		$t_configInfoArr = Legacy_ModuleInstallUtils::getConfigInfosFromManifesto($this->_mTargetXoopsModule);
 		
 		$count = 0;
 		if (is_array($t_configInfoArr)) {

From minahito ＠ users.sourceforge.jp  Thu Nov  2 00:02:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 00:02:35 +0900
Subject: [xoops-cvslog 5554] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061101150235.C48DC2AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.4	Wed Nov  1 22:42:17 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Thu Nov  2 00:02:35 2006
@@ -122,7 +122,7 @@
 
 	function _uninstallPreferences()
 	{
-		Legacy_ModuleUtils::deleteAllConfigs($this->_mXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::uninstallAllOfConfigs($this->_mXoopsModule, $this->mLog);
 	}
 
 	function _processScript()

From tom_g3x ＠ users.sourceforge.jp  Thu Nov  2 00:50:44 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Nov 2006 00:50:44 +0900
Subject: [xoops-cvslog 5555] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20061101155044.3538C2AC06D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.3 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.4
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.3	Sat Oct 14 23:17:57 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Thu Nov  2 00:50:44 2006
@@ -42,7 +42,7 @@
 define('_AD_USER_LANG_GROUP_ASSIGN', "Assign a member");
 define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "List of members of this group");
 define('_AD_USER_LANG_GROUP_DELETE', "Delete group");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "Delete ");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "Are you sure you want to delete this user group?");
 define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "When you delete a group, user accounts of the group will not be deleted.");
 define('_AD_USER_LANG_GROUP_DESC', "Description");
 define('_AD_USER_LANG_GROUP_EDIT', "Edit groups");
@@ -104,7 +104,7 @@
 define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than X");
 define('_AD_USER_LANG_USER', "User");
 define('_AD_USER_LANG_USER_DELETE', "Delete a user");
-define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete ");
+define('_AD_USER_LANG_USER_DELETE_ADVICE', "Are you sure you want to delete this user?");
 define('_AD_USER_LANG_USER_EDIT', "Edit a user");
 define('_AD_USER_LANG_USER_LIST', "User administration");
 define('_AD_USER_LANG_USER_NEW', "Add a new user");

From tom_g3x ＠ users.sourceforge.jp  Thu Nov  2 00:50:44 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Nov 2006 00:50:44 +0900
Subject: [xoops-cvslog 5556] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20061101155044.5EC202AC097@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.3 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.4
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.3	Sat Oct 14 23:17:57 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Thu Nov  2 00:50:44 2006
@@ -42,7 +42,7 @@
 define('_AD_USER_LANG_GROUP_ASSIGN', "メンバーの登録");
 define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "このグループに登録されているユーザー一覧");
 define('_AD_USER_LANG_GROUP_DELETE', "ユーザーグループの削除");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "_%s_ のユーザーグループを削除します。よろしいですか？");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "このユーザーグループを削除します。よろしいですか？");
 define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "グループを削除してもユーザーは削除されません");
 define('_AD_USER_LANG_GROUP_DESC', "説明");
 define('_AD_USER_LANG_GROUP_EDIT', "ユーザーグループ編集");
@@ -104,7 +104,7 @@
 define('_AD_USER_LANG_UNDER_POSTS', "投稿数がX件以下");
 define('_AD_USER_LANG_USER', "ユーザー");
 define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除");
-define('_AD_USER_LANG_USER_DELETE_ADVICE', "_%s_ のユーザーを削除します。よろしいですか？");
+define('_AD_USER_LANG_USER_DELETE_ADVICE', "このユーザーを削除します。よろしいですか？");
 define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集");
 define('_AD_USER_LANG_USER_LIST', "ユーザー管理");
 define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録");

From tom_g3x ＠ users.sourceforge.jp  Thu Nov  2 00:50:44 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Nov 2006 00:50:44 +0900
Subject: [xoops-cvslog 5557] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20061101155044.9495F2AC06D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14.2.1
--- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14	Sun Aug 20 11:57:49 2006
+++ xoops2jp/html/modules/user/admin/templates/user_delete.html	Thu Nov  2 00:50:44 2006
@@ -6,7 +6,7 @@
 
 <h3 class="admintitle"><{$smarty.const._AD_USER_LANG_USER_DELETE}> (<{$object->getShow('uname')}>)</h3>
 
-<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getShow('uname')}></div>
+<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE}></div>
 
 <{if $actionForm->hasError()}>
 <div class="error">
Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16.2.1
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16	Sun Aug 20 22:38:31 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Nov  2 00:50:44 2006
@@ -7,7 +7,7 @@
 <h3 class="admintitle"><{$smarty.const._AD_USER_LANG_GROUP_DELETE}> (<{$object->getShow('name')}>)</h3>
 
 <div class="confirm">
-  <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getShow('name')}><br />
+  <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE}><br />
   <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE2}>
 </div>
 

From minahito ＠ users.sourceforge.jp  Thu Nov  2 13:51:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 13:51:42 +0900
Subject: [xoops-cvslog 5558] CVS update: xoops2jp/html/kernel
Message-ID: <20061102045142.3BF842AC030@users.sourceforge.jp>

Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2.8.7 xoops2jp/html/kernel/configitem.php:1.2.8.7.2.1
--- xoops2jp/html/kernel/configitem.php:1.2.8.7	Sun Sep 10 14:55:46 2006
+++ xoops2jp/html/kernel/configitem.php	Thu Nov  2 13:51:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: configitem.php,v 1.2.8.7 2006/09/10 05:55:46 minahito Exp $
+// $Id: configitem.php,v 1.2.8.7.2.1 2006/11/02 04:51:42 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -219,7 +219,7 @@
 		//
 		// Compare options
 		//
-		$thisOptions =& $this->getOptionItems();
+		$thisOptions =& $this->getConfOptions();
 		$hisOptions =& $config->getConfOptions();
 		
 		if (count($thisOptions) == count($hisOptions)) {

From minahito ＠ users.sourceforge.jp  Thu Nov  2 13:54:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 13:54:01 +0900
Subject: [xoops-cvslog 5559] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061102045401.15AE32AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.6	Wed Nov  1 20:55:09 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Thu Nov  2 13:54:00 2006
@@ -130,7 +130,7 @@
 	 * 
 	 * The precondition is the existence of mXoopsModule.
 	 */
-	function _getInstaller()
+	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
 		$this->mXoopsModule->loadInfo($dirname, false);

From minahito ＠ users.sourceforge.jp  Thu Nov  2 13:58:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 13:58:07 +0900
Subject: [xoops-cvslog 5560] CVS update: xoops2jp/html/kernel
Message-ID: <20061102045807.68C202AC030@users.sourceforge.jp>

Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2.8.7.2.1 xoops2jp/html/kernel/configitem.php:1.2.8.7.2.2
--- xoops2jp/html/kernel/configitem.php:1.2.8.7.2.1	Thu Nov  2 13:51:42 2006
+++ xoops2jp/html/kernel/configitem.php	Thu Nov  2 13:58:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: configitem.php,v 1.2.8.7.2.1 2006/11/02 04:51:42 minahito Exp $
+// $Id: configitem.php,v 1.2.8.7.2.2 2006/11/02 04:58:07 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -104,7 +104,7 @@
 	/**
 	 * @return array()
 	 */
-	function getOptionItems()
+	function &getOptionItems()
 	{
 		$optionArr = array();
 		
@@ -219,7 +219,7 @@
 		//
 		// Compare options
 		//
-		$thisOptions =& $this->getConfOptions();
+		$thisOptions =& $this->getOptionItems();
 		$hisOptions =& $config->getConfOptions();
 		
 		if (count($thisOptions) == count($hisOptions)) {

From minahito ＠ users.sourceforge.jp  Thu Nov  2 14:56:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 14:56:09 +0900
Subject: [xoops-cvslog 5561] CVS update: xoops2jp/html/include
Message-ID: <20061102055609.B58572AC030@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.2 xoops2jp/html/include/version.php:1.4.8.12.2.3
--- xoops2jp/html/include/version.php:1.4.8.12.2.2	Mon Oct 23 19:03:44 2006
+++ xoops2jp/html/include/version.php	Thu Nov  2 14:56:09 2006
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.2 2006/10/23 10:03:44 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.3 2006/11/02 05:56:09 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 2");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-a");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 15:21:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 15:21:52 +0900
Subject: [xoops-cvslog 5562] CVS update: xoops2jp/html/include
Message-ID: <20061102062152.1872D2AC023@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.3 xoops2jp/html/include/version.php:1.4.8.12.2.4
--- xoops2jp/html/include/version.php:1.4.8.12.2.3	Thu Nov  2 14:56:09 2006
+++ xoops2jp/html/include/version.php	Thu Nov  2 15:21:51 2006
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.3 2006/11/02 05:56:09 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.4 2006/11/02 06:21:51 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-a");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-b");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:36:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:36:10 +0900
Subject: [xoops-cvslog 5563] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061102073610.E4E402AC023@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.2 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.2	Sun Oct 15 01:44:14 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Thu Nov  2 16:36:10 2006
@@ -57,8 +57,14 @@
 						foreach ($_POST['uninstalled_modules'] as $module) {
 							$module = basename($module);
 							if (in_array($module, $retArray['uninstalled'])) {
-								$installer =& new Legacy_ModuleInstaller($module);
-								$installer->execute();
+								$handler =& xoops_gethandler('module');
+								$xoopsModule =& $handler->create();
+								$xoopsModule->set('weight', 1);
+								$xoopsModule->loadInfoAsVar($module);
+								
+								$installer =& new Legacy_ModuleInstaller();
+								$installer->setCurrentXoopsModule($xoopsModule);
+								$installer->executeInstall();
 							}
 						}
 					}
@@ -86,8 +92,14 @@
 						foreach ($_POST['option_modules'] as $module) {
 							$module = basename($module);
 							if (in_array($module, $optionModules)) {
-								$installer =& new Legacy_ModuleInstaller($module);
-								$installer->execute();
+								$handler =& xoops_gethandler('module');
+								$xoopsModule =& $handler->create();
+								$xoopsModule->set('weight', 1);
+								$xoopsModule->loadInfoAsVar($module);
+								
+								$installer =& new Legacy_ModuleInstaller();
+								$installer->setCurrentXoopsModule($xoopsModule);
+								$installer->executeInstall();
 							}
 						}
 					}
@@ -111,8 +123,12 @@
 					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
 					$module = basename($_POST['cube_module_uninstallok']);
 					if (in_array($module, $retArray['disabled'])) {
-						$uninstaller =& new Legacy_ModuleUninstaller($module);
-						$uninstaller->execute();
+						$handler =& xoops_gethandler('module');
+						$xoopsModule =& $handler->getByDirname($module);
+						
+						$uninstaller =& new Legacy_ModuleUninstaller();
+						$uninstaller->setCurrentXoopsModule($xoopsModule);
+						$uninstaller->executeUninstall();
 					}
 					$controller->executeRedirect(XOOPS_URL . '/',1);
 				}

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:37:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:37:28 +0900
Subject: [xoops-cvslog 5564] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061102073728.171262AC15F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.4 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.5
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.4	Tue Oct 17 13:47:37 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Thu Nov  2 16:37:27 2006
@@ -26,14 +26,14 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 1.00;
+$modversion['version'] = 2.01;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
 $modversion['help'] = "help.html";
 $modversion['license'] = "GPL see LICENSE";
 $modversion['official'] = 1;
-$modversion['image'] = "images/legacy.gif";
+$modversion['image'] = "images/legacy.png";
 $modversion['dirname'] = "legacy";
 
 $modversion['cube_style'] = true;

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:37:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:37:36 +0900
Subject: [xoops-cvslog 5565] CVS update: xoops2jp/html/modules/legacy/images
Message-ID: <20061102073736.7F0972AC164@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/images/legacy.gif
Index: xoops2jp/html/modules/legacy/images/legacy.png

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:37:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:37:53 +0900
Subject: [xoops-cvslog 5566] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102073753.1C5642AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.3 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.3	Tue Oct 17 00:35:31 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Thu Nov  2 16:37:52 2006
@@ -138,6 +138,10 @@
 		$cacheInfo->setBlock($this);
 		return $cacheInfo;
 	}
+	
+	function execute()
+	{
+	}
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:38:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:38:17 +0900
Subject: [xoops-cvslog 5567] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102073817.00A562AC161@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.11 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.12
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.11	Tue Oct 31 15:06:32 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Thu Nov  2 16:38:17 2006
@@ -1255,13 +1255,7 @@
 		
 		$context->mModule =& Legacy_Utils::createModule($module);
 		$context->mXoopsModule =& $context->mModule->getXoopsModule();
-		
-		if ($context->mXoopsModule->get('hasconfig') == 1 || $context->mXoopsModule->get('hascomments') == 1) {
-			$handler =& xoops_gethandler('config');
-
-			$context->mModule->setModuleConfig($handler->getConfigsByCat(0, $context->mXoopsModule->get('mid')));
-			$context->mModuleConfig = $context->mModule->getModuleConfig();
-		}
+		$context->mModuleConfig = $context->mModule->getModuleConfig();
 		
 		//
 		// Load Roles

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:38:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:38:28 +0900
Subject: [xoops-cvslog 5568] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102073828.1AE282AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.7 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.7	Fri Oct 20 17:05:54 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Thu Nov  2 16:38:27 2006
@@ -52,6 +52,11 @@
 	function Legacy_AbstractModule(&$module)
 	{
 		$this->setXoopsModule($module);
+		
+		if ($module->get('hasconfig') == 1 || $module->get('hascomments') == 1) {
+			$handler =& xoops_gethandler('config');
+			$this->setModuleConfig($handler->getConfigsByCat(0, $module->get('mid')));
+		}
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:38:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:38:37 +0900
Subject: [xoops-cvslog 5569] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061102073837.4E2E82AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/index.html
diff -u /dev/null xoops2jp/html/modules/legacy/preload/Primary/index.html:1.1.2.1
--- /dev/null	Thu Nov  2 16:38:37 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/index.html	Thu Nov  2 16:38:37 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:38:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:38:49 +0900
Subject: [xoops-cvslog 5570] CVS update: xoops2jp/html/modules/legacyRender
Message-ID: <20061102073849.33AB12AC161@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/xoops_version.php
diff -u xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.1 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.2
--- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.1	Fri Oct 13 18:32:39 2006
+++ xoops2jp/html/modules/legacyRender/xoops_version.php	Thu Nov  2 16:38:49 2006
@@ -1,18 +1,18 @@
 <?php
 /**
- * @version $Id: xoops_version.php,v 1.1.2.11.2.1 2006/10/13 09:32:39 tom_g3x Exp $
+ * @version $Id: xoops_version.php,v 1.1.2.11.2.2 2006/11/02 07:38:49 minahito Exp $
  * @package legacyRender
  */
 
 $modversion['name']=_MI_LEGACYRENDER_NAME;
-$modversion['version']=0.50;
+$modversion['version']=2.01;
 $modversion['description']=_MI_LEGACYRENDER_NAME_DESC;
 $modversion['author']="";
 $modversion['credits']="The XOOPS Cube Project";
 $modversion['help'] = "help.html";
 $modversion['license']="GPL see LICENSE";
 $modversion['official']=1;
-$modversion['image']="images/legacyRender.gif";
+$modversion['image']="images/legacyRender.png";
 $modversion['dirname']="legacyRender";
 
 $modversion['cube_style'] = true;

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:38:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:38:57 +0900
Subject: [xoops-cvslog 5571] CVS update:
	xoops2jp/html/modules/legacyRender/images
Message-ID: <20061102073857.D583E2AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/images/legacyRender.gif
Index: xoops2jp/html/modules/legacyRender/images/legacyRender.png

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:39:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:39:21 +0900
Subject: [xoops-cvslog 5572] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061102073921.2FB272AC023@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php
diff -u xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.4 xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.4	Wed Nov  1 15:50:45 2006
+++ xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php	Thu Nov  2 16:39:21 2006
@@ -1,11 +1,13 @@
 <?php
 /**
+ * @file
+ * @brief Defines the utility function class of Legacy.
  * @package Legacy
  * @version $Id$
  */
 
 /**
- * The static member functions class for Legacy.
+ * @brief The collection of static utility functions for Legacy.
  */
 class Legacy_Utils
 {
@@ -133,6 +135,9 @@
 		return $retBlock;
 	}
 	
+	/**
+	 * Calls user controll event.
+	 */
 	function raiseUserControlEvent()
 	{
 		$root =& XCube_Root::getSingleton();

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:39:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:39:35 +0900
Subject: [xoops-cvslog 5573] CVS update: xoops2jp/html/modules/pm/images
Message-ID: <20061102073935.69ADD2AC143@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/images/pm.png
Index: xoops2jp/html/modules/pm/images/pm.gif

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:39:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:39:35 +0900
Subject: [xoops-cvslog 5574] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061102073935.923952AC15F@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.1
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16	Thu Aug 17 18:09:51 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Thu Nov  2 16:39:35 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.16 2006/08/17 09:09:51 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.16.2.1 2006/11/02 07:39:35 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,14 +30,14 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_PM_NAME;
-$modversion['version'] = 1.00;
+$modversion['version'] = 2.01;
 $modversion['description'] = _MI_PM_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
 $modversion['help'] = "help.html";
 $modversion['license'] = "GPL see LICENSE";
 $modversion['official'] = 1;
-$modversion['image'] = "images/pm.gif";
+$modversion['image'] = "images/pm.png";
 $modversion['dirname'] = "pm";
 
 $modversion['cube_style'] = true;

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:39:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:39:49 +0900
Subject: [xoops-cvslog 5575] CVS update: xoops2jp/html/modules/stdCache/images
Message-ID: <20061102073949.2A9872AC143@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/images/stdCache.gif
Index: xoops2jp/html/modules/stdCache/images/stdCache.png

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:39:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:39:49 +0900
Subject: [xoops-cvslog 5576] CVS update: xoops2jp/html/modules/stdCache
Message-ID: <20061102073949.4D38C2AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/xoops_version.php
diff -u xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.1 xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.2
--- xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.1	Sat Oct 14 13:53:12 2006
+++ xoops2jp/html/modules/stdCache/xoops_version.php	Thu Nov  2 16:39:49 2006
@@ -1,14 +1,14 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.3.2.1 2006/10/14 04:53:12 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.3.2.2 2006/11/02 07:39:49 minahito Exp $
 
 $modversion['name'] = _MI_STDCACHE_NAME;
-$modversion['version'] = 1.00;
+$modversion['version'] = 2.01;
 $modversion['description'] = _MI_STDCACHE_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
 $modversion['license'] = "GPL see LICENSE";
 $modversion['official'] = 1;
-$modversion['image'] = "images/stdCache.gif";
+$modversion['image'] = "images/stdCache.png";
 $modversion['dirname'] = "stdCache";
 $modversion['help'] = "help.html";
 

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:40:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:40:05 +0900
Subject: [xoops-cvslog 5577] CVS update: xoops2jp/html/modules/user
Message-ID: <20061102074006.1B7AD2AC023@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.1 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.2
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.1	Sun Oct 15 00:51:00 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Thu Nov  2 16:40:05 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.1 2006/10/14 15:51:00 tom_g3x Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.2 2006/11/02 07:40:05 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,14 +26,14 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 1.00;
+$modversion['version'] = 2.01;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
 $modversion['help'] = "help.html";
 $modversion['license'] = "GPL see LICENSE";
 $modversion['official'] = 1;
-$modversion['image'] = "images/user.gif";
+$modversion['image'] = "images/user.png";
 $modversion['dirname'] = "user";
 
 $modversion['cube_style'] = true;

From minahito ＠ users.sourceforge.jp  Thu Nov  2 16:40:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 16:40:06 +0900
Subject: [xoops-cvslog 5578] CVS update: xoops2jp/html/modules/user/images
Message-ID: <20061102074006.445452AC15B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/images/user.png
Index: xoops2jp/html/modules/user/images/user.gif

From minahito ＠ users.sourceforge.jp  Thu Nov  2 18:56:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 18:56:45 +0900
Subject: [xoops-cvslog 5579] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061102095645.45CC62AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.3	Fri Oct 20 10:48:31 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Thu Nov  2 18:56:45 2006
@@ -5,14 +5,14 @@
 <meta http-equiv="content-language" content="<{$xoops_langcode}>" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
-<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}> : <{$currentModule->getVar('name')}></title>
+<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}> : <{$currentModule->mXoopsModule->getShow('name')}></title>
 <script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
 <{stylesheet file=style.css}>
 <{stylesheet file=module.css}>
 
 <script type="text/javascript">
 <!-- <![CDATA[
-var cid = <{if $smarty.get.fct == preferences && $smarty.get.mod > 0}><{$smarty.get.mod}><{else}><{$currentModule->getVar('mid')}><{/if}>;
+var cid = <{if $smarty.get.fct == preferences && $smarty.get.mod > 0}><{$smarty.get.mod}><{else}><{$currentModule->mXoopsModule->get('mid')}><{/if}>;
 function ccToggle(id)
 {
 	el = xoopsGetElementById('c'+id).style;
@@ -69,14 +69,14 @@
 
 <{* option
   <div id="menunavi">
-  <h2><{$currentModule->getVar('name')}></h2>
-  <{if $currentModule->adminmenu}>
+  <h2><{$currentModule->mXoopsModule->getShow('name')}></h2>
+  <{if $currentModule->getAdminMenu()}>
     <ul class="submenunavi">
-      <{foreach item=menu from=$currentModule->adminmenu}>
+      <{foreach item=menu from=$currentModule->getAdminMenu()}>
         <{if $menu.absolute}>
           <li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
         <{else}>
-          <li><a href="<{$xoops_url}>/modules/<{$currentModule->getShow('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
+          <li><a href="<{$xoops_url}>/modules/<{$currentModule->mXoopsModule->getShow('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
         <{/if}>
       <{/foreach}>
     </ul>

From minahito ＠ users.sourceforge.jp  Thu Nov  2 18:57:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 18:57:12 +0900
Subject: [xoops-cvslog 5580] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102095712.EFD972AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.4 xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.4	Mon Oct 23 18:35:35 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php	Thu Nov  2 18:57:12 2006
@@ -89,7 +89,10 @@
 
 	function &getVirtualCurrentModule()
 	{
-		$module = null;
+		static $ret_module;
+		if (is_object($ret_module)) {
+			return $ret_module;
+		}
 		
 		if ($this->mController->mRoot->mContext->mModule != null) {
 			$module =& $this->mController->mRoot->mContext->mXoopsModule;
@@ -97,16 +100,21 @@
 			if ($module->get('dirname') == "legacy" && isset($_REQUEST['dirname'])) {
 				if (in_array(xoops_getrequest('action'), $this->_mSpecialActions)) {
 					$handler =& xoops_gethandler('module');
-					$module =& $handler->getByDirname(xoops_getrequest('dirname'));
+					$t_xoopsModule =& $handler->getByDirname(xoops_getrequest('dirname'));
+					$ret_module =& Legacy_Utils::createModule($t_xoopsModule);
 				}
 			}
 			elseif ($module->get('dirname') == "legacy" && xoops_getrequest('action') == 'PreferenceEdit' && isset($_REQUEST['confmod_id'])) {
 				$handler =& xoops_gethandler('module');
-				$module =& $handler->get(intval(xoops_getrequest('confmod_id')));
+				$t_xoopsModule =& $handler->get(intval(xoops_getrequest('confmod_id')));
+				$ret_module =& Legacy_Utils::createModule($t_xoopsModule);
+			}
+			else {
+				$ret_module =& Legacy_Utils::createModule($module);
 			}
 		}
-
-		return $module;
+		
+		return $ret_module;
 	}
 
 	function &getMainThemeObject()

From minahito ＠ users.sourceforge.jp  Thu Nov  2 18:57:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 18:57:35 +0900
Subject: [xoops-cvslog 5581] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102095735.DA0392AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.12 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.13
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.12	Thu Nov  2 16:38:17 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Thu Nov  2 18:57:35 2006
@@ -1192,6 +1192,36 @@
 		
 		return $context;
 	}
+	
+	/**
+	 * Gets URL of preference editor by this controller.
+	 * @public
+	 * @param XoopsModule $module
+	 * @return string absolute URL
+	 */
+	function getPreferenceEditUrl(&$module)
+	{
+		if (is_object($module)) {
+			return XOOPS_MODULE_URL . '/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $module->get('mid');
+		}
+
+		return null;
+	}
+	
+	/**
+	 * Gets URL of help viewer by this controller.
+	 * @public
+	 * @param XoopsModule $module
+	 * @return string absolute URL
+	 */
+	function getHelpViewUrl(&$module)
+	{
+		if (is_object($module)) {
+			return XOOPS_MODULE_URL . '/legacy/admin/index.php?action=Help&dirname=' . $module->get('dirname');
+		}
+
+		return null;
+	}
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Thu Nov  2 18:57:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 18:57:44 +0900
Subject: [xoops-cvslog 5582] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102095744.C5D5C2AC0E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.8 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.8	Thu Nov  2 16:38:27 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Thu Nov  2 18:57:44 2006
@@ -480,6 +480,7 @@
 		}
 		
 		$dmy =& $this->mXoopsModule->getInfo();
+		$root =& XCube_Root::getSingleton();
 
 		//
 		// Load admin menu, and add preference menu by own judge.
@@ -489,14 +490,13 @@
 		    || ($this->mXoopsModule->getInfo('config') && is_array($this->mXoopsModule->getInfo('config')))
 		    || ($this->mXoopsModule->getInfo('comments') && is_array($this->mXoopsModule->getInfo('comments')))) {
 				$this->mXoopsModule->adminmenu[] = array(
-					'link' => XOOPS_MODULE_URL . '/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $this->mXoopsModule->get('mid'),
+					'link' => $root->mController->getPreferenceEditUrl($this->mXoopsModule),
 					'title' => _PREFERENCES,
 					'absolute' => true);
 		}
 			
 		if ($this->mXoopsModule->hasHelp()) {
-			$helpUrl = XOOPS_MODULE_URL . "/legacy/admin/index.php?action=Help&dirname=" . $this->mXoopsModule->get('dirname');
-			$this->mXoopsModule->adminmenu[] = array('link' => $helpUrl,
+			$this->mXoopsModule->adminmenu[] = array('link' =>  $root->mController->getHelpViewUrl($this->mXoopsModule),
 			                              'title' => _HELP,
 			                              'absolute' => true);
 		}

From minahito ＠ users.sourceforge.jp  Thu Nov  2 19:44:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 19:44:27 +0900
Subject: [xoops-cvslog 5583] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061102104427.70E712AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.4	Thu Nov  2 00:01:42 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Thu Nov  2 19:44:27 2006
@@ -191,7 +191,7 @@
             require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
             $funcName = 'xoops_module_install_' . $this->_mXoopsModule->get('dirname');
             if (function_exists($funcName)) {
-                if (!call_user_func($funcName, $module)) {
+                if (!call_user_func($funcName, $this->_mXoopsModul)) {
                     $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
                 }
             }

From minahito ＠ users.sourceforge.jp  Thu Nov  2 19:54:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 19:54:39 +0900
Subject: [xoops-cvslog 5584] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061102105439.6F8CC2AC0E5@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.10 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.10	Thu Nov  2 00:02:25 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Thu Nov  2 19:54:39 2006
@@ -262,15 +262,15 @@
 		}
 	}
 	
-	function _processScript(&$module, &$log)
+	function _processScript()
 	{
-		$installScript = trim($module->getInfo('onUpdate'));
+		$installScript = trim($this->_mTargetXoopsModule->getInfo('onUpdate'));
 		if ($installScript != false) {
-			require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-			$funcName = 'xoops_module_update_' . $module->getVar('dirname');
+			require_once XOOPS_MODULE_PATH . "/" . $this->_mTargetXoopsModule->get('dirname') . "/" . $installScript;
+			$funcName = 'xoops_module_update_' . $this->_mTargetXoopsModule->get('dirname');
 			if (function_exists($funcName)) {
-				if (!call_user_func($funcName, $module, $this->getCurrentVersion())) {
-					$log->addError("Failed to execute " . $funcName);
+				if (!call_user_func($funcName, $this->_mTargetXoopsModule, $this->getCurrentVersion())) {
+					$this->mLog->addError("Failed to execute " . $funcName);
 				}
 			}
 		}
@@ -373,7 +373,7 @@
 		//
 		// call bacl 'onUpdate'
 		//
-		$this->_processScript($this->_mTargetXoopsModule, $this->mLog);
+		$this->_processScript();
 		
 		$this->_processReport();
 		

From minahito ＠ users.sourceforge.jp  Thu Nov  2 20:25:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 20:25:19 +0900
Subject: [xoops-cvslog 5585] CVS update:
	xoops2jp/html/modules/legacy/lib/ShadePlus
Message-ID: <20061102112519.5269C2AC0E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php
diff -u xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.3 xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.3	Wed Nov  1 15:46:56 2006
+++ xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php	Thu Nov  2 20:25:19 2006
@@ -36,11 +36,11 @@
 
 if (!class_exists('XCube_AbstractServiceClient')) exit();
 
-class Shade_SoapClient extends XCube_AbstractServiceClient
+class ShadePlus_SoapClient extends XCube_AbstractServiceClient
 {
 	var $mClient = null;
 	
-	function Shade_SoapClient(&$service)
+	function ShadePlus_SoapClient(&$service)
 	{
 		parent::XCube_AbstractServiceClient($service);
 		$this->mClient =& new soap_client($service, true);

From minahito ＠ users.sourceforge.jp  Thu Nov  2 20:25:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 20:25:32 +0900
Subject: [xoops-cvslog 5586] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061102112532.0F7D52AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.3 xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php:1.1.2.3	Wed Nov  1 15:47:54 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/NuSoapLoader.class.php	Thu Nov  2 20:25:31 2006
@@ -22,13 +22,13 @@
 		$root =& XCube_Root::getSingleton();
 		
 		if (is_object($service) && is_a($service, 'XCube_Service')) {
-			$client =& new XCube_ServiceClient($service);
+			$client = new XCube_ServiceClient($service);
 		}
 		else {
 			require_once XOOPS_ROOT_PATH . "/modules/legacy/lib/nusoap/nusoap.php";
 			require_once XOOPS_ROOT_PATH . "/modules/legacy/lib/ShadePlus/SoapClient.class.php";
 			
-			$client =& new Shade_SoapClient($service);
+			$client = new ShadePlus_SoapClient($service);
 		}
 	}
 

From tom_g3x ＠ users.sourceforge.jp  Thu Nov  2 21:35:00 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  2 Nov 2006 21:35:00 +0900
Subject: [xoops-cvslog 5587] CVS update: xoops2jp/html/install
Message-ID: <20061102123500.8372E2AC164@users.sourceforge.jp>

Index: xoops2jp/html/install/install_tpl.php
diff -u xoops2jp/html/install/install_tpl.php:1.1.8.5.2.2 xoops2jp/html/install/install_tpl.php:1.1.8.5.2.3
--- xoops2jp/html/install/install_tpl.php:1.1.8.5.2.2	Fri Oct 20 02:20:51 2006
+++ xoops2jp/html/install/install_tpl.php	Thu Nov  2 21:35:00 2006
@@ -19,7 +19,13 @@
 </td>
 </tr>
 <tr>
-<td id="headerBar" colspan="2">&nbsp;</td>
+<td id="headerBar" colspan="2">
+<div id="header_buttons">
+<?php echo b_back($b_back); ?>&nbsp;&nbsp;&nbsp;
+<?php echo b_reload($b_reload); ?>&nbsp;&nbsp;&nbsp;
+<?php echo b_next($b_next); ?>
+</div>
+</td>
 </tr>
 </table>
 
@@ -29,11 +35,6 @@
 <td>
 <?php if(!empty($title)) { ?><h3><?php echo $title; ?></h3><?php } ?>
 
-<div id="header_buttons">
-<?php echo b_back($b_back); ?>&nbsp;&nbsp;&nbsp;
-<?php echo b_reload($b_reload); ?>&nbsp;&nbsp;&nbsp;
-<?php echo b_next($b_next); ?>
-</div>
 
 <div class="maincontents"><?php echo $content; ?></div>
 </td>
Index: xoops2jp/html/install/style.css
diff -u xoops2jp/html/install/style.css:1.1.8.4.2.2 xoops2jp/html/install/style.css:1.1.8.4.2.3
--- xoops2jp/html/install/style.css:1.1.8.4.2.2	Fri Oct 20 02:20:51 2006
+++ xoops2jp/html/install/style.css	Thu Nov  2 21:35:00 2006
@@ -21,7 +21,7 @@
 #mainbody .maincontents {background:#FFFFFF; padding:15px 20px; line-height:150%;}
 #mainbody h3 {margin-top:10px; margin-bottom:5px; padding:10px; background:#EEEEFF; font-size:14px;}
 
-#header_buttons { padding:10px 15px 5px 15px; text-align:right;}
+#header_buttons {background:#eeee;  padding:2px 15px 3px 15px; text-align:right;}
 #footer {background:#EEEEFF; padding:15px; text-align:right;}
 
 .separate {border-collapse:separate;}

From minahito ＠ users.sourceforge.jp  Thu Nov  2 23:11:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 23:11:11 +0900
Subject: [xoops-cvslog 5588] CVS update: xoops2jp/html
Message-ID: <20061102141111.C964B2AC170@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.1
--- xoops2jp/html/mainfile.dist.php:1.2.8.2	Sun Sep 17 11:54:03 2006
+++ xoops2jp/html/mainfile.dist.php	Thu Nov  2 23:11:11 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2 2006/09/17 02:54:03 minahito Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.1 2006/11/02 14:11:11 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -74,7 +74,7 @@
     define("XOOPS_GROUP_USERS", "2");
     define("XOOPS_GROUP_ANONYMOUS", "3");
 
-    if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
+    if (XOOPS_ROOT_PATH != '') {
         include XOOPS_ROOT_PATH."/include/common.php";
     }
 }

From minahito ＠ users.sourceforge.jp  Thu Nov  2 23:20:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  2 Nov 2006 23:20:25 +0900
Subject: [xoops-cvslog 5589] CVS update: xoops2jp/html/kernel
Message-ID: <20061102142025.06EF62AC16C@users.sourceforge.jp>

Index: xoops2jp/html/kernel/timezone.php
diff -u xoops2jp/html/kernel/timezone.php:1.1.2.2 xoops2jp/html/kernel/timezone.php:1.1.2.2.2.1
--- xoops2jp/html/kernel/timezone.php:1.1.2.2	Thu Jul 20 17:18:45 2006
+++ xoops2jp/html/kernel/timezone.php	Thu Nov  2 23:20:24 2006
@@ -28,36 +28,36 @@
 		// This handler not connects to database.
 		//
 		$this->_mResult = array(
-			"-12"  => _TZ_GMTM12,
-			"-11"  => _TZ_GMTM11,
-			"-10"  => _TZ_GMTM10,
-			"-9"   => _TZ_GMTM9,
-			"-8"   => _TZ_GMTM8,
-			"-7"   => _TZ_GMTM7,
-			"-6"   => _TZ_GMTM6,
-			"-5"   => _TZ_GMTM5,
-			"-4"   => _TZ_GMTM4,
-			"-3.5" => _TZ_GMTM35,
-			"-3"   => _TZ_GMTM3,
-			"-2"   => _TZ_GMTM2,
-			"-1"   => _TZ_GMTM1,
-			"0"    => _TZ_GMT0,
-			"1"    => _TZ_GMTP1,
-			"2"    => _TZ_GMTP2,
-			"3"    => _TZ_GMTP3,
-			"3.5"  => _TZ_GMTP35,
-			"4"    => _TZ_GMTP4,
-			"4.5"  => _TZ_GMTP45,
-			"5"    => _TZ_GMTP5,
-			"5.5"  => _TZ_GMTP55,
-			"6"    => _TZ_GMTP6,
-			"7"    => _TZ_GMTP7,
-			"8"    => _TZ_GMTP8,
-			"9"    => _TZ_GMTP9,
-			"9.5"  => _TZ_GMTP95,
-			"10"   => _TZ_GMTP10,
-			"11"   => _TZ_GMTP11,
-			"12"   => _TZ_GMTP12
+			-12  => _TZ_GMTM12,
+			-11  => _TZ_GMTM11,
+			-10  => _TZ_GMTM10,
+			-9   => _TZ_GMTM9,
+			-8   => _TZ_GMTM8,
+			-7   => _TZ_GMTM7,
+			-6   => _TZ_GMTM6,
+			-5   => _TZ_GMTM5,
+			-4   => _TZ_GMTM4,
+			-3.5 => _TZ_GMTM35,
+			-3   => _TZ_GMTM3,
+			-2   => _TZ_GMTM2,
+			-1   => _TZ_GMTM1,
+			0    => _TZ_GMT0,
+			1    => _TZ_GMTP1,
+			2    => _TZ_GMTP2,
+			3    => _TZ_GMTP3,
+			3.5  => _TZ_GMTP35,
+			4    => _TZ_GMTP4,
+			4.5  => _TZ_GMTP45,
+			5    => _TZ_GMTP5,
+			5.5  => _TZ_GMTP55,
+			6    => _TZ_GMTP6,
+			7    => _TZ_GMTP7,
+			8    => _TZ_GMTP8,
+			9    => _TZ_GMTP9,
+			9.5  => _TZ_GMTP95,
+			10   => _TZ_GMTP10,
+			11   => _TZ_GMTP11,
+			12   => _TZ_GMTP12
 		);
 	}
 	

From minahito ＠ users.sourceforge.jp  Fri Nov  3 00:36:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Nov 2006 00:36:45 +0900
Subject: [xoops-cvslog 5590] CVS update: xoops2jp/html
Message-ID: <20061102153645.1444D2AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2.2.1 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.2
--- xoops2jp/html/mainfile.dist.php:1.2.8.2.2.1	Thu Nov  2 23:11:11 2006
+++ xoops2jp/html/mainfile.dist.php	Fri Nov  3 00:36:44 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2.2.1 2006/11/02 14:11:11 minahito Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.2 2006/11/02 15:36:44 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -74,7 +74,7 @@
     define("XOOPS_GROUP_USERS", "2");
     define("XOOPS_GROUP_ANONYMOUS", "3");
 
-    if (XOOPS_ROOT_PATH != '') {
+    if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
         include XOOPS_ROOT_PATH."/include/common.php";
     }
 }

From minahito ＠ users.sourceforge.jp  Fri Nov  3 01:25:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Nov 2006 01:25:23 +0900
Subject: [xoops-cvslog 5591] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061102162523.9588C2AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.5 xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php:1.1.2.5	Thu Nov  2 18:57:12 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php	Fri Nov  3 01:25:23 2006
@@ -109,7 +109,8 @@
 				$t_xoopsModule =& $handler->get(intval(xoops_getrequest('confmod_id')));
 				$ret_module =& Legacy_Utils::createModule($t_xoopsModule);
 			}
-			else {
+			
+			if (!is_object($ret_module)) {
 				$ret_module =& Legacy_Utils::createModule($module);
 			}
 		}

From nobunobu ＠ users.sourceforge.jp  Fri Nov  3 10:35:52 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  3 Nov 2006 10:35:52 +0900
Subject: [xoops-cvslog 5592] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061103013552.E34B12AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/module_update.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.5	Mon Oct 30 18:53:45 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_update.html	Fri Nov  3 10:35:52 2006
@@ -45,9 +45,9 @@
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>">
+	<td class="<{cycle values='odd,even'}>"><{$currentVersion|string_format:"%01.2f"}>
 	<{if $currentVersion != $targetVersion}>
-	  &raquo; <span class="legacy_module_versionMsg"><{$targetVersion}></span>
+	  &raquo; <span class="legacy_module_versionMsg"><{$targetVersion|string_format:"%01.2f"}></span>
 	  <{if $isPhasedMode}>(Phased Mode)<{/if}>
 	<{/if}>
 	</td>

From minahito ＠ users.sourceforge.jp  Fri Nov  3 14:47:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Nov 2006 14:47:08 +0900
Subject: [xoops-cvslog 5593] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061103054708.E46A32AC0D7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.5	Thu Nov  2 19:44:27 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Fri Nov  3 14:47:08 2006
@@ -191,7 +191,7 @@
             require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
             $funcName = 'xoops_module_install_' . $this->_mXoopsModule->get('dirname');
             if (function_exists($funcName)) {
-                if (!call_user_func($funcName, $this->_mXoopsModul)) {
+                if (!call_user_func($funcName, $this->_mXoopsModule)) {
                     $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
                 }
             }

From tom_g3x ＠ users.sourceforge.jp  Fri Nov  3 14:56:47 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Nov 2006 14:56:47 +0900
Subject: [xoops-cvslog 5594] CVS update:
	xoops2jp/html/modules/legacy/language/english/help/images
Message-ID: <20061103055647.DA7582AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement_permission.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_clickinstallation.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupperm_news_forum.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_siteinfoinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_1st_themeselection.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_conclusion.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_unusedblocklist.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_moduleinstallation.png

From tom_g3x ＠ users.sourceforge.jp  Fri Nov  3 15:06:45 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Nov 2006 15:06:45 +0900
Subject: [xoops-cvslog 5595] CVS update:
	xoops2jp/html/modules/legacy/language/english/help/images
Message-ID: <20061103060645.DE1D52AC0E4@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement_permission.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_clickinstallation.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupperm_news_forum.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_siteinfoinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_1st_themeselection.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_conclusion.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_unusedblocklist.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_moduleinstallation.png

From minahito ＠ users.sourceforge.jp  Fri Nov  3 15:09:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  3 Nov 2006 15:09:44 +0900
Subject: [xoops-cvslog 5596] CVS update: xoops2jp/html/include
Message-ID: <20061103060944.4949D2AC17D@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.4 xoops2jp/html/include/version.php:1.4.8.12.2.5
--- xoops2jp/html/include/version.php:1.4.8.12.2.4	Thu Nov  2 15:21:51 2006
+++ xoops2jp/html/include/version.php	Fri Nov  3 15:09:44 2006
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.4 2006/11/02 06:21:51 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.5 2006/11/03 06:09:44 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-b");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-c");
 
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Fri Nov  3 15:22:00 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Nov 2006 15:22:00 +0900
Subject: [xoops-cvslog 5597] CVS update:
	xoops2jp/html/modules/legacy/language/english/help/images
Message-ID: <20061103062200.4620F2AC0E4@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_usersearch.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_conclusion.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_unusedblocklist.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_moduleinstallation.png

From tom_g3x ＠ users.sourceforge.jp  Fri Nov  3 16:16:39 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Nov 2006 16:16:39 +0900
Subject: [xoops-cvslog 5598] CVS update:
	xoops2jp/html/modules/legacy/language/english/help/images
Message-ID: <20061103071639.2ADF92AC187@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_modulemanagement_weight.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_usersearch_result.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_unusedblocklist.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_groupmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_moduleinstallation.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockmanagement.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_3rd_moduleinstallation_confirm.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_blockinstall.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_4th_usersearch.png
Index: xoops2jp/html/modules/legacy/language/english/help/images/abc_2nd_conclusion.png

From tom_g3x ＠ users.sourceforge.jp  Fri Nov  3 18:11:33 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  3 Nov 2006 18:11:33 +0900
Subject: [xoops-cvslog 5599] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061103091133.84A962AC00F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.4	Thu Nov  2 18:56:45 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Fri Nov  3 18:11:33 2006
@@ -73,16 +73,12 @@
   <{if $currentModule->getAdminMenu()}>
     <ul class="submenunavi">
       <{foreach item=menu from=$currentModule->getAdminMenu()}>
-        <{if $menu.absolute}>
-          <li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
-        <{else}>
-          <li><a href="<{$xoops_url}>/modules/<{$currentModule->mXoopsModule->getShow('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
-        <{/if}>
+        <li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
       <{/foreach}>
     </ul>
   <{/if}>
   </div>
-/option *}>
+ /option *}>
 
   <div id="contentBody"><{$xoops_contents}></div>
   <div class="return_top"><a href="#container"><{$smarty.const._RETURN_TOP}></a></div>

From minahito ＠ users.sourceforge.jp  Sat Nov  4 13:25:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 13:25:06 +0900
Subject: [xoops-cvslog 5600] CVS update: xoops2jp/html/kernel
Message-ID: <20061104042506.470252AC10B@users.sourceforge.jp>

Index: xoops2jp/html/kernel/timezone.php
diff -u xoops2jp/html/kernel/timezone.php:1.1.2.2.2.1 xoops2jp/html/kernel/timezone.php:1.1.2.2.2.2
--- xoops2jp/html/kernel/timezone.php:1.1.2.2.2.1	Thu Nov  2 23:20:24 2006
+++ xoops2jp/html/kernel/timezone.php	Sat Nov  4 13:25:06 2006
@@ -28,36 +28,36 @@
 		// This handler not connects to database.
 		//
 		$this->_mResult = array(
-			-12  => _TZ_GMTM12,
-			-11  => _TZ_GMTM11,
-			-10  => _TZ_GMTM10,
-			-9   => _TZ_GMTM9,
-			-8   => _TZ_GMTM8,
-			-7   => _TZ_GMTM7,
-			-6   => _TZ_GMTM6,
-			-5   => _TZ_GMTM5,
-			-4   => _TZ_GMTM4,
-			-3.5 => _TZ_GMTM35,
-			-3   => _TZ_GMTM3,
-			-2   => _TZ_GMTM2,
-			-1   => _TZ_GMTM1,
-			0    => _TZ_GMT0,
-			1    => _TZ_GMTP1,
-			2    => _TZ_GMTP2,
-			3    => _TZ_GMTP3,
-			3.5  => _TZ_GMTP35,
-			4    => _TZ_GMTP4,
-			4.5  => _TZ_GMTP45,
-			5    => _TZ_GMTP5,
-			5.5  => _TZ_GMTP55,
-			6    => _TZ_GMTP6,
-			7    => _TZ_GMTP7,
-			8    => _TZ_GMTP8,
-			9    => _TZ_GMTP9,
-			9.5  => _TZ_GMTP95,
-			10   => _TZ_GMTP10,
-			11   => _TZ_GMTP11,
-			12   => _TZ_GMTP12
+			"-12"  => _TZ_GMTM12,
+			"-11"  => _TZ_GMTM11,
+			"-10"  => _TZ_GMTM10,
+			"-9"   => _TZ_GMTM9,
+			"-8"   => _TZ_GMTM8,
+			"-7"   => _TZ_GMTM7,
+			"-6"   => _TZ_GMTM6,
+			"-5"   => _TZ_GMTM5,
+			"-4"   => _TZ_GMTM4,
+			"-3.5" => _TZ_GMTM35,
+			"-3"   => _TZ_GMTM3,
+			"-2"   => _TZ_GMTM2,
+			"-1"   => _TZ_GMTM1,
+			"0"    => _TZ_GMT0,
+			"1"    => _TZ_GMTP1,
+			"2"    => _TZ_GMTP2,
+			"3"    => _TZ_GMTP3,
+			"3.5"  => _TZ_GMTP35,
+			"4"    => _TZ_GMTP4,
+			"4.5"  => _TZ_GMTP45,
+			"5"    => _TZ_GMTP5,
+			"5.5"  => _TZ_GMTP55,
+			"6"    => _TZ_GMTP6,
+			"7"    => _TZ_GMTP7,
+			"8"    => _TZ_GMTP8,
+			"9"    => _TZ_GMTP9,
+			"9.5"  => _TZ_GMTP95,
+			"10"   => _TZ_GMTP10,
+			"11"   => _TZ_GMTP11,
+			"12"   => _TZ_GMTP12
 		);
 	}
 	
@@ -69,15 +69,18 @@
 	
 	function &get($offset)
 	{
-		if (isset($this->_mResult[$offset])) {
-			$obj =& new XoopsTimezone();
-			$obj->setVar('offset', $offset);
-			$obj->setVar('zone_name', $this->_mResult[$offset]);
+		$ret = null;
+		
+		foreach ($this->_mResult as $index => $zone_name) {
+			if (floatval($index) == floatval($offset)) {
+				$obj =& new XoopsTimezone();
+				$obj->set('offset', $index);
+				$obj->set('zone_name', $zone_name);
 
-			return $obj;
+				return $obj;
+			}
 		}
 		
-		$ret = null;
 		return $ret;
 	}
 

From minahito ＠ users.sourceforge.jp  Sat Nov  4 13:35:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 13:35:21 +0900
Subject: [xoops-cvslog 5601] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061104043521.A73602AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.2 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.3
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.2	Wed Oct 25 19:40:31 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Sat Nov  4 13:35:21 2006
@@ -35,6 +35,8 @@
     <td class="<{cycle values="odd,even"}>">
       <{if $allow_chgmail}>
         <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
+      <{else}>
+        <label><{$thisUser->getShow('email')}></label>
       <{/if}>
       <label><{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}></label>
     </td>

From minahito ＠ users.sourceforge.jp  Sat Nov  4 13:40:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 13:40:40 +0900
Subject: [xoops-cvslog 5602] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061104044040.DAC092AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.1 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.2
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.1	Sat Oct  7 15:30:11 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Sat Nov  4 13:40:40 2006
@@ -47,14 +47,14 @@
         <td class="head"><{$smarty.const._MD_USER_LANG_WEBSITE}></td>
         <td class="even"><a href="<{$thisUser->getShow('url')}>" target="_blank"><{$thisUser->getShow('url')}></a></td>
       </tr>
-      <tr valign="top">
-        <td class="head"><{$smarty.const._MD_USER_LANG_EMAIL}></td>
-        <td class="odd">
-          <{if $thisUser->get('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
+      <{if $thisUser->get('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
+        <tr valign="top">
+          <td class="head"><{$smarty.const._MD_USER_LANG_EMAIL}></td>
+          <td class="odd">
             <{mailto address=$thisUser->get('email') encode="javascript"}>
-          <{/if}>
-        </td>
-      </tr>
+          </td>
+        </tr>
+      <{/if}>
       <{if $xoops_isuser == true}>
         <tr valign="top">
           <td class="head"><{$smarty.const._MD_USER_LANG_PM}></td>

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:08:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:08:41 +0900
Subject: [xoops-cvslog 5603] CVS update:
	xoops2jp/html/class/mail/phpmailer/language
Message-ID: <20061104050841.C94512AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/class/mail/phpmailer/language/index.html
diff -u /dev/null xoops2jp/html/class/mail/phpmailer/language/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:08:41 2006
+++ xoops2jp/html/class/mail/phpmailer/language/index.html	Sat Nov  4 14:08:41 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:09:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:09:19 +0900
Subject: [xoops-cvslog 5604] CVS update: xoops2jp/html/core
Message-ID: <20061104050919.626D02AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/core/index.html
diff -u /dev/null xoops2jp/html/core/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:09:19 2006
+++ xoops2jp/html/core/index.html	Sat Nov  4 14:09:19 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:10:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:10:15 +0900
Subject: [xoops-cvslog 5605] CVS update: xoops2jp/html/modules/legacyRender
Message-ID: <20061104051015.540652AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/index.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:10:15 2006
+++ xoops2jp/html/modules/legacyRender/index.html	Sat Nov  4 14:10:15 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:10:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:10:28 +0900
Subject: [xoops-cvslog 5606] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates/stylesheets
Message-ID: <20061104051028.05BD12AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/index.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:10:27 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/index.html	Sat Nov  4 14:10:27 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:10:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:10:40 +0900
Subject: [xoops-cvslog 5607] CVS update:
	xoops2jp/html/modules/legacyRender/language
Message-ID: <20061104051040.B1E492AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/index.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/language/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:10:40 2006
+++ xoops2jp/html/modules/legacyRender/language/index.html	Sat Nov  4 14:10:40 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:10:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:10:55 +0900
Subject: [xoops-cvslog 5608] CVS update:
	xoops2jp/html/modules/legacyRender/preload
Message-ID: <20061104051055.A67112AC10E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/preload/index.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/preload/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:10:55 2006
+++ xoops2jp/html/modules/legacyRender/preload/index.html	Sat Nov  4 14:10:55 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:11:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:11:11 +0900
Subject: [xoops-cvslog 5609] CVS update: xoops2jp/html/modules/stdCache/preload
Message-ID: <20061104051111.6ECBC2AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/preload/index.html
diff -u /dev/null xoops2jp/html/modules/stdCache/preload/index.html:1.1.2.1
--- /dev/null	Sat Nov  4 14:11:11 2006
+++ xoops2jp/html/modules/stdCache/preload/index.html	Sat Nov  4 14:11:11 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:11:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:11:40 +0900
Subject: [xoops-cvslog 5610] CVS update: xoops2jp/html/core
Message-ID: <20061104051140.4BC672AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/core/index.html
diff -u xoops2jp/html/core/index.html:1.1.2.1 xoops2jp/html/core/index.html:1.1.2.2
--- xoops2jp/html/core/index.html:1.1.2.1	Sat Nov  4 14:09:19 2006
+++ xoops2jp/html/core/index.html	Sat Nov  4 14:11:40 2006
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov  4 14:13:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  4 Nov 2006 14:13:26 +0900
Subject: [xoops-cvslog 5611] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061104051326.A86C22AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/index.html
diff -u xoops2jp/html/modules/legacy/index.html:1.1.2.1 xoops2jp/html/modules/legacy/index.html:removed
--- xoops2jp/html/modules/legacy/index.html:1.1.2.1	Sat Oct 14 23:55:28 2006
+++ xoops2jp/html/modules/legacy/index.html	Sat Nov  4 14:13:26 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Nov  4 14:20:46 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Nov 2006 14:20:46 +0900
Subject: [xoops-cvslog 5612] CVS update: xoops2jp/html/include
Message-ID: <20061104052046.9BA342AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/include/common.php
diff -u xoops2jp/html/include/common.php:1.4.8.15.2.3 xoops2jp/html/include/common.php:1.4.8.15.2.4
--- xoops2jp/html/include/common.php:1.4.8.15.2.3	Sat Oct  7 15:50:06 2006
+++ xoops2jp/html/include/common.php	Sat Nov  4 14:20:46 2006
@@ -1,41 +1,13 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: common.php,v 1.4.8.15.2.3 2006/10/07 06:50:06 minahito Exp $
+ * @version $Id: common.php,v 1.4.8.15.2.4 2006/11/04 05:20:46 nobunobu Exp $
  */
 
-//
-// Prohibition of a direct kick
-//
-if (!defined("XOOPS_MAINFILE_INCLUDED")) {
-	die();
-}
+if (!defined('XOOPS_ROOT_PATH')) exit();
+require_once XOOPS_ROOT_PATH . '/include/cubecore_init.php';
 
-/**
- * This constant is the sign which this system is XOOPS Cube, for module
- * developers.
- */
-define('XOOPS_CUBE_LEGACY', true);
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_Root.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_Controller.class.php";
-
-//
-// TODO We have to move the following lines to an appropriate place.
-//      (We may not need the following constants)
-//
-define("XCUBE_SITE_SETTING_FILE", XOOPS_ROOT_PATH . "/settings/site_default.ini.php");
-define("XCUBE_SITE_CUSTOM_FILE", XOOPS_ROOT_PATH . "/settings/site_custom.ini.php");
-
-//
-//@todo How does the system decide the main controller?
-//
 $root=&XCube_Root::getSingleton();
-$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE, XCUBE_SITE_CUSTOM_FILE);
-$root->setupController();
-
 $xoopsController=&$root->getController();
 $xoopsController->executeCommon();
-
-
 ?>
\ No newline at end of file
Index: xoops2jp/html/include/cubecore_init.php
diff -u /dev/null xoops2jp/html/include/cubecore_init.php:1.1.2.1
--- /dev/null	Sat Nov  4 14:20:46 2006
+++ xoops2jp/html/include/cubecore_init.php	Sat Nov  4 14:20:46 2006
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: cubecore_init.php,v 1.1.2.1 2006/11/04 05:20:46 nobunobu Exp $
+ */
+
+//
+// Prohibition of a direct kick
+//
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+	die();
+}
+
+/**
+ * This constant is the sign which this system is XOOPS Cube, for module
+ * developers.
+ */
+define('XOOPS_CUBE_LEGACY', true);
+
+require_once XOOPS_ROOT_PATH . "/core/XCube_Root.class.php";
+require_once XOOPS_ROOT_PATH . "/core/XCube_Controller.class.php";
+
+//
+// TODO We have to move the following lines to an appropriate place.
+//      (We may not need the following constants)
+//
+define("XCUBE_SITE_SETTING_FILE", XOOPS_ROOT_PATH . "/settings/site_default.ini.php");
+define("XCUBE_SITE_CUSTOM_FILE", XOOPS_ROOT_PATH . "/settings/site_custom.ini.php");
+
+//
+//@todo How does the system decide the main controller?
+//
+$root=&XCube_Root::getSingleton();
+$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE, XCUBE_SITE_CUSTOM_FILE);
+$root->setupController();
+?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Nov  4 14:20:46 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  4 Nov 2006 14:20:46 +0900
Subject: [xoops-cvslog 5613] CVS update: xoops2jp/html
Message-ID: <20061104052046.C3BDC2AC103@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2.2.2 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.3
--- xoops2jp/html/mainfile.dist.php:1.2.8.2.2.2	Fri Nov  3 00:36:44 2006
+++ xoops2jp/html/mainfile.dist.php	Sat Nov  4 14:20:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2.2.2 2006/11/02 15:36:44 minahito Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.3 2006/11/04 05:20:46 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -74,8 +74,9 @@
     define("XOOPS_GROUP_USERS", "2");
     define("XOOPS_GROUP_ANONYMOUS", "3");
 
+    @include_once XOOPS_ROOT_PATH.'/include/cubecore_init.php';
     if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
-        include XOOPS_ROOT_PATH."/include/common.php";
+        include XOOPS_ROOT_PATH.'/include/common.php';
     }
 }
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 17:08:45 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 17:08:45 +0900
Subject: [xoops-cvslog 5614] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061104080845.D31702AC11A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.3 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.4
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.3	Sat Nov  4 13:35:21 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Sat Nov  4 17:08:45 2006
@@ -36,7 +36,7 @@
       <{if $allow_chgmail}>
         <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
       <{else}>
-        <label><{$thisUser->getShow('email')}></label>
+        <{$thisUser->getShow('email')}><br />
       <{/if}>
       <label><{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._MD_USER_LANG_USER_VIEWEMAIL}></label>
     </td>

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 17:09:01 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 17:09:01 +0900
Subject: [xoops-cvslog 5615] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061104080901.C47902AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.2 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.3
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.2	Sat Nov  4 13:40:40 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Sat Nov  4 17:09:01 2006
@@ -59,7 +59,7 @@
         <tr valign="top">
           <td class="head"><{$smarty.const._MD_USER_LANG_PM}></td>
           <td class="even">
-            <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getShow('uid')}>', 'pmlite', 450, 380);">
+            <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getShow('uid')}>', 'pmlite', 480, 400);">
             <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" /></a>
           </td>
         </tr>

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 17:09:01 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 17:09:01 +0900
Subject: [xoops-cvslog 5616] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20061104080901.ED27D2AC0BE@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.1 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.2
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.1	Fri Oct 13 18:22:08 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Sat Nov  4 17:09:01 2006
@@ -55,7 +55,7 @@
   <{if $total_messages}>
     <tr class="foot" style="text-align:left;">
       <td colspan="6">
-        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send=1','pmlite',450,380);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
+        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send=1','pmlite',480,400);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
         &nbsp;
         <input type="submit" class="formButton" name="delete_messages" value="<{$smarty.const._MD_PM_LANG_DELETE}>" />
       </td>
@@ -63,7 +63,7 @@
   <{else}>
     <tr class="foot" style="text-align:left;">
       <td colspan="6">
-        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send=1','pmlite',450,380);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
+        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send=1','pmlite',480,400);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
       </td>
     </tr>
   <{/if}>
Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.1 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.2
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.1	Fri Oct 13 18:22:08 2006
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Sat Nov  4 17:09:01 2006
@@ -37,7 +37,7 @@
     <tr class="foot">
       <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:left;">
         <!--- TODO check postr. See original readpmsg --->
-        <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._MD_PM_LANG_REPLY}>" title="<{$smarty.const._MD_PM_LANG_REPLY}>" /></a>
+        <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',480,400);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._MD_PM_LANG_REPLY}>" title="<{$smarty.const._MD_PM_LANG_REPLY}>" /></a>
         <input type="hidden" name="delete" value="1" />  <!--- << check --->
         <input type="hidden" name="msg_id" value="<{$privMessage->getShow('msg_id')}>" />
         <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._MD_PM_LANG_DELETE}>" title="<{$smarty.const._MD_PM_LANG_DELETE}>" /></a>

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 17:09:02 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 17:09:02 +0900
Subject: [xoops-cvslog 5617] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061104080902.1F02D2AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_siteinfo.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_siteinfo.php:1.1.2.2 xoops2jp/html/modules/legacy/blocks/legacy_siteinfo.php:1.1.2.3
--- xoops2jp/html/modules/legacy/blocks/legacy_siteinfo.php:1.1.2.2	Sun Oct 15 01:27:10 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_siteinfo.php	Sat Nov  4 17:09:01 2006
@@ -16,7 +16,7 @@
                     $block['groups'][$i]['name'] = $myts->htmlSpecialChars($userinfo['groupname']);
                 }
                 if (is_object($xoopsUser)) {
-                    $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$userinfo['uid']."','pmlite',450,370);\"><img src=\"".XOOPS_URL."/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>", 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
+                    $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$userinfo['uid']."','pmlite',480,400);\"><img src=\"".XOOPS_URL."/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>", 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
                 } else {
                     if ($userinfo['user_viewemail']) {
                         $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => '<a href="mailto:'.$userinfo['email'].'"><img src="'.XOOPS_URL.'/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>', 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 21:00:21 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 21:00:21 +0900
Subject: [xoops-cvslog 5618] CVS update: xoops2jp/html/install
Message-ID: <20061104120021.35A352AC0FB@users.sourceforge.jp>

Index: xoops2jp/html/install/style.css
diff -u xoops2jp/html/install/style.css:1.1.8.4.2.3 xoops2jp/html/install/style.css:1.1.8.4.2.4
--- xoops2jp/html/install/style.css:1.1.8.4.2.3	Thu Nov  2 21:35:00 2006
+++ xoops2jp/html/install/style.css	Sat Nov  4 21:00:20 2006
@@ -1,4 +1,6 @@
-body {margin:10px 0; padding:0; color:#000000; font-size:12px; text-align:center;}
+body {margin:10px 0; padding:0; color:#000000; font-size:12px; text-align:center;
+	font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; 
+}
 
 a {text-decoration:none; color:#6666bb; font-weight: bold;}
 a:hover {text-decoration:none; color:#ff9966; font-weight:bold;}

From tom_g3x ＠ users.sourceforge.jp  Sat Nov  4 21:23:15 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat,  4 Nov 2006 21:23:15 +0900
Subject: [xoops-cvslog 5619] CVS update: xoops2jp/docs/images
Message-ID: <20061104122315.AA7F62AC075@users.sourceforge.jp>

Index: xoops2jp/docs/images/Thumbs.db

From minahito ＠ users.sourceforge.jp  Sun Nov  5 14:17:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 14:17:08 +0900
Subject: [xoops-cvslog 5620] CVS update: xoops2jp/html/install/language/english
Message-ID: <20061105051708.7C01E2AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/install.php
diff -u xoops2jp/html/install/language/english/install.php:1.2.8.5 xoops2jp/html/install/language/english/install.php:1.2.8.5.2.1
--- xoops2jp/html/install/language/english/install.php:1.2.8.5	Tue Sep 19 16:30:53 2006
+++ xoops2jp/html/install/language/english/install.php	Sun Nov  5 14:17:08 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.2.8.5 2006/09/19 07:30:53 tom_g3x Exp $
+// $Id: install.php,v 1.2.8.5.2.1 2006/11/05 05:17:08 minahito Exp $
 define("_INSTALL_L0","Welcome to the Install Wizard for XOOPS Cube 2.1");
 define("_INSTALL_L70","Please change the file permission for mainfile.php so that it is writeable by the server (i.e. chmod 777 mainfile.php on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server ). Reload this page once you have changed the permission setting.");
 //define("_INSTALL_L71","Click on the button below to begin the installation.");
@@ -40,7 +40,7 @@
 define("_INSTALL_L52","Database Password");
 define("_INSTALL_L68","Password for your database user account");
 define("_INSTALL_L30","Table Prefix");
-define("_INSTALL_L63","This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.");
+define("_INSTALL_L63","This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default.");
 define("_INSTALL_L54","Use persistent connection?");
 define("_INSTALL_L69","Default is 'NO'. Choose 'NO' if you are unsure.");
 define("_INSTALL_L55","XOOPS Cube Physical Path");

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:33:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:33:35 +0900
Subject: [xoops-cvslog 5621] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061105063335.636102AC0D9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.2	Sun Oct 15 00:47:18 2006
+++ xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php	Sun Nov  5 15:33:35 2006
@@ -21,6 +21,18 @@
 		return isset($_REQUEST['bid']) ? xoops_getrequest('bid') : 0;
 	}
 	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		parent::prepare($controller, $xoopsUser);
+		if (is_object($this->mObject)) {
+			$handler =& xoops_gethandler('module');
+			$module =& $handler->get($this->mObject->get('mid'));
+			if (is_object($module)) {
+				$controller->mRoot->mLanguageManager->loadModinfoMessageCatalog($module->get('dirname'));
+			}
+		}
+	}
+	
 	function isEnableCreate()
 	{
 		return false;

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:34:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:34:37 +0900
Subject: [xoops-cvslog 5622] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061105063437.B08812AC036@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.2 xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.3
--- xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.2	Sun Oct 15 00:33:03 2006
+++ xoops2jp/html/class/xoopsform/form.php	Sun Nov  5 15:34:37 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.php,v 1.2.8.4.2.2 2006/10/14 15:33:03 minahito Exp $
+// $Id: form.php,v 1.2.8.4.2.3 2006/11/05 06:34:37 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -190,6 +190,9 @@
             $ret = array();
             $count = count($this->_elements);
             for ($i = 0; $i < $count; $i++) {
+				if (!is_object($this->_elements[$i])) {
+					$ret[] = $this->_elements[$i];
+				}
                 if (!$this->_elements[$i]->isContainer()) {
                     $ret[] =& $this->_elements[$i];
                 } else {

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:39:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:39:15 +0900
Subject: [xoops-cvslog 5623] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061105063915.159E32AC036@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.3 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.3	Thu Nov  2 16:36:10 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Sun Nov  5 15:39:14 2006
@@ -57,6 +57,8 @@
 						foreach ($_POST['uninstalled_modules'] as $module) {
 							$module = basename($module);
 							if (in_array($module, $retArray['uninstalled'])) {
+								$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
+								
 								$handler =& xoops_gethandler('module');
 								$xoopsModule =& $handler->create();
 								$xoopsModule->set('weight', 1);
@@ -92,6 +94,8 @@
 						foreach ($_POST['option_modules'] as $module) {
 							$module = basename($module);
 							if (in_array($module, $optionModules)) {
+								$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
+								
 								$handler =& xoops_gethandler('module');
 								$xoopsModule =& $handler->create();
 								$xoopsModule->set('weight', 1);
@@ -123,6 +127,8 @@
 					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
 					$module = basename($_POST['cube_module_uninstallok']);
 					if (in_array($module, $retArray['disabled'])) {
+						$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
+								
 						$handler =& xoops_gethandler('module');
 						$xoopsModule =& $handler->getByDirname($module);
 						

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:57:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:57:43 +0900
Subject: [xoops-cvslog 5624] CVS update: xoops2jp/docs/images
Message-ID: <20061105065743.5DE6F2AC036@users.sourceforge.jp>

Index: xoops2jp/docs/images/install005.gif
Index: xoops2jp/docs/images/install017.gif
Index: xoops2jp/docs/images/install001.gif
Index: xoops2jp/docs/images/install002.gif
Index: xoops2jp/docs/images/install013.gif
Index: xoops2jp/docs/images/install003.gif
Index: xoops2jp/docs/images/install015.gif
Index: xoops2jp/docs/images/install018.gif
Index: xoops2jp/docs/images/install007.gif
Index: xoops2jp/docs/images/install008.gif
Index: xoops2jp/docs/images/install012.gif
Index: xoops2jp/docs/images/install004.gif
Index: xoops2jp/docs/images/install014.gif
Index: xoops2jp/docs/images/install010.gif
Index: xoops2jp/docs/images/install016.gif
Index: xoops2jp/docs/images/install006.gif
Index: xoops2jp/docs/images/install011.gif
Index: xoops2jp/docs/images/install009.gif

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:57:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:57:43 +0900
Subject: [xoops-cvslog 5625] CVS update: xoops2jp/docs/images/japanese
Message-ID: <20061105065743.ABF972AC036@users.sourceforge.jp>

Index: xoops2jp/docs/images/japanese/install002.gif
Index: xoops2jp/docs/images/japanese/install005.gif
Index: xoops2jp/docs/images/japanese/install010.gif
Index: xoops2jp/docs/images/japanese/install011.gif
Index: xoops2jp/docs/images/japanese/install006.gif
Index: xoops2jp/docs/images/japanese/install007.gif
Index: xoops2jp/docs/images/japanese/install014.gif
Index: xoops2jp/docs/images/japanese/install003.gif
Index: xoops2jp/docs/images/japanese/install004.gif
Index: xoops2jp/docs/images/japanese/install008.gif
Index: xoops2jp/docs/images/japanese/install012.gif
Index: xoops2jp/docs/images/japanese/install013.gif
Index: xoops2jp/docs/images/japanese/install018.gif
Index: xoops2jp/docs/images/japanese/install009.gif
Index: xoops2jp/docs/images/japanese/install015.gif
Index: xoops2jp/docs/images/japanese/install017.gif
Index: xoops2jp/docs/images/japanese/install016.gif
Index: xoops2jp/docs/images/japanese/install001.gif

From minahito ＠ users.sourceforge.jp  Sun Nov  5 15:58:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun,  5 Nov 2006 15:58:23 +0900
Subject: [xoops-cvslog 5626] CVS update: xoops2jp/docs
Message-ID: <20061105065823.858AD2AC036@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.1
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2	Sat Feb  4 18:31:01 2006
+++ xoops2jp/docs/INSTALL.ja.html	Sun Nov  5 15:58:23 2006
@@ -1,9 +1,9 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html;charset=EUC-JP">
-<title>Xoopsインストールガイド</title>
-  <meta name="keywords" content="XOOPS docs" />
-  <meta name="description" content="XOOPS" />
+<title>XOOPS Cubeインストールガイド</title>
+  <meta name="keywords" content="XOOPS Cube docs" />
+  <meta name="description" content="XOOPS Cube" />
   <style>
     P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3 }
     .error { color: #CC3333; font-weight: bold; }
@@ -30,18 +30,17 @@
 </head>
 
 <body bgcolor="#F8F8F8" text="#000000">
-<!-- 翻訳・キャプチャEw111、変更：haruki -->
 <div class="page">
-<h3>XOOPSのインストール方法</h3>
+<h3>XOOPS Cube Cube のインストール方法</h3>
 <hr noshade size="1" />
 <br />
 <h4>はじめてのインストール</h4>
 <br /><br />
 <h4>はじめに</h4>
 <p>
-XOOPSのインストールを始める前に、サーバ上で稼動・運用するソフトウエアのインストールや管理についての知識を習得されるよう、おすすめします。
+XOOPS Cube Cube のインストールを始める前に、サーバ上で稼動・運用するソフトウエアのインストールや管理についての知識を習得されるよう、おすすめします。
 人生と同じで、簡単な方法や答えはありません。
-XOOPSはサーバベースのソフトウエアで、皆さんがよくご存知のデスクトップアプリケーションほど簡単にはインストールできませんので、
+XOOPS Cube Cubeはサーバベースのソフトウエアで、皆さんがよくご存知のデスクトップアプリケーションほど簡単にはインストールできませんので、
 以下で示すソフトウエアのインストールや設定を習得してください。
 この機会にCGIスクリプトや、HTTPサーバの設定に詳しくなってしまいましょう。
 私たちに寄せられる質問の８０％は、サーバ設定の間違いや、サーバソフトウエア同士の通信衝突に原因があります。
@@ -50,11 +49,11 @@
 </p>
 
 <p>
-はじめてXOOPSをインストールする場合、
+はじめてXOOPS Cubeをインストールする場合、
 少なくとも以下のソフトウエアをサーバコンピュータにインストールしておく必要があります。
 </p>
 <div class="indent">
-* HTTPサーバ (<a href="http://www.apache.org">Apache</a> または IIS) 注：XOOPS公式サポートHTTPサーバはApache<br />
+* HTTPサーバ (<a href="http://www.apache.org">Apache</a> または IIS) 注：XOOPS Cube公式サポートHTTPサーバはApache<br />
 * <a href="http://www.php.net">PHP</a> 4.3.2 以上<br />
 * <a href="http://www.mysql.com">MySQL</a> データベース 3.23.XX<br />
 </div>
@@ -62,12 +61,12 @@
 <p>インストールを始める前に次の準備をしてください</p>
 <div class="indent">
 * HTTPサーバ、PHP、データベースサーバを適切にセットアップする。<br />
-*  <a href="http://www.xoops.org">XOOPS</a>をインストールするデータベースを作成する。<br />
+*  <a href="http://XOOPS Cubecube.jp">XOOPS Cube Cube</a> をインストールするデータベースを作成する。<br />
 <div class="indent">
 （もし、作成する権限がない場合は、サーバ管理者かサーバホスティング会社に依頼してください。）<br />
 </div>
 * 上記のデータベースにアクセスできる、データベースサーバのユーザアカウントを準備する。<br />
-* XOOPSのファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、
+* XOOPS Cube Cube のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、
 および「mainfile.php」ファイルのパーミッションをPHPから書き込み可能に設定する。
 <br />
 * ブラウザのクッキーと<span class="missingpage">JavaScript</span>を有効にする。<br />
@@ -76,9 +75,9 @@
 
 <h4>ローカル環境へのインストール</h4>
 <p>
-開発作業やテストのためにXOOPSをローカル環境で実行させる場合には、
+開発作業やテストのために XOOPS Cube Cube をローカル環境で実行させる場合には、
 これまでに述べた通りにサーバソフトウエアとその設定が準備できているか確認してください。
-次に、XOOPSのパッケージに含まれる「html」ディレクトリのすべてのディレクトリやファイルを、
+次に、XOOPS Cube Cube のパッケージに含まれる「html」ディレクトリ内の全てのディレクトリやファイルを、
 コンピュータのドキュメントルート以下にコピーします。
  コピー後、ブラウザのアドレスに「http://あなたのＵＲＬ」（または「http://127.0.0.1」)と入力すると、
 自動的にインストールウィザードが開始されます。
@@ -86,9 +85,9 @@
 
 <h4>インターネット上のサーバへのインストール</h4>
 <p>
-インターネットに接続されたサーバにインストールするには、まずXOOPSファイルをローカルな自分のコンピュータで解凍します。
-もし、サーバへのtelnetかSSHアクセスを許可されているなら、サーバで解凍してもかまいません。
-解凍が済んだらXOOPSの「html」内にあるすべてのディレクトリやファイルを、
+インターネットに接続されたサーバにインストールするには、まず XOOPS Cube Cube ファイルをローカルな自分のコンピュータで解凍します。
+もし、サーバへの telnetか SSHアクセスを許可されているなら、サーバで解凍してもかまいません。
+解凍が済んだらXOOPS Cubeの「html」内にあるすべてのディレクトリやファイルを、
 ホストコンピュータのドキュメントルートに（FTPを使って、または、telnetかSSHを使って）コピー・移動します。
 （もし、ドキュメントルートがわからない場合は、サーバ管理者か、利用しているサーバホスティング会社に問い合わせてください）。 
 転送後、ブラウザのアドレスに「http://あなたのサイトのＵＲＬ」と入力すると、インストールウィザードが開始されます。
@@ -102,14 +101,14 @@
 最初のウィザード画面ではインストーラの言語表示の種類を選択します。
 日本語表示にするには、リストボックスから「japanese」を選択して、「Next」ボタンをクリックします。
 <br /><br />
-<img src="images/japanese/install001.gif" width="778" height="325" border="0" alt="img2.gif">
+<img src="images/japanese/install001.gif" border="0" />
 </p>
 
 <p>
-「XOOPS 2.0 インストールウィザードへようこそ」画面が表示されますので、内容をよく読み「次へ」ボタンをクリックして進みます。
+「XOOPS Cube Cube 2.1 インストールウィザードへようこそ」画面が表示されますので、内容をよく読み「次へ」ボタンをクリックして進みます。
 （特に<b><u>準備</u></b>をもう一度よく読んで、インストールの準備ができているかどうか確認してください。）
 <br /><br />
-<img src="images/japanese/install002.gif" width="778" height="705" border="0" alt="img3.gif">
+<img src="images/japanese/install002.gif" border="0" />
 </p>
 
 <p>
@@ -123,44 +122,44 @@
 Unix環境でインストールを実行している場合には、各ディレクトリとファイルに正しいパーミッションを設定する必要があります。
 画面のようにすべてが緑色の信号で表示されたら、「次へ」ボタンをクリックして進みます。 <br />
 <br />
-<img src="images/japanese/install003.gif" width="777" height="367" border="0" alt="img4.gif">
+<img src="images/japanese/install003.gif" border="0" />
 </p>
 
 <p>
-次のウィザード画面には、XOOPSをインストールするディレクトリやブラウザでアクセスするためのURLなど、
+次のウィザード画面には、XOOPS CubeをインストールするディレクトリやブラウザでアクセスするためのURLなど、
 「データベース、およびパス・URLの設定」の入力フォームが表示されます。
-<br><br>
+<br /><br />
 「データベースサーバ」には、使用するデータベースサーバの種類を指定します。
-<br><br>
+<br /><br />
 「データベースサーバのホスト名」には、データベースサーバのホスト名を入力します。
 ほとんどの場合、localhostという名前ですが、
 必ずサイト管理者やサーバのホスティング会社に問い合わせて、正しいデータベースホスト名を入力します。
-<br><br>
+<br /><br />
 「データベースユーザ名」と「データベースパスワード」には、
-XOOPSがデータベースに接続する際に使用するユーザ名とパスワードを入力します。
+XOOPS Cubeがデータベースに接続する際に使用するユーザ名とパスワードを入力します。
 （テスト用のローカル環境以外では、セキュリティー上rootユーザとすべきではありません。
 また、ホスティングサービスを利用の場合は、ホスティング会社からあなたが使用できるユーザ名が知らされているはずです。）
 <br />
-「データベース名」には、XOOPSで使うデータベースの名前を入力します。
+「データベース名」には、XOOPS Cube Cube で使うデータベースの名前を入力します。
 上記のデータベースユーザは、このデータベースのアクセス・操作権限を持つ必要があります。
 ホスティングサービスを利用の場合は、ホスティング会社から使用できるデータベース名が指定されている場合があります。
-<br><br>
-「テーブル接頭語」にはXOOPSが使うテーブル名の先頭に付ける接頭語を入力します。
+<br /><br />
+「テーブル接頭語」にはXOOPS Cubeが使うテーブル名の先頭に付ける接頭語を入力します。
 テーブル接頭語は、ほかのソフトウエアが使用するテーブル名との重複をさけるためのものです。
 あまり長いものにしないようにすることが望ましいです。
-<br><br>
+<br /><br />
 「データベースへ持続的接続」は、よく分からない場合は、初期設定のまま「いいえ」を選択します。
-<br><br>
-「XOOPSへのパス」には、ホストコンピュータにおける、XOOPSまでのフルパスを入力します。<br>
-「XOOPSへのURL」には、ブラウザでXOOPSにアクセスするためのURLを入力します。<br>
+<br /><br />
+「XOOPS Cubeへのパス」には、ホストコンピュータにおける、XOOPS Cubeまでのフルパスを入力します。<br />
+「XOOPS CubeへのURL」には、ブラウザでXOOPS CubeにアクセスするためのURLを入力します。<br />
 入力フォームには自動で認識された値が入っていますが、必ず正しいかどうか確認してください。
 不明な場合は、サーバ管理者やホスティング会社に問い合わせて、正しく入力してください。
 また、Windowsではパスの区切り記号に「￥」を使いますが、ここでは「/」を使ってください。
 また、最後へ「.../htdocs/」のように「/」を入力しないでください。
-<br><br>
+<br /><br />
 すべての項目を入力したら「次へ」ボタンをクリックして進みます。
 <br /><br />
-<img src="images/japanese/install004.gif" width="777" height="621" border="0" alt="img6.gif"><br />
+<img src="images/japanese/install004.gif" border="0" />
 </p>
 
 <p>
@@ -168,21 +167,21 @@
 インストールが失敗する原因のほとんどは、設定内容を注意深く確認していないことによるものです。
 もし、間違っていたら「戻る」ボタンをクリックして入力をやり直します。
 一覧が正しければ「次へ」ボタンをクリックして進みます。
-<br><br />
-<img src="images/japanese/install005.gif" width="779" height="459" border="0" alt="img7.gif">
+<br /><br />
+<img src="images/japanese/install005.gif" border="0" />
 </p>
 
 <p>
-入力した「データベース、およびパス・URLの設定」の内容がXOOPSの設定ファイル「mainfile.php」に書き込まれ、
+入力した「データベース、およびパス・URLの設定」の内容がXOOPS Cubeの設定ファイル「mainfile.php」に書き込まれ、
 次のウィザード画面に書き込み処理の結果が表示されます。
 先頭に緑色の信号が付いた書き込み処理は正常に実行できています。
 すべてが正常に書き込み処理できたことを確認したら、「次へ」ボタンをクリックして進みます。
-<br><br />
-<img src="images/japanese/install006.gif" width="777" height="504" border="0" alt="img9.gif">
+<br /><br />
+<img src="images/japanese/install006.gif" border="0" />
 </p>
 
 <p>
-mainfile.phpに書き込まれたXOOPSディレクトリへのパスとXOOPSへのURLがウィザードによって検証され、
+mainfile.phpに書き込まれたXOOPS CubeディレクトリへのパスとXOOPS CubeへのURLがウィザードによって検証され、
 次のウィザード画面にその検証結果が表示されます。
 先頭に緑色の信号が付いた検証結果は正常なので、「次へ」ボタンをクリックして進みます。
 先頭に赤色の信号が付いた場合は、インストーラが検出したパスとＵＲＬが、設定されたものと尾異なっています。
@@ -190,15 +189,16 @@
 間違っていた場合は、インストールをはじめからやり直してください。
 （サーバの設定によっては、まれに、設定が正しくてもエラーとなる場合があります。その際は、無視して次に進んでください。）
 「次へ」ボタンをクリックして進みます。
-<br><br />
-<img src="images/japanese/install007.gif" width="779" height="417" border="0" alt="img10.gif">
+<br /><br />
+<img src="images/japanese/install007.gif" border="0" />
 </p>
 
 <p>
 次のウィザード画面には、「データベース、およびパス・URLの設定」でフォームに入力したデータベースの内容が一覧で表示されます。
 設定が正しければ「次へ」ボタンをクリックして進みます。
 間違っている場合は、インストールをはじめからやり直してください。
-<img src="images/japanese/install008.gif" width="779" height="407" border="0" alt="img11.gif">
+<br /><br />
+<img src="images/japanese/install008.gif" border="0" />
 </p>
 
 <p>
@@ -210,45 +210,55 @@
 PHP・データベースサーバの設定が間違っています。
 インストールをはじめからやり直してください。<br />
  <br />
-<img src="images/japanese/install009.gif" width="778" height="350" border="0" alt="img12.gif">
+<img src="images/japanese/install009.gif" border="0" />
+<br /><br />
+<img src="images/japanese/install010.gif" border="0" />
+<br /><br />
+<img src="images/japanese/install011.gif" border="0" />
 </p>
 
 <p>
-データベースにXOOPSのテーブルが作成され、次のウィザード画面に作成結果が一覧表示されます。
+データベースにXOOPS Cubeのテーブルが作成され、次のウィザード画面に作成結果が一覧表示されます。
 先頭に緑色の付いたテーブルは正常に作成されています。
 先頭に赤色の付いたテーブルは作成に失敗しています。
 すべてのテーブルが正しく作成できていたら、「次へ」ボタンをクリックして進みます。<br />
 <br />
-<img src="images/japanese/install010.gif" width="779" height="765" border="0" alt="img13.gif">
+<img src="images/japanese/install012.gif" border="0" />
 </p>
 
 <p>
 次のウィザード画面には、管理者ユーザを作成するためのフォームが表示されます。
-XOOPSのインストールが完了したら、この管理者ユーザ名でログインし、XOOPSをセットアップします。
+XOOPS Cubeのインストールが完了したら、この管理者ユーザ名でログインし、XOOPS Cubeをセットアップします。
 ユーザ名とパスワードは、忘れないようにしてください。
 また、「管理者ユーザー名」「パスワード」とも、半角英数字とし、スペースを含めないことを推奨します。
 フォームのすべてに入力が済んだら「次へ」ボタンをクリックして進みます。
 <br /><br />
-<img src="images/japanese/install011.gif" width="779" height="312" border="0" alt="img14.gif">
+<img src="images/japanese/install013.gif" border="0" />
 </p>
 
 <p>
-XOOPSで使うアイコンや初期データが各テーブルに作成され、次のウィザード画面にその結果が表示されます。
+XOOPS Cubeで使うアイコンや初期データが各テーブルに作成され、次のウィザード画面にその結果が表示されます。
 すべてのデータの作成や書き込みの先頭に緑色の信号が付いていることを確認し、
 「次へ」ボタンをクリックしてインストールを完了します。
-<br><br>
-<img src="images/japanese/install012.gif" width="779" height="705" border="0" alt="img15.gif">
+<br /><br />
+<img src="images/japanese/install014.gif" border="0" />
 </p>
 
-<h4>インストール成功！</h4>
+<h4>STEP1 インストール成功！</h4>
+<br />
+<img src="images/japanese/install015.gif" border="0" />
+<br /><br />
+<img src="images/japanese/install016.gif" border="0" />
+<br /><br />
+<img src="images/japanese/install017.gif" border="0" />
+<br /><br />
+<img src="images/japanese/install018.gif" border="0" />
 <p>
-お疲れさまでした、これでXOOPSのインストール作業はすべて完了しました。
-<u><b>サイト</b></u>に貼られた「ここ」リンクをクリックして、インストールしたXOOPSのサイトにアクセスし、この管理者ユーザ名でログインし、洗練されたポータルサイトを構築してください。
-もし、このガイドに従ってもインストールできない場合は <a href="http://jp.xoops.org/wiki/pukiwiki.php?FrontPage">XOOPSサイトにあるマニュアル・FAQ</a> で調べたり、 
-<a href="http://jp.xoops.org/">XOOPS日本語公式サイト</a>のフォーラムで開発チームのメンバーやたくさんのXOOPSユーザーに敬意を払って質問すれば、
+お疲れさまでした、これでXOOPS Cubeのインストール作業はすべて完了しました。
+<u><b>サイト</b></u>に貼られた「ここ」リンクをクリックして、インストールしたXOOPS Cubeのサイトにアクセスし、この管理者ユーザ名でログインし、洗練されたポータルサイトを構築してください。
+もし、このガイドに従ってもインストールできない場合は <a href="http://jp.XOOPS Cube.org/wiki/pukiwiki.php?FrontPage">XOOPS Cubeサイトにあるマニュアル・FAQ</a> で調べたり、 
+<a href="http://xoopscube.jp/">XOOPS Cube日本語公式サイト</a>のフォーラムで開発チームのメンバーやたくさんのXOOPS Cubeユーザーに敬意を払って質問すれば、
 きっとインストールを成功させる方法を見つけられることでしょう。
-<br><br>
-<img src="images/japanese/install013.gif" width="779" height="435" border="0" alt="img16.gif"><br /><br />
 </p>
 </body>
 </html>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Sun Nov  5 16:44:40 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun,  5 Nov 2006 16:44:40 +0900
Subject: [xoops-cvslog 5627] CVS update: xoops2jp/docs/images/japanese
Message-ID: <20061105074440.4CAA42AC0D9@users.sourceforge.jp>

Index: xoops2jp/docs/images/japanese/Thumbs.db

From nobunobu ＠ users.sourceforge.jp  Sun Nov  5 23:01:42 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  5 Nov 2006 23:01:42 +0900
Subject: [xoops-cvslog 5628] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061105140142.429E32AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/preference_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.4	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/preference_edit.html	Sun Nov  5 23:01:42 2006
@@ -1,6 +1,6 @@
 <div class="adminnavi">
   <{if $module != null}>
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getVar('dirname')}>/admin/index.php"><{$module->getVar('name')}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->getInfo('adminindex')|escape}>"><{$module->getShow('name')}></a>
     <{if $category != null}>
       &raquo;&raquo; <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getVar('dirname')}>/admin/index.php?action=PreferenceList"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></a>
       &raquo;&raquo; <{$category->getName()|escape}>

From nobunobu ＠ users.sourceforge.jp  Mon Nov  6 13:58:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  6 Nov 2006 13:58:29 +0900
Subject: [xoops-cvslog 5629] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061106045829.403A72AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/Legacy_Debugger.class.php
diff -u xoops2jp/html/modules/legacy/class/Legacy_Debugger.class.php:1.1.2.1 xoops2jp/html/modules/legacy/class/Legacy_Debugger.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/class/Legacy_Debugger.class.php:1.1.2.1	Mon Oct 16 16:38:53 2006
+++ xoops2jp/html/modules/legacy/class/Legacy_Debugger.class.php	Mon Nov  6 13:58:29 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_Debugger.class.php,v 1.1.2.1 2006/10/16 07:38:53 minahito Exp $
+// $Id: Legacy_Debugger.class.php,v 1.1.2.2 2006/11/06 04:58:29 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -36,17 +36,6 @@
 
 class Legacy_DebuggerManager
 {
-	function getInstance($debug_mode)
-	{
-        static $instance = array();
-
-        if (empty($instance[$debug_mode])) {
-            $instance[$debug_mode] =& Legacy_DebuggerManager::_createInstance($debug_mode);
-        }
-        
-        return $instance[$debug_mode];
-	}
-	
 	/**
 	Create XoopsDebugger instance.
 	You must not communicate with this method directly.

From minahito ＠ users.sourceforge.jp  Mon Nov  6 18:25:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 18:25:19 +0900
Subject: [xoops-cvslog 5630] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061106092519.8E2502AC13A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.4 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.4	Thu Nov  2 16:37:52 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Mon Nov  6 18:25:19 2006
@@ -181,7 +181,7 @@
 		return $this->_mBlock->get('title');
 	}
 	
-	function enableCache()
+	function isEnableCache()
 	{
 		return $this->_mBlock->get('bcachetime') > 0;
 	}

From minahito ＠ users.sourceforge.jp  Mon Nov  6 18:39:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 18:39:39 +0900
Subject: [xoops-cvslog 5631] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061106093939.3C5632AC140@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.5	Fri Nov  3 18:11:33 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Mon Nov  6 18:39:39 2006
@@ -5,7 +5,7 @@
 <meta http-equiv="content-language" content="<{$xoops_langcode}>" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
-<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}> : <{$currentModule->mXoopsModule->getShow('name')}></title>
+<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}> : <{$xoops_pagetitle}></title>
 <script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
 <{stylesheet file=style.css}>
 <{stylesheet file=module.css}>

From minahito ＠ users.sourceforge.jp  Mon Nov  6 18:39:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 18:39:50 +0900
Subject: [xoops-cvslog 5632] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061106093950.5E38C2AC137@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.8 xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.8	Mon Oct 30 20:46:25 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php	Mon Nov  6 18:39:50 2006
@@ -169,7 +169,7 @@
 		// Other attributes
 		//
 		$this->mSmarty->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getXoopsConfig('sitename'), ENT_QUOTES));
-		$this->mSmarty->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getXoopsConfig('slogan'), ENT_QUOTES));
+		$this->mSmarty->assign('xoops_pagetitle', $moduleObject->mXoopsModule->getShow('name'));
 		
 		//
 		// Theme rendering

From minahito ＠ users.sourceforge.jp  Mon Nov  6 19:17:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 19:17:34 +0900
Subject: [xoops-cvslog 5633] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20061106101734.CE5672AC138@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.4 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.5
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.30.2.4	Thu Nov  2 00:50:44 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Mon Nov  6 19:17:34 2006
@@ -117,5 +117,7 @@
 define('_AD_USER_TIP_DELETE_AVATAR', "Users who are using this avatar will have blank.gif as the avatar image file.");
 define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many users to send mail, the server may not respond as expected (blank page etc.). In that case, reload the browser several times to complete sending mail to all users.");
 define('_AD_USER_TIPS_RECOUNT_POSTS', "You may recalculate the number of posts for the user by clicking on the 'Recalculate' button below.");
+define('_AD_USER_TIPS_USER_EDIT', "If you hope to change password, input 'Password' & 'Verify password'.");
+define('_AD_USER_TIPS_USER_NEW', "You must input 'User name', 'Email address' and 'Password' & 'Verify password'.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Mon Nov  6 19:17:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 19:17:34 +0900
Subject: [xoops-cvslog 5634] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20061106101735.01CDB2AC13E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.4 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.5
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.37.2.4	Thu Nov  2 00:50:44 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Mon Nov  6 19:17:34 2006
@@ -117,5 +117,7 @@
 define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
 define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース（真っ白になるなど）があります。<br/>その場合はブラウザでリロード（再読込）操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。");
 define('_AD_USER_TIPS_RECOUNT_POSTS', "もし投稿数が間違っているようであれば、再計算することができます。");
+define('_AD_USER_TIPS_USER_EDIT', "パスワードを変更したいときだけ、パスワードとパスワード確認を入力してください");
+define('_AD_USER_TIPS_USER_NEW', "ユーザー名、メールアドレス、パスワードとパスワード確認は必ず入力してください");
 
 ?>

From minahito ＠ users.sourceforge.jp  Mon Nov  6 19:20:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 19:20:19 +0900
Subject: [xoops-cvslog 5635] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20061106102019.C04CB2AC038@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.1 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.2
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.1	Mon Oct 16 00:29:45 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Mon Nov  6 19:20:19 2006
@@ -11,10 +11,13 @@
 
 <{if $actionForm->get('uid')}>
   <h3 class="admintitle"><{$smarty.const._AD_USER_LANG_USER_EDIT}> (<{$actionForm->get('uname')}>)</h3>
+  <div class="tips"><{$smarty.const._AD_USER_TIPS_USER_EDIT}></div>
 <{else}>
   <h3 class="admintitle"><{$smarty.const._AD_USER_LANG_USER_NEW}></h3>
+  <div class="tips"><{$smarty.const._AD_USER_TIPS_USER_NEW}></div>
 <{/if}>
 
+
 <{if $actionForm->hasError()}>
 <div class="error">
   <ul>

From minahito ＠ users.sourceforge.jp  Mon Nov  6 22:03:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon,  6 Nov 2006 22:03:06 +0900
Subject: [xoops-cvslog 5636] CVS update: xoops2jp/html/include
Message-ID: <20061106130306.930C12AC06C@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.5 xoops2jp/html/include/version.php:1.4.8.12.2.6
--- xoops2jp/html/include/version.php:1.4.8.12.2.5	Fri Nov  3 15:09:44 2006
+++ xoops2jp/html/include/version.php	Mon Nov  6 22:03:06 2006
@@ -1,9 +1,8 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.5 2006/11/03 06:09:44 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.6 2006/11/06 13:03:06 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-c");
 
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Tue Nov  7 01:09:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue,  7 Nov 2006 01:09:29 +0900
Subject: [xoops-cvslog 5637] CVS update: xoops2jp/html/include
Message-ID: <20061106160929.CCE342AC055@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.6 xoops2jp/html/include/version.php:1.4.8.12.2.7
--- xoops2jp/html/include/version.php:1.4.8.12.2.6	Mon Nov  6 22:03:06 2006
+++ xoops2jp/html/include/version.php	Tue Nov  7 01:09:29 2006
@@ -1,8 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.6 2006/11/06 13:03:06 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.7 2006/11/06 16:09:29 tom_g3x Exp $
  */
 
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-d");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 15:35:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 15:35:24 +0900
Subject: [xoops-cvslog 5638] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061107063524.722732AC01B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.13 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.14
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.13	Thu Nov  2 18:57:35 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Tue Nov  7 15:35:24 2006
@@ -320,7 +320,7 @@
 				//
 				if ($cacheInfo->isEnableCache() && $this->existActiveCacheFile($filepath, $blockProcedure->getCacheTime())) {
 					$content = $this->loadCache($filepath);
-					if ($content != null) {
+					if ($blockProcedure->isDisplay()) {
 						$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
 						$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
 							'name' => $blockProcedure->getName(),
@@ -328,29 +328,34 @@
 							'content' => $content,
 							'weight'  => $blockProcedure->getWeight()
 						);
-						
-						$usedCacheFlag = true;
 					}
+						
+					$usedCacheFlag = true;
 				}
 			}
 			
 			if (!$usedCacheFlag) {
 				$blockProcedure->execute();
 
-				if (!$blockProcedure->isDisplay()) {
-					continue;
+				$renderBuffer = null;
+				if ($blockProcedure->isDisplay()) {
+					$renderBuffer =& $blockProcedure->getRenderBuffer();
+					
+					$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
+					$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
+							'name' => $blockProcedure->getName(),
+							'title'=>$blockProcedure->getTitle(),
+							'content'=>$renderBuffer->getResult(),
+							'weight'=>$blockProcedure->getWeight()
+					);
+				}
+				else {
+					//
+					// Dummy save
+					//
+					$renderBuffer =& new XCube_RenderTarget();
 				}
 				
-				$renderBuffer =& $blockProcedure->getRenderBuffer();
-				
-				$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
-				$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
-						'name' => $blockProcedure->getName(),
-						'title'=>$blockProcedure->getTitle(),
-						'content'=>$renderBuffer->getResult(),
-						'weight'=>$blockProcedure->getWeight()
-				);
-
 				if ($this->isEnableCacheFeature() && $blockProcedure->isEnableCache() && is_object($cacheInfo) && $cacheInfo->isEnableCache()) {
 					$this->cacheRenderTarget($cacheInfo->getCacheFilePath(), $renderBuffer);
 				}

From minahito ＠ users.sourceforge.jp  Tue Nov  7 15:36:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 15:36:19 +0900
Subject: [xoops-cvslog 5639] CVS update: xoops2jp/html/modules/stdCache/blocks
Message-ID: <20061107063619.4C2AD2AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/blocks/cacheclear.php
diff -u xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.2 xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.3
--- xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.2	Sat Oct 14 13:53:05 2006
+++ xoops2jp/html/modules/stdCache/blocks/cacheclear.php	Tue Nov  7 15:36:19 2006
@@ -28,25 +28,4 @@
 	}
 }
 
-function Stdcache_cacheclear_show()
-{
-	$root =& XCube_Root::getSingleton();
-	
-	if (!$root->mController->isEnableCacheFeature()) {
-		return false;
-	}
-	
-	if($handler = opendir(XOOPS_CACHE_PATH)) {
-		while(($file = readdir($handler)) !== false) {
-			if(preg_match("/\w+\.cache\.html$/", $file, $matches)) {
-				@unlink(XOOPS_CACHE_PATH . "/" . $matches[0]);
-			}
-		}
-		closedir($handler);
-	}
-	
-	$block['dmy'] = true;
-	return $block;
-}
-
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:30:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:30:28 +0900
Subject: [xoops-cvslog 5640] CVS update:
	xoops2jp/html/modules/stdCache/admin/templates
Message-ID: <20061107073028.055A42AC052@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:30:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:30:30 +0900
Subject: [xoops-cvslog 5641] CVS update:
	xoops2jp/html/modules/stdCache/admin/templates
Message-ID: <20061107073030.3BA222AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/admin/templates/index.html
diff -u /dev/null xoops2jp/html/modules/stdCache/admin/templates/index.html:1.1.2.1
--- /dev/null	Tue Nov  7 16:30:30 2006
+++ xoops2jp/html/modules/stdCache/admin/templates/index.html	Tue Nov  7 16:30:30 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html
diff -u /dev/null xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html:1.1.2.1
--- /dev/null	Tue Nov  7 16:30:30 2006
+++ xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html	Tue Nov  7 16:30:30 2006
@@ -0,0 +1 @@
+<{$smarty.const._AD_STDCACHE_LANG_INTERVAL_TIMER}> <input type="text" name="options[]" value="<{$timer|escape}>" />
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:30:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:30:39 +0900
Subject: [xoops-cvslog 5642] CVS update:
	xoops2jp/html/modules/stdCache/language/english
Message-ID: <20061107073039.4A7DD2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/admin.php
diff -u /dev/null xoops2jp/html/modules/stdCache/language/english/admin.php:1.1.2.1
--- /dev/null	Tue Nov  7 16:30:39 2006
+++ xoops2jp/html/modules/stdCache/language/english/admin.php	Tue Nov  7 16:30:39 2006
@@ -0,0 +1,5 @@
+<?php
+
+define('_AD_STDCACHE_LANG_INTERVAL_TIMER', "Interval timer (min) :");
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:30:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:30:39 +0900
Subject: [xoops-cvslog 5643] CVS update:
	xoops2jp/html/modules/stdCache/language/japanese
Message-ID: <20061107073039.70A972AC05A@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/japanese/admin.php
diff -u /dev/null xoops2jp/html/modules/stdCache/language/japanese/admin.php:1.1.2.1
--- /dev/null	Tue Nov  7 16:30:39 2006
+++ xoops2jp/html/modules/stdCache/language/japanese/admin.php	Tue Nov  7 16:30:39 2006
@@ -0,0 +1,5 @@
+<?php
+
+define('_AD_STDCACHE_LANG_INTERVAL_TIMER', "間隔タイマー（分）：");
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:31:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:31:23 +0900
Subject: [xoops-cvslog 5644] CVS update: xoops2jp/html/modules/stdCache
Message-ID: <20061107073123.B5D912AC08E@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/xoops_version.php
diff -u xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.2 xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.3
--- xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.2	Thu Nov  2 16:39:49 2006
+++ xoops2jp/html/modules/stdCache/xoops_version.php	Tue Nov  7 16:31:23 2006
@@ -1,8 +1,8 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.3.2.2 2006/11/02 07:39:49 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.3.2.3 2006/11/07 07:31:23 minahito Exp $
 
 $modversion['name'] = _MI_STDCACHE_NAME;
-$modversion['version'] = 2.01;
+$modversion['version'] = 2.02;
 $modversion['description'] = _MI_STDCACHE_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
@@ -23,10 +23,12 @@
 $modversion['hasMain'] = 0;
 
 // Blocks
+$modversion['blocks'][1]['func_num'] = 1;
 $modversion['blocks'][1]['file'] = "cacheclear.php";
 $modversion['blocks'][1]['name'] = _MI_STDCACHE_BLOCK_CACHECLEAR;
 $modversion['blocks'][1]['description'] = "Clear cache";
 $modversion['blocks'][1]['class'] = "CacheclearBlock";
 $modversion['blocks'][1]['template'] = 'stdcache_block_cacheclear.html';
+$modversion['blocks'][1]['options'] = '60';
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:31:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:31:46 +0900
Subject: [xoops-cvslog 5645] CVS update: xoops2jp/html/modules/stdCache/blocks
Message-ID: <20061107073146.AF7A72AC05A@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/blocks/cacheclear.php
diff -u xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.3 xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.4
--- xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.3	Tue Nov  7 15:36:19 2006
+++ xoops2jp/html/modules/stdCache/blocks/cacheclear.php	Tue Nov  7 16:31:46 2006
@@ -4,6 +4,14 @@
 
 class Stdcache_CacheclearBlock extends Legacy_BlockProcedure
 {
+	var $_mFilePath = null;
+	
+	function prepare()
+	{
+		$this->_mFilePath = XOOPS_CACHE_PATH . "/" . md5(XOOPS_SALT) . ".cache.html";
+		return parent::prepare();
+	}
+	
 	function execute()
 	{
 		$root =& XCube_Root::getSingleton();
@@ -12,20 +20,57 @@
 			return false;
 		}
 		
-		if($handler = opendir(XOOPS_CACHE_PATH)) {
-			while(($file = readdir($handler)) !== false) {
-				if(preg_match("/\w+\.cache\.html$/", $file, $matches)) {
-					@unlink(XOOPS_CACHE_PATH . "/" . $matches[0]);
+		//
+		// Check timer
+		//
+		$options = explode('|', $this->_mBlock->get('options'));
+		if (!file_exists($this->_mFilePath)) {
+			$this->updateTimer();
+		}
+		
+		if (filemtime($this->_mFilePath) < time() - intval($options[0]) * 60) {
+			if($handler = opendir(XOOPS_CACHE_PATH)) {
+				while(($file = readdir($handler)) !== false) {
+					if(preg_match("/\w+\.cache\.html$/", $file, $matches)) {
+						@unlink(XOOPS_CACHE_PATH . "/" . $matches[0]);
+					}
 				}
+				closedir($handler);
 			}
-			closedir($handler);
+			
+			$this->updateTimer();
 		}
 	}
 	
+	function updateTimer()
+	{
+		$fp = fopen($this->_mFilePath, "wb");
+		fclose ($fp);
+	}
+	
 	function isDisplay()
 	{
 		return false;
 	}
+
+	function getOptionForm()
+	{
+		$options = explode('|', $this->_mBlock->get('options'));
+		
+		$root =& XCube_Root::getSingleton();
+		$renderSystem =& $root->getRenderSystem('Legacy_AdminRenderSystem');
+		$renderTarget =& $renderSystem->createRenderTarget();
+		
+		$renderTarget->setAttribute('legacy_module', 'stdCache');
+		$renderTarget->setTemplateName('block_cacheclear_option.html');
+		$renderTarget->setAttribute('timer', $options[0]);
+
+		//
+		// renderWithTarget() will be renamed to render() in the near future.
+		//		
+		$renderSystem->renderWithTarget($renderTarget);
+		return $renderTarget->getResult();
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:39:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:39:11 +0900
Subject: [xoops-cvslog 5646] CVS update: xoops2jp/docs
Message-ID: <20061107073911.4855B2AC092@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.1 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.2
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.1	Sun Nov  5 15:58:23 2006
+++ xoops2jp/docs/INSTALL.ja.html	Tue Nov  7 16:39:11 2006
@@ -31,16 +31,16 @@
 
 <body bgcolor="#F8F8F8" text="#000000">
 <div class="page">
-<h3>XOOPS Cube Cube のインストール方法</h3>
+<h3>XOOPS Cube Legacy のインストール方法</h3>
 <hr noshade size="1" />
 <br />
 <h4>はじめてのインストール</h4>
 <br /><br />
 <h4>はじめに</h4>
 <p>
-XOOPS Cube Cube のインストールを始める前に、サーバ上で稼動・運用するソフトウエアのインストールや管理についての知識を習得されるよう、おすすめします。
+XOOPS Cube Legacy のインストールを始める前に、サーバ上で稼動・運用するソフトウエアのインストールや管理についての知識を習得されるよう、おすすめします。
 人生と同じで、簡単な方法や答えはありません。
-XOOPS Cube Cubeはサーバベースのソフトウエアで、皆さんがよくご存知のデスクトップアプリケーションほど簡単にはインストールできませんので、
+XOOPS Cube Legacyはサーバベースのソフトウエアで、皆さんがよくご存知のデスクトップアプリケーションほど簡単にはインストールできませんので、
 以下で示すソフトウエアのインストールや設定を習得してください。
 この機会にCGIスクリプトや、HTTPサーバの設定に詳しくなってしまいましょう。
 私たちに寄せられる質問の８０％は、サーバ設定の間違いや、サーバソフトウエア同士の通信衝突に原因があります。
@@ -61,12 +61,12 @@
 <p>インストールを始める前に次の準備をしてください</p>
 <div class="indent">
 * HTTPサーバ、PHP、データベースサーバを適切にセットアップする。<br />
-*  <a href="http://XOOPS Cubecube.jp">XOOPS Cube Cube</a> をインストールするデータベースを作成する。<br />
+*  <a href="http://XOOPS Cubecube.jp">XOOPS Cube Legacy</a> をインストールするデータベースを作成する。<br />
 <div class="indent">
 （もし、作成する権限がない場合は、サーバ管理者かサーバホスティング会社に依頼してください。）<br />
 </div>
 * 上記のデータベースにアクセスできる、データベースサーバのユーザアカウントを準備する。<br />
-* XOOPS Cube Cube のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、
+* XOOPS Cube Legacy のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、
 および「mainfile.php」ファイルのパーミッションをPHPから書き込み可能に設定する。
 <br />
 * ブラウザのクッキーと<span class="missingpage">JavaScript</span>を有効にする。<br />
@@ -75,9 +75,9 @@
 
 <h4>ローカル環境へのインストール</h4>
 <p>
-開発作業やテストのために XOOPS Cube Cube をローカル環境で実行させる場合には、
+開発作業やテストのために XOOPS Cube Legacy をローカル環境で実行させる場合には、
 これまでに述べた通りにサーバソフトウエアとその設定が準備できているか確認してください。
-次に、XOOPS Cube Cube のパッケージに含まれる「html」ディレクトリ内の全てのディレクトリやファイルを、
+次に、XOOPS Cube Legacy のパッケージに含まれる「html」ディレクトリ内の全てのディレクトリやファイルを、
 コンピュータのドキュメントルート以下にコピーします。
  コピー後、ブラウザのアドレスに「http://あなたのＵＲＬ」（または「http://127.0.0.1」)と入力すると、
 自動的にインストールウィザードが開始されます。
@@ -85,7 +85,7 @@
 
 <h4>インターネット上のサーバへのインストール</h4>
 <p>
-インターネットに接続されたサーバにインストールするには、まず XOOPS Cube Cube ファイルをローカルな自分のコンピュータで解凍します。
+インターネットに接続されたサーバにインストールするには、まず XOOPS Cube Legacy ファイルをローカルな自分のコンピュータで解凍します。
 もし、サーバへの telnetか SSHアクセスを許可されているなら、サーバで解凍してもかまいません。
 解凍が済んだらXOOPS Cubeの「html」内にあるすべてのディレクトリやファイルを、
 ホストコンピュータのドキュメントルートに（FTPを使って、または、telnetかSSHを使って）コピー・移動します。
@@ -105,7 +105,7 @@
 </p>
 
 <p>
-「XOOPS Cube Cube 2.1 インストールウィザードへようこそ」画面が表示されますので、内容をよく読み「次へ」ボタンをクリックして進みます。
+「XOOPS Cube Legacy 2.1 インストールウィザードへようこそ」画面が表示されますので、内容をよく読み「次へ」ボタンをクリックして進みます。
 （特に<b><u>準備</u></b>をもう一度よく読んで、インストールの準備ができているかどうか確認してください。）
 <br /><br />
 <img src="images/japanese/install002.gif" border="0" />
@@ -140,7 +140,7 @@
 （テスト用のローカル環境以外では、セキュリティー上rootユーザとすべきではありません。
 また、ホスティングサービスを利用の場合は、ホスティング会社からあなたが使用できるユーザ名が知らされているはずです。）
 <br />
-「データベース名」には、XOOPS Cube Cube で使うデータベースの名前を入力します。
+「データベース名」には、XOOPS Cube Legacy で使うデータベースの名前を入力します。
 上記のデータベースユーザは、このデータベースのアクセス・操作権限を持つ必要があります。
 ホスティングサービスを利用の場合は、ホスティング会社から使用できるデータベース名が指定されている場合があります。
 <br /><br />

From minahito ＠ users.sourceforge.jp  Tue Nov  7 16:54:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 16:54:06 +0900
Subject: [xoops-cvslog 5647] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061107075406.2F5952AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.14 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.15
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.14	Tue Nov  7 15:35:24 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Tue Nov  7 16:54:06 2006
@@ -249,7 +249,7 @@
 		require_once XOOPS_ROOT_PATH."/core/XCube_Utils.class.php";	// ToDo
 
 		require_once XOOPS_ROOT_PATH.'/class/xoopssecurity.php';
-		$_GLOBALS['xoopsSecurity'] = new XoopsSecurity();
+		$GLOBALS['xoopsSecurity'] =& new XoopsSecurity();
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:03:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:03:39 +0900
Subject: [xoops-cvslog 5648] CVS update: xoops2jp/etc/actionform
Message-ID: <20061107080339.3675A2AC0B2@users.sourceforge.jp>

Index: xoops2jp/etc/actionform/registuser.xml
diff -u xoops2jp/etc/actionform/registuser.xml:1.1.2.1 xoops2jp/etc/actionform/registuser.xml:removed
--- xoops2jp/etc/actionform/registuser.xml:1.1.2.1	Tue Nov  8 21:11:28 2005
+++ xoops2jp/etc/actionform/registuser.xml	Tue Nov  7 17:03:39 2006
@@ -1,49 +0,0 @@
-鏤??xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="RegisterUserEditForm" type="XCube_ActionForm">
-		<form-property name="uname" type="String" />
-		<form-property name="email" type="String" />
-		<form-property name="user_viewemail" type="Int" />
-		<form-property name="url" type="String" />
-
-		<form-property name="pass" type="String" />
-		<form-property name="vpass" type="String" />
-
-		<form-property name="user_mailok" type="Int" />
-
-	</form-bean>
-	<form-validation>
-		<field property="uname" depends="required,maxlength">
-			<arg0 key="const._US_NICKNAME" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="required" key="const._MD_USER_ERROR_REQUIRED" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="25" />
-		</field>
-		<field property="email" depends="required,maxlength">
-			<arg0 key="const._US_EMAIL" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="required" key="const._MD_USER_ERROR_REQUIRED" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="60" />
-		</field>
-		<field property="user_viewemail" depends="intRange">
-			<arg0 key="user_viewemail" />
-			<msg name="intRange" key="const._MD_USER_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="1" />
-		</field>
-		<field property="url" depends="maxlength">
-			<arg0 key="const._US_URL" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field>
-		<field property="user_mailok" depends="intRange">
-			<arg0 key="user_mailok" />
-			<msg name="intRange" key="const._MD_USER_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="1" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
\ No newline at end of file
Index: xoops2jp/etc/actionform/Readme.txt
diff -u xoops2jp/etc/actionform/Readme.txt:1.1.2.1 xoops2jp/etc/actionform/Readme.txt:removed
--- xoops2jp/etc/actionform/Readme.txt:1.1.2.1	Tue Nov  1 21:04:03 2005
+++ xoops2jp/etc/actionform/Readme.txt	Tue Nov  7 17:03:39 2006
@@ -1,10 +0,0 @@
-
- This directory includes XML files which has validation setting for XCube_ActionForm on Xoops 2.1 development version.
- You can generate ActionForm with using makeActionForm included in cubeHelper.
- Because these features isn't official, cubeHelper isn't included to this repository yet.
- You should know that default ActionForm classes is never programmed manually.
-
-** You must use the ActionFrom of Cube? **
- Never.
- You can choose from all of validation system ideas which exist in software development world.
- We programmed this system for our works of Cube default.
Index: xoops2jp/etc/actionform/pmlite.xml
diff -u xoops2jp/etc/actionform/pmlite.xml:1.1.2.1 xoops2jp/etc/actionform/pmlite.xml:removed
--- xoops2jp/etc/actionform/pmlite.xml:1.1.2.1	Wed Nov  2 20:06:42 2005
+++ xoops2jp/etc/actionform/pmlite.xml	Tue Nov  7 17:03:39 2006
@@ -1,16 +0,0 @@
-鏤??xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="PmliteEditForm" type="XCube_ActionForm">
-		<form-property name="to_userid" type="Int" />
-		<form-property name="subject" type="String" />
-		<form-property name="message" type="Text" />
-	</form-bean>
-	<form-validation>
-		<field property="subject" depends="required">
-			<msg name="required" key="Subject is required" />
-		</field>
-		<field property="message" depends="required">
-			<msg name="required" key="Message is required" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
\ No newline at end of file
Index: xoops2jp/etc/actionform/deletepmsg.xml
diff -u xoops2jp/etc/actionform/deletepmsg.xml:1.1.2.1 xoops2jp/etc/actionform/deletepmsg.xml:removed
--- xoops2jp/etc/actionform/deletepmsg.xml:1.1.2.1	Wed Nov  2 20:06:42 2005
+++ xoops2jp/etc/actionform/deletepmsg.xml	Tue Nov  7 17:03:39 2006
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="DeletePmsgForm" type="XCube_ActionForm">
-		<form-property name="msg_id" type="Int[]" />
-	</form-bean>
-	<form-validation>
-		<field property="msg_id" depends="required">
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
\ No newline at end of file
Index: xoops2jp/etc/actionform/edituser.xml
diff -u xoops2jp/etc/actionform/edituser.xml:1.1.2.2 xoops2jp/etc/actionform/edituser.xml:removed
--- xoops2jp/etc/actionform/edituser.xml:1.1.2.2	Tue Nov  8 18:48:47 2005
+++ xoops2jp/etc/actionform/edituser.xml	Tue Nov  7 17:03:39 2006
@@ -1,90 +0,0 @@
-鏤??xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="EditUserForm" type="XCube_ActionForm">
-		<form-property name="uid" type="Int" />
-		<form-property name="name" type="String" />
-		<form-property name="email" type="String" />
-		<form-property name="user_viewemail" type="Int" />
-		<form-property name="url" type="String" />
-		<form-property name="user_icq" type="String" />
-		<form-property name="user_aim" type="String" />
-
-		<form-property name="user_yim" type="String" />
-		<form-property name="user_msnm" type="String" />
-		<form-property name="user_from" type="String" />
-		<form-property name="user_occ" type="String" />
-		<form-property name="user_interest" type="String" />
-		<form-property name="user_sig" type="Text" />
-		<form-property name="attachsig" type="Int" />
-		<form-property name="user_bio" type="Text" />
-
-		<form-property name="pass" type="String" />
-		<form-property name="vpass" type="String" />
-
-		<form-property name="user_mailok" type="Int" />
-
-	</form-bean>
-	<form-validation>
-		<field property="name" depends="maxlength">
-			<arg0 key="const._US_REALNAME" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="60" />
-		</field>
-		<field property="email" depends="required,maxlength">
-			<arg0 key="const._US_EMAIL" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="required" key="const._MD_USER_ERROR_REQUIRED" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="60" />
-		</field>
-		<field property="user_viewemail" depends="intRange">
-			<arg0 key="user_viewemail" />
-			<msg name="intRange" key="const._MD_USER_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="1" />
-		</field>
-		<field property="url" depends="maxlength">
-			<arg0 key="const._US_URL" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field>
-		<field property="user_icq" depends="maxlength">
-			<arg0 key="const._US_ICQ" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="15" />
-		</field>
-		<field property="user_from" depends="maxlength">
-			<arg0 key="const._US_FROM" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field>
-		<field property="user_aim" depends="maxlength">
-			<arg0 key="const._US_AIM" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="18" />
-		</field>
-		<field property="user_msnm" depends="maxlength">
-			<arg0 key="const._US_MSNM" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_USER_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field>
-		<field property="attachsig" depends="intRange">
-			<arg0 key="attachsig" />
-			<msg name="intRange" key="const._MD_USER_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="1" />
-		</field>
-		<field property="user_mailok" depends="intRange">
-			<arg0 key="user_mailok" />
-			<msg name="intRange" key="const._MD_USER_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="1" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:03:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:03:39 +0900
Subject: [xoops-cvslog 5649] CVS update: xoops2jp/etc/extra_templates
Message-ID: <20061107080339.5E8572AC0C8@users.sourceforge.jp>

Index: xoops2jp/etc/extra_templates/readpmsg.html
diff -u xoops2jp/etc/extra_templates/readpmsg.html:1.1.2.1 xoops2jp/etc/extra_templates/readpmsg.html:removed
--- xoops2jp/etc/extra_templates/readpmsg.html:1.1.2.1	Sun Nov 13 17:12:57 2005
+++ xoops2jp/etc/extra_templates/readpmsg.html	Tue Nov  7 17:03:39 2006
@@ -1,46 +0,0 @@
-<div><h4><{$smarty.const._PM_PRIVATEMESSAGE}></h4></div><br />
-<{if $feature.user.profile}>
-	<a href="<{$xoops_url}>/userinfo.php?uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._PM_PROFILE}></a> &raquo;&raquo; 
-<{/if}>
-<a href="index.php"><{$smarty.const._PM_INBOX}></a> &raquo;&raquo; <{$privMessage->getVar('subject')}>
-<table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%" ID="Table1">
-	<tr>
-		<th colspan="2"><{$smarty.const._PM_FROM}></th>
-	</tr>
-	<tr class='even'>
-		<td width='20%' valign='top'>
-			<a href="<{$xoops_url}>/userinfo.php?uid=<{$sendUser->getVar('uid')}>"><{$sendUser->getVar('uname')}></a><br/>
-			<img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$sendUser->getVar('user_avatar')}>" alt='' /><br />
-			<{if $sendUser->getVar('user_from')}>
-				<{$smarty.const._PM_FROMC}><{$sendUser->getVar('user_from')}><br/><br/>
-			<{/if}>
-			<!--- TODO Online Information --->
-		</td>
-		<td>
-			<img src="<{$xoops_url}>/images/subject/<{$privMessage->getVar('msg_image')}>" alt='' />&nbsp;<{$smarty.const._PM_SENTC}><{$privMessage->getVar("msg_time")|xoops_formattimestamp}>
-			<hr />
-			<b><{$privMessage->getVar('subject')}></b><br /><br />
-			<{$privMessage->getVar('msg_text')}><br /><br />
-		</td>
-	</tr>
-	<tr class='foot'>
-		<td colspan='2' align='left'>
-			<!--- TODO check postr. See original readpmsg --->
-			<a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getVar("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._PM_REPLY}>" /></a>
-			<input type="hidden" name="delete" value="1" ID="Hidden1" />	<!--- << check --->
-			<input type="hidden" name="msg_id" value="<{$privMessage->getVar('msg_id')}>" ID="Hidden2" />
-			<a href="#<{$privMessage->getVar('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getVar("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._PM_DELETE}>" /></a>
-		</td>
-	</tr>
-	<tr>
-		<td colspan='2' align='right'>
-			<{if $previousMessage}>
-				<a href="index.php?action=read&amp;msg_id=<{$previousMessage->getVar('msg_id')}>"><{$smarty.const._PM_PREVIOUS}></a>
-			<{/if}>
-			<{if $nextMessage}>
-				<{if $previousMessage}> | <{/if}>
-				<a href="index.php?action=read&amp;msg_id=<{$nextMessage->getVar('msg_id')}>"><{$smarty.const._PM_NEXT}></a>
-			<{/if}>
-		</td>
-	</tr>
-</table>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:03:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:03:50 +0900
Subject: [xoops-cvslog 5650] CVS update: xoops2jp/extras/theme_x2t/doc
Message-ID: <20061107080350.891EF2AC0B2@users.sourceforge.jp>

Index: xoops2jp/extras/theme_x2t/doc/readme.txt
diff -u xoops2jp/extras/theme_x2t/doc/readme.txt:1.1 xoops2jp/extras/theme_x2t/doc/readme.txt:1.2
--- xoops2jp/extras/theme_x2t/doc/readme.txt:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/extras/theme_x2t/doc/readme.txt	Sat Jun 11 11:32:37 2005
@@ -1,57 +1,57 @@
-X2 Theme for XooPS 2.0.x / Tema X2 para XooPS 2.0.x
-
-| Creators / Creadores : Unfor-w4z004
-
-| E-mail / E-mail : w4z004 ＠ hotmail.com
-
-| This is a original work bassed in the ideas of w4z004
-| and the excelent and professional work of Unfor
-
-| Date / Fecha : Feb. 2003
-
-| Thanks to / Gracias a : Chapi for the graphic work colaboration 
-|                         Aitor for the enhancements into the theme 
-|                         ralf57 for the hidde/unhidde idea
- 
-| INSTALL: upload the x2t.tar.gz file with the theme manager
-
-| NEWS TWO COLUMNS: later of installed the theme with the theme manager into
-| the news need upload or copy and paste the files news_index.html and 
-| news_item.html that are into the EXTRAS dir to the respective places and obtain
-| a news with 2 columns.
- 
-| LAYOUT: into the EXTRAS dir too have a theme.html file that if you replace into
-| the theme skin with copy and paste obtain that the center-center blocks
-| appear in the top (now are changed to the bottom). 
-
-| CHANGELOG:
-| 27/02 - Removed the login in the headerbar.
-|         Fixed the userinfo template
-
-| 01/03 - Removed the skin changed to the new structure
-
-| 30/03 - Finished the notification templates, XHTML cleanup, 
-|         and added scrolling to the top posters and new users blocks.
-
-| 20/09 - Upgraded to xoops 2.0.4.
-
-| 05/07/04 - Upgraded to xoops 2.0.6.
-|          - Created the SmartFAQ module templates.
-|          - Enhanced the CSS.
-|          - Added the hidde/display effect for the notification system.
-|          - Modified the main menu / user menu, and added graphics to this.
-
-| 05/08/04 - Created the Liase module templates.
-|          - Created the RSSfit module templates.
-
-| 05/16/04 - Fixed the styleNN.css (thnx chapi).
-|          - Cleaned to be 100% html transitional 1.0.
-
-| Dedicated to all Xoops users.
-| Dedicado a todos los usuarios de Xoops. 
-
-| ENGLISH SUPPORT :
-|> http://www.xoops.org  
-
-| SOPORTE EN CASTELLANO :
-|> http://www.esxoops.com
+X2 Theme for XooPS 2.0.x / Tema X2 para XooPS 2.0.x
+
+| Creators / Creadores : Unfor-w4z004
+
+| E-mail / E-mail : w4z004 ＠ hotmail.com
+
+| This is a original work bassed in the ideas of w4z004
+| and the excelent and professional work of Unfor
+
+| Date / Fecha : Feb. 2003
+
+| Thanks to / Gracias a : Chapi for the graphic work colaboration 
+|                         Aitor for the enhancements into the theme 
+|                         ralf57 for the hidde/unhidde idea
+ 
+| INSTALL: upload the x2t.tar.gz file with the theme manager
+
+| NEWS TWO COLUMNS: later of installed the theme with the theme manager into
+| the news need upload or copy and paste the files news_index.html and 
+| news_item.html that are into the EXTRAS dir to the respective places and obtain
+| a news with 2 columns.
+ 
+| LAYOUT: into the EXTRAS dir too have a theme.html file that if you replace into
+| the theme skin with copy and paste obtain that the center-center blocks
+| appear in the top (now are changed to the bottom). 
+
+| CHANGELOG:
+| 27/02 - Removed the login in the headerbar.
+|         Fixed the userinfo template
+
+| 01/03 - Removed the skin changed to the new structure
+
+| 30/03 - Finished the notification templates, XHTML cleanup, 
+|         and added scrolling to the top posters and new users blocks.
+
+| 20/09 - Upgraded to xoops 2.0.4.
+
+| 05/07/04 - Upgraded to xoops 2.0.6.
+|          - Created the SmartFAQ module templates.
+|          - Enhanced the CSS.
+|          - Added the hidde/display effect for the notification system.
+|          - Modified the main menu / user menu, and added graphics to this.
+
+| 05/08/04 - Created the Liase module templates.
+|          - Created the RSSfit module templates.
+
+| 05/16/04 - Fixed the styleNN.css (thnx chapi).
+|          - Cleaned to be 100% html transitional 1.0.
+
+| Dedicated to all Xoops users.
+| Dedicado a todos los usuarios de Xoops. 
+
+| ENGLISH SUPPORT :
+|> http://www.xoops.org  
+
+| SOPORTE EN CASTELLANO :
+|> http://www.esxoops.com
Index: xoops2jp/extras/theme_x2t/doc/readme.htm
diff -u xoops2jp/extras/theme_x2t/doc/readme.htm:1.1 xoops2jp/extras/theme_x2t/doc/readme.htm:1.2
--- xoops2jp/extras/theme_x2t/doc/readme.htm:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/extras/theme_x2t/doc/readme.htm	Sat Jun 11 11:32:37 2005
@@ -1,222 +1,222 @@
-<html>
-<head>
-<title>Info</title>
-<script language="JavaScript">
-if (document.layers)
-alert("This script works with Internet Explorer 4x only.\n\nSorry, Netscape-folks!")
-var now
-
-var second
-
-var timer
-var i_loop=0
-
-function initiate() {
-    firstObj.Scale(10,10,0)
-    secondObj.Scale(.01,.01,0)
-    enlarge()
-}
-
-function enlarge() {
-    if (i_loop<=100) {
-        firstObj.Rotate(0,0,-12)
-        firstObj.Scale(0.9,0.9,0)
-	    secondObj.Rotate(0,0,12)
-        secondObj.Scale(1.11,1.11,0)
-
-        timer=setTimeout("enlarge()",20)
-        i_loop++
-    }
-    else {
-        clearTimeout(timer)
-        i_loop=0
-        reduce()
-    }
-}
-
-function reduce() {
-    if (i_loop<=100) {
-        firstObj.Rotate(0,0,12)
-        firstObj.Scale(1.11,1.11,0)
-	    secondObj.Rotate(0,0,-12)
-        secondObj.Scale(0.9,0.9,0)
-        timer=setTimeout("reduce()",20)
-        i_loop++
-    }
-    else {
-        clearTimeout(timer)
-        i_loop=0
-        enlarge()
-    }
-}
-
-// - End of JavaScript - -->
-</script>
-<style type="text/css">
-<!--
-a {  text-decoration: none}
--->
-</style>
-</head>
-<body bgcolor=000000 onLoad="if(document.all){initiate()}" link="#FFCC00" vlink="#FFCC00" alink="#FFFFCC">
-<DIV style="position:absolute;top:55px;left:563px; width: 56px; height: 200px">
-  <OBJECT ID="firstObj" STYLE="width:200px;height:200px" CLASSID="CLSID:369303C2-D7AC-11D0-89D5-00A0C90833E6">
-<PARAM NAME="Line0001" VALUE="SetLineColor(255,0,0)">
-<PARAM NAME="Line0002" VALUE="SetFillColor(255,0,0)">
-<PARAM NAME="Line0003" VALUE="SetLineStyle(0)">
-<PARAM NAME="Line0004" VALUE="Polygon(461,11,11,12,8,14,6,18,4,21,2,25,1,28,0,30,-1,31,-3,30,-4,30,-6,29,-8,28,-9,27,-11,26,-12,24,-13,21,-14,19,-14,18,-13,16,-13
-,14,-12,13,-11,11,-11,9,-12,7,-14,2,-19,-1,-21,-3,-22,-5,-21,-5,-19,-6,-17,-6,-13,-6,-9,-6,-6,-6,-4,-7,-3,-8,-2,-9,0,-10,2,-11,4
-,-11,7,-10,13,-10,18,-10,22,-10,26,-10,30,-9,33,-7,37,-4,40,-2,41,0,42,1,42,3,42,4,40,6,39,8,36,10,33,12,32,16,32,21,32
-,26,33,30,34,35,35,38,35,40,34,41,31,42,29,43,27,44,26,44,25,45,24,47,23,49,21,54,15,57,6,59,-4,59,-13,57,-22,53,-29,49,-33
-,44,-33,42,-33,39,-34,35,-35,31,-37,27,-39,23,-40,20,-42,18,-42,14,-44,12,-45,10,-47,8,-48,6,-50,4,-51,3,-53,2,-54,-1,-55,-4,-55,-7,-53
-,-11,-50,-14,-46,-17,-41,-19,-37,-21,-32,-22,-28,-25,-23,-28,-19,-32,-15,-36,-11,-39,-8,-41,-4,-42,-1,-42,6,-41,9,-39,15,-36,29,-34,40,-34,51,-32,59
-,-31,66,-29,71,-25,73,-19,73,-10,70,-5,68,1,67,9,67,18,67,27,66,37,65,47,64,57,62,65,58,73,53,79,46,84,37,87,25,87,11,85,-6
-,79,-26,78,-31,79,-34,80,-36,82,-37,85,-38,87,-39,88,-41,88,-44,86,-47,83,-50,80,-53,75,-56,71,-60,68,-64,65,-70,64,-77,63,-80,61,-81,58,-82
-,55,-82,51,-81,48,-81,44,-81,41,-81,37,-83,33,-84,29,-86,26,-87,23,-89,20,-90,17,-91,15,-92,12,-93,10,-93,7,-94,4,-94,1,-94,-2,-94,-5,-94
-,-9,-93,-12,-92,-15,-90,-18,-88,-21,-84,-24,-81,-27,-77,-31,-73,-34,-69,-37,-65,-40,-61,-44,-57,-48,-54,-51,-52,-55,-50,-60,-49,-64,-49,-67,-48,-69,-45,-69,-42
-,-69,-37,-68,-31,-68,-26,-68,-20,-70,-15,-75,-3,-78,7,-79,17,-79,25,-78,31,-77,36,-78,40,-80,42,-81,43,-82,43,-82,44,-82,46,-81,46,-79,47,-76,47
-,-75,48,-74,51,-74,54,-75,56,-77,58,-79,60,-82,60,-84,58,-86,56,-91,47,-95,41,-97,36,-98,30,-98,24,-94,17,-88,8,-78,-4,-75,-10,-75,-18,-76,-26
-,-77,-34,-79,-42,-78,-48,-75,-53,-69,-54,-65,-55,-61,-56,-57,-58,-54,-61,-51,-64,-48,-67,-46,-71,-43,-75,-41,-79,-38,-83,-36,-87,-34,-90,-31,-93,-28,-96,-26,-98
-,-23,-99,-19,-99,-14,-100,-9,-100,-5,-100,0,-100,5,-100,10,-100,16,-100,21,-99,26,-98,31,-97,37,-96,42,-95,47,-94,51,-92,56,-91,59,-90,62,-89,66,-88
-,69,-86,72,-85,74,-83,76,-80,77,-77,77,-70,79,-65,81,-61,83,-58,86,-55,88,-53,90,-50,91,-47,91,-41,89,-34,89,-27,90,-18,95,-2,97,12,98,25
-,97,36,94,45,90,53,85,60,79,65,72,70,64,73,56,75,47,77,38,77,29,77,20,76,11,75,6,74,1,73,-4,74,-8,74,-12,75,-16,75,-18,76
-,-21,77,-27,79,-32,78,-38,76,-42,72,-44,66,-46,59,-45,50,-43,39,-42,36,-43,33,-44,29,-45,25,-47,20,-48,15,-49,10,-49,4,-48,1,-46,-5,-43,-12
-,-40,-19,-36,-27,-33,-34,-30,-41,-29,-47,-28,-49,-27,-51,-25,-53,-23,-54,-21,-55,-19,-57,-16,-58,-14,-58,-11,-59,-8,-59,-6,-59,-3,-59,-1,-59,1,-59,3,-58
-,4,-57,5,-56,7,-54,8,-53,10,-51,12,-50,14,-49,17,-47,20,-46,23,-45,26,-45,30,-45,34,-46,38,-46,42,-46,45,-47,47,-47,52,-46,57,-40,62,-30
-,65,-18,67,-5,67,8,64,19,59,26,57,28,55,29,53,31,50,32,48,33,46,35,44,37,43,40,41,42,38,42,35,43,31,43,26,43,22,43,19,44
-,17,46,14,48,11,50,9,50,6,50,2,49,-1,48,-3,46,-5,44,-9,41,-12,37,-14,33,-15,28,-17,23,-18,18,-19,12,-20,6,-20,3,-19,0,-18,-2
-,-16,-5,-15,-7,-14,-9,-13,-12,-14,-15,-13,-19,-12,-23,-10,-27,-7,-30,-4,-32,0,-32,4,-30,10,-26,12,-24,15,-22,18,-21,21,-21,25,-20,28,-20,31,-19
-,33,-19,37,-16,37,-10,36,-4,36,0,35,2,34,3,32,4,30,5,28,6,25,7,23,8,22,11,20,13,18,15,17,16,15,16,13,15,12,14,11,12
-,11,11)">
-<PARAM NAME="Line0005" VALUE="Polygon(17,-69,75,-71,75,-73,75,-74,74,-76,72,-77,69,-76,66,-75,64,-72,64,-69,64,-67,64,-66,63,-65,64,-64,67,-65,71,-66,74,-69,75)">
-<PARAM NAME="Line0006" VALUE="Polygon(17,-64,88,-64,88,-65,87,-64,86,-64,85,-65,84,-65,82,-65,80,-64,80,-62,80,-60,81,-58,82,-57,84,-58,86,-60,87,-62,88,-64,88)">
-<PARAM NAME="Line0007" VALUE="Polygon(15,-50,100,-51,99,-52,99,-52,98,-52,97,-52,96,-52,96,-51,95,-50,95,-49,95,-49,96,-48,97,-48,97,-48,99,-50,100)">
-</OBJECT>
-</DIV>
-
-<DIV style="position:absolute;top:55px;left:563px; width: 179px; height: 200px">
-  <OBJECT ID="secondObj" STYLE="width:200px;height:200px" CLASSID="CLSID:369303C2-D7AC-11D0-89D5-00A0C90833E6" width="356" height="212">
-    <PARAM NAME="Line0001" VALUE="SetLineColor(255,255,0)">
-    <PARAM NAME="Line0002" VALUE="SetFillColor(255,255,0)">
-    <PARAM NAME="Line0003" VALUE="SetLineStyle(0)">
-    <PARAM NAME="Line0004" VALUE="Polygon(461,11,11,12,8,14,6,18,4,21,2,25,1,28,0,30,-1,31,-3,30,-4,30,-6,29,-8,28,-9,27,-11,26,-12,24,-13,21,-14,19,-14,18,-13,16,-13
-,14,-12,13,-11,11,-11,9,-12,7,-14,2,-19,-1,-21,-3,-22,-5,-21,-5,-19,-6,-17,-6,-13,-6,-9,-6,-6,-6,-4,-7,-3,-8,-2,-9,0,-10,2,-11,4
-,-11,7,-10,13,-10,18,-10,22,-10,26,-10,30,-9,33,-7,37,-4,40,-2,41,0,42,1,42,3,42,4,40,6,39,8,36,10,33,12,32,16,32,21,32
-,26,33,30,34,35,35,38,35,40,34,41,31,42,29,43,27,44,26,44,25,45,24,47,23,49,21,54,15,57,6,59,-4,59,-13,57,-22,53,-29,49,-33
-,44,-33,42,-33,39,-34,35,-35,31,-37,27,-39,23,-40,20,-42,18,-42,14,-44,12,-45,10,-47,8,-48,6,-50,4,-51,3,-53,2,-54,-1,-55,-4,-55,-7,-53
-,-11,-50,-14,-46,-17,-41,-19,-37,-21,-32,-22,-28,-25,-23,-28,-19,-32,-15,-36,-11,-39,-8,-41,-4,-42,-1,-42,6,-41,9,-39,15,-36,29,-34,40,-34,51,-32,59
-,-31,66,-29,71,-25,73,-19,73,-10,70,-5,68,1,67,9,67,18,67,27,66,37,65,47,64,57,62,65,58,73,53,79,46,84,37,87,25,87,11,85,-6
-,79,-26,78,-31,79,-34,80,-36,82,-37,85,-38,87,-39,88,-41,88,-44,86,-47,83,-50,80,-53,75,-56,71,-60,68,-64,65,-70,64,-77,63,-80,61,-81,58,-82
-,55,-82,51,-81,48,-81,44,-81,41,-81,37,-83,33,-84,29,-86,26,-87,23,-89,20,-90,17,-91,15,-92,12,-93,10,-93,7,-94,4,-94,1,-94,-2,-94,-5,-94
-,-9,-93,-12,-92,-15,-90,-18,-88,-21,-84,-24,-81,-27,-77,-31,-73,-34,-69,-37,-65,-40,-61,-44,-57,-48,-54,-51,-52,-55,-50,-60,-49,-64,-49,-67,-48,-69,-45,-69,-42
-,-69,-37,-68,-31,-68,-26,-68,-20,-70,-15,-75,-3,-78,7,-79,17,-79,25,-78,31,-77,36,-78,40,-80,42,-81,43,-82,43,-82,44,-82,46,-81,46,-79,47,-76,47
-,-75,48,-74,51,-74,54,-75,56,-77,58,-79,60,-82,60,-84,58,-86,56,-91,47,-95,41,-97,36,-98,30,-98,24,-94,17,-88,8,-78,-4,-75,-10,-75,-18,-76,-26
-,-77,-34,-79,-42,-78,-48,-75,-53,-69,-54,-65,-55,-61,-56,-57,-58,-54,-61,-51,-64,-48,-67,-46,-71,-43,-75,-41,-79,-38,-83,-36,-87,-34,-90,-31,-93,-28,-96,-26,-98
-,-23,-99,-19,-99,-14,-100,-9,-100,-5,-100,0,-100,5,-100,10,-100,16,-100,21,-99,26,-98,31,-97,37,-96,42,-95,47,-94,51,-92,56,-91,59,-90,62,-89,66,-88
-,69,-86,72,-85,74,-83,76,-80,77,-77,77,-70,79,-65,81,-61,83,-58,86,-55,88,-53,90,-50,91,-47,91,-41,89,-34,89,-27,90,-18,95,-2,97,12,98,25
-,97,36,94,45,90,53,85,60,79,65,72,70,64,73,56,75,47,77,38,77,29,77,20,76,11,75,6,74,1,73,-4,74,-8,74,-12,75,-16,75,-18,76
-,-21,77,-27,79,-32,78,-38,76,-42,72,-44,66,-46,59,-45,50,-43,39,-42,36,-43,33,-44,29,-45,25,-47,20,-48,15,-49,10,-49,4,-48,1,-46,-5,-43,-12
-,-40,-19,-36,-27,-33,-34,-30,-41,-29,-47,-28,-49,-27,-51,-25,-53,-23,-54,-21,-55,-19,-57,-16,-58,-14,-58,-11,-59,-8,-59,-6,-59,-3,-59,-1,-59,1,-59,3,-58
-,4,-57,5,-56,7,-54,8,-53,10,-51,12,-50,14,-49,17,-47,20,-46,23,-45,26,-45,30,-45,34,-46,38,-46,42,-46,45,-47,47,-47,52,-46,57,-40,62,-30
-,65,-18,67,-5,67,8,64,19,59,26,57,28,55,29,53,31,50,32,48,33,46,35,44,37,43,40,41,42,38,42,35,43,31,43,26,43,22,43,19,44
-,17,46,14,48,11,50,9,50,6,50,2,49,-1,48,-3,46,-5,44,-9,41,-12,37,-14,33,-15,28,-17,23,-18,18,-19,12,-20,6,-20,3,-19,0,-18,-2
-,-16,-5,-15,-7,-14,-9,-13,-12,-14,-15,-13,-19,-12,-23,-10,-27,-7,-30,-4,-32,0,-32,4,-30,10,-26,12,-24,15,-22,18,-21,21,-21,25,-20,28,-20,31,-19
-,33,-19,37,-16,37,-10,36,-4,36,0,35,2,34,3,32,4,30,5,28,6,25,7,23,8,22,11,20,13,18,15,17,16,15,16,13,15,12,14,11,12
-,11,11)">
-    <PARAM NAME="Line0005" VALUE="Polygon(17,-69,75,-71,75,-73,75,-74,74,-76,72,-77,69,-76,66,-75,64,-72,64,-69,64,-67,64,-66,63,-65,64,-64,67,-65,71,-66,74,-69,75)">
-    <PARAM NAME="Line0006" VALUE="Polygon(17,-64,88,-64,88,-65,87,-64,86,-64,85,-65,84,-65,82,-65,80,-64,80,-62,80,-60,81,-58,82,-57,84,-58,86,-60,87,-62,88,-64,88)">
-    <PARAM NAME="Line0007" VALUE="Polygon(15,-50,100,-51,99,-52,99,-52,98,-52,97,-52,96,-52,96,-51,95,-50,95,-49,95,-49,96,-48,97,-48,97,-48,99,-50,100)">
-  </OBJECT> </DIV>
-
-<DIV style="position:absolute;top:55px;left:553px;font-family:Verdana;font-size:8pt;color:444444;text-align:center;width:220px;letter-spacing:0.4em;line-height:170%;">
-  <p><span style="color:771111"><b><font color="#FFFFFF">XooPS</font></b></span><br />
-    <font color="#FFFFFF">eXtended object<br />
-    oriented<br />
-    Portal System</font></p>
-  <p><font color="#FFFFFF">...que m? queres...</font></p>
-  </DIV>
-
-<table width="755" border="0" cellspacing="1" cellpadding="3" height="201" bgcolor="#CCCCCC">
-  <tr bgcolor="#CCCCCC">
-    <td colspan="2">
-      <div align="center"><font color="#333333" face="Tahoma" size="2"><b>X2 Theme for XooPS 2.0.x / Tema X2 para XooPS 2.0.x</b></font></div>
-    </td>
-  </tr>
-  <tr>
-    <td bgcolor="#333333" height="78" width="538"><font color="#CCCCCC" face="Tahoma" size="2">
-	<b>| Creators / Creadores </b>: w4z004 - Unfor<br />
-
-	<b>| E-mail / E-mail</b> : <a href="mailto:w4z004 ＠ hotmail.com">w4z004 ＠ hotmail.com</a><br />
-
-	<b>| This is a original work bassed in the ideas of </b>w4z004<br />
-	<b>| and the excelent and professional work of </b> Unfor<br />
-
-	<b>| Date / Fecha </b>: Feb. 2003<br />
-
-	<b>| Thanks to / Gracias a</b> : Chapi <b>for the graphic work colaboration </b><br />
-	<b>| </b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Aitor <b>for the enhancements into the theme </b><br />
-	<b>| </b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ralf57 <b> for the hidde/unhidde idea </b><br />
-	<b>| </b><br />
-
-	<b>| INSTALL:  upload the x2t.tar.gz file with the theme manager</b><br />
-	<b>| </b><br />
-
-	<b>| NEWS TWO COLUMNS: later of installed the theme with the theme manager into</b><br />
-	<b>| the news need upload or copy and paste the files </b> news_index.html <b>and </b><br />
-	<b>| </b> news_item.html <b> that are into the EXTRAS dir to the respective places and obtain</b><br />
-	<b>| a news with 2 columns.</b><br />
-	<b>| </b><br />
-
-	<b>| LAYOUT: into the EXTRAS dir too have a</b> theme.html<b> file that if you replace into</b><br />
-	<b>| the theme skin with copy and paste obtain that the center-center blocks</b><br />
-	<b>| appear in the top (now are changed to the bottom).  </b><br />
-	<b>| </b><br />
-
-	<b>| CHANGELOG:</b><br />
-	<b>| 27/02 - Removed the login in the headerbar.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Fixed the userinfo template</b><br />
-	<b>| </b><br />
-	<b>| 01/03 - Removed the skin changed to the new structure.</b><br />
-	<b>| </b><br />
-	<b>| 30/03 - Finished the notification templates, XHTML cleanup, </b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and added scrolling to the top posters and new users blocks.</b><br />
-	<b>| </b><br />
-	<b>| 20/09 - Upgraded to xoops 2.0.4. </b><br />
-	<b>| </b><br />
-	<b>| 05/07/04 - Upgraded to xoops 2.0.6.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Created the SmartFAQ module templates.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Enhanced the CSS.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Added the hidde/display effect for the notification system.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Modified the main menu / user menu, and added graphics to this.</b><br />
-	<b>| </b><br />
-	<b>| 05/08/04 - Created the Liase module templates.</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Created the RSSfit module templates.</b><br />
-	<b>| </b><br />
-	<b>| 05/16/04 - Fixed the styleNN.css (thnx chapi).</b><br />
-	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Cleaned to be 100% html transitional 1.0.</b><br />
-
-
-	<b>| </b><br />
-</font></td>
-
-    <td bgcolor="#333333" height="78" rowspan="4" width="202">&nbsp;</td>
-  </tr>
-  <tr>
-    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|</b>
-      Dedicated to all Xoops users.<br />
-      <b>|</b> Dedicado a todos los usuarios de Xoops.</font></td>
-  </tr>
-  <tr>
-    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|
-      ENGLISH SUPPORT :</b><br />
-      <b>|</b>&gt; <a href="http://www.xoops.org">http://www.xoops.org</a>
-      </font></td>
-  </tr>
-  <tr>
-    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|
-      SOPORTE EN CASTELLANO :</b><br />
-      <b>|</b>&gt; <a href="http://www.esxoops.com">http://www.esxoops.com</a><br />
-  </tr>
-</table>
-</body>
-</html>
+<html>
+<head>
+<title>Info</title>
+<script language="JavaScript">
+if (document.layers)
+alert("This script works with Internet Explorer 4x only.\n\nSorry, Netscape-folks!")
+var now
+
+var second
+
+var timer
+var i_loop=0
+
+function initiate() {
+    firstObj.Scale(10,10,0)
+    secondObj.Scale(.01,.01,0)
+    enlarge()
+}
+
+function enlarge() {
+    if (i_loop<=100) {
+        firstObj.Rotate(0,0,-12)
+        firstObj.Scale(0.9,0.9,0)
+	    secondObj.Rotate(0,0,12)
+        secondObj.Scale(1.11,1.11,0)
+
+        timer=setTimeout("enlarge()",20)
+        i_loop++
+    }
+    else {
+        clearTimeout(timer)
+        i_loop=0
+        reduce()
+    }
+}
+
+function reduce() {
+    if (i_loop<=100) {
+        firstObj.Rotate(0,0,12)
+        firstObj.Scale(1.11,1.11,0)
+	    secondObj.Rotate(0,0,-12)
+        secondObj.Scale(0.9,0.9,0)
+        timer=setTimeout("reduce()",20)
+        i_loop++
+    }
+    else {
+        clearTimeout(timer)
+        i_loop=0
+        enlarge()
+    }
+}
+
+// - End of JavaScript - -->
+</script>
+<style type="text/css">
+<!--
+a {  text-decoration: none}
+-->
+</style>
+</head>
+<body bgcolor=000000 onLoad="if(document.all){initiate()}" link="#FFCC00" vlink="#FFCC00" alink="#FFFFCC">
+<DIV style="position:absolute;top:55px;left:563px; width: 56px; height: 200px">
+  <OBJECT ID="firstObj" STYLE="width:200px;height:200px" CLASSID="CLSID:369303C2-D7AC-11D0-89D5-00A0C90833E6">
+<PARAM NAME="Line0001" VALUE="SetLineColor(255,0,0)">
+<PARAM NAME="Line0002" VALUE="SetFillColor(255,0,0)">
+<PARAM NAME="Line0003" VALUE="SetLineStyle(0)">
+<PARAM NAME="Line0004" VALUE="Polygon(461,11,11,12,8,14,6,18,4,21,2,25,1,28,0,30,-1,31,-3,30,-4,30,-6,29,-8,28,-9,27,-11,26,-12,24,-13,21,-14,19,-14,18,-13,16,-13
+,14,-12,13,-11,11,-11,9,-12,7,-14,2,-19,-1,-21,-3,-22,-5,-21,-5,-19,-6,-17,-6,-13,-6,-9,-6,-6,-6,-4,-7,-3,-8,-2,-9,0,-10,2,-11,4
+,-11,7,-10,13,-10,18,-10,22,-10,26,-10,30,-9,33,-7,37,-4,40,-2,41,0,42,1,42,3,42,4,40,6,39,8,36,10,33,12,32,16,32,21,32
+,26,33,30,34,35,35,38,35,40,34,41,31,42,29,43,27,44,26,44,25,45,24,47,23,49,21,54,15,57,6,59,-4,59,-13,57,-22,53,-29,49,-33
+,44,-33,42,-33,39,-34,35,-35,31,-37,27,-39,23,-40,20,-42,18,-42,14,-44,12,-45,10,-47,8,-48,6,-50,4,-51,3,-53,2,-54,-1,-55,-4,-55,-7,-53
+,-11,-50,-14,-46,-17,-41,-19,-37,-21,-32,-22,-28,-25,-23,-28,-19,-32,-15,-36,-11,-39,-8,-41,-4,-42,-1,-42,6,-41,9,-39,15,-36,29,-34,40,-34,51,-32,59
+,-31,66,-29,71,-25,73,-19,73,-10,70,-5,68,1,67,9,67,18,67,27,66,37,65,47,64,57,62,65,58,73,53,79,46,84,37,87,25,87,11,85,-6
+,79,-26,78,-31,79,-34,80,-36,82,-37,85,-38,87,-39,88,-41,88,-44,86,-47,83,-50,80,-53,75,-56,71,-60,68,-64,65,-70,64,-77,63,-80,61,-81,58,-82
+,55,-82,51,-81,48,-81,44,-81,41,-81,37,-83,33,-84,29,-86,26,-87,23,-89,20,-90,17,-91,15,-92,12,-93,10,-93,7,-94,4,-94,1,-94,-2,-94,-5,-94
+,-9,-93,-12,-92,-15,-90,-18,-88,-21,-84,-24,-81,-27,-77,-31,-73,-34,-69,-37,-65,-40,-61,-44,-57,-48,-54,-51,-52,-55,-50,-60,-49,-64,-49,-67,-48,-69,-45,-69,-42
+,-69,-37,-68,-31,-68,-26,-68,-20,-70,-15,-75,-3,-78,7,-79,17,-79,25,-78,31,-77,36,-78,40,-80,42,-81,43,-82,43,-82,44,-82,46,-81,46,-79,47,-76,47
+,-75,48,-74,51,-74,54,-75,56,-77,58,-79,60,-82,60,-84,58,-86,56,-91,47,-95,41,-97,36,-98,30,-98,24,-94,17,-88,8,-78,-4,-75,-10,-75,-18,-76,-26
+,-77,-34,-79,-42,-78,-48,-75,-53,-69,-54,-65,-55,-61,-56,-57,-58,-54,-61,-51,-64,-48,-67,-46,-71,-43,-75,-41,-79,-38,-83,-36,-87,-34,-90,-31,-93,-28,-96,-26,-98
+,-23,-99,-19,-99,-14,-100,-9,-100,-5,-100,0,-100,5,-100,10,-100,16,-100,21,-99,26,-98,31,-97,37,-96,42,-95,47,-94,51,-92,56,-91,59,-90,62,-89,66,-88
+,69,-86,72,-85,74,-83,76,-80,77,-77,77,-70,79,-65,81,-61,83,-58,86,-55,88,-53,90,-50,91,-47,91,-41,89,-34,89,-27,90,-18,95,-2,97,12,98,25
+,97,36,94,45,90,53,85,60,79,65,72,70,64,73,56,75,47,77,38,77,29,77,20,76,11,75,6,74,1,73,-4,74,-8,74,-12,75,-16,75,-18,76
+,-21,77,-27,79,-32,78,-38,76,-42,72,-44,66,-46,59,-45,50,-43,39,-42,36,-43,33,-44,29,-45,25,-47,20,-48,15,-49,10,-49,4,-48,1,-46,-5,-43,-12
+,-40,-19,-36,-27,-33,-34,-30,-41,-29,-47,-28,-49,-27,-51,-25,-53,-23,-54,-21,-55,-19,-57,-16,-58,-14,-58,-11,-59,-8,-59,-6,-59,-3,-59,-1,-59,1,-59,3,-58
+,4,-57,5,-56,7,-54,8,-53,10,-51,12,-50,14,-49,17,-47,20,-46,23,-45,26,-45,30,-45,34,-46,38,-46,42,-46,45,-47,47,-47,52,-46,57,-40,62,-30
+,65,-18,67,-5,67,8,64,19,59,26,57,28,55,29,53,31,50,32,48,33,46,35,44,37,43,40,41,42,38,42,35,43,31,43,26,43,22,43,19,44
+,17,46,14,48,11,50,9,50,6,50,2,49,-1,48,-3,46,-5,44,-9,41,-12,37,-14,33,-15,28,-17,23,-18,18,-19,12,-20,6,-20,3,-19,0,-18,-2
+,-16,-5,-15,-7,-14,-9,-13,-12,-14,-15,-13,-19,-12,-23,-10,-27,-7,-30,-4,-32,0,-32,4,-30,10,-26,12,-24,15,-22,18,-21,21,-21,25,-20,28,-20,31,-19
+,33,-19,37,-16,37,-10,36,-4,36,0,35,2,34,3,32,4,30,5,28,6,25,7,23,8,22,11,20,13,18,15,17,16,15,16,13,15,12,14,11,12
+,11,11)">
+<PARAM NAME="Line0005" VALUE="Polygon(17,-69,75,-71,75,-73,75,-74,74,-76,72,-77,69,-76,66,-75,64,-72,64,-69,64,-67,64,-66,63,-65,64,-64,67,-65,71,-66,74,-69,75)">
+<PARAM NAME="Line0006" VALUE="Polygon(17,-64,88,-64,88,-65,87,-64,86,-64,85,-65,84,-65,82,-65,80,-64,80,-62,80,-60,81,-58,82,-57,84,-58,86,-60,87,-62,88,-64,88)">
+<PARAM NAME="Line0007" VALUE="Polygon(15,-50,100,-51,99,-52,99,-52,98,-52,97,-52,96,-52,96,-51,95,-50,95,-49,95,-49,96,-48,97,-48,97,-48,99,-50,100)">
+</OBJECT>
+</DIV>
+
+<DIV style="position:absolute;top:55px;left:563px; width: 179px; height: 200px">
+  <OBJECT ID="secondObj" STYLE="width:200px;height:200px" CLASSID="CLSID:369303C2-D7AC-11D0-89D5-00A0C90833E6" width="356" height="212">
+    <PARAM NAME="Line0001" VALUE="SetLineColor(255,255,0)">
+    <PARAM NAME="Line0002" VALUE="SetFillColor(255,255,0)">
+    <PARAM NAME="Line0003" VALUE="SetLineStyle(0)">
+    <PARAM NAME="Line0004" VALUE="Polygon(461,11,11,12,8,14,6,18,4,21,2,25,1,28,0,30,-1,31,-3,30,-4,30,-6,29,-8,28,-9,27,-11,26,-12,24,-13,21,-14,19,-14,18,-13,16,-13
+,14,-12,13,-11,11,-11,9,-12,7,-14,2,-19,-1,-21,-3,-22,-5,-21,-5,-19,-6,-17,-6,-13,-6,-9,-6,-6,-6,-4,-7,-3,-8,-2,-9,0,-10,2,-11,4
+,-11,7,-10,13,-10,18,-10,22,-10,26,-10,30,-9,33,-7,37,-4,40,-2,41,0,42,1,42,3,42,4,40,6,39,8,36,10,33,12,32,16,32,21,32
+,26,33,30,34,35,35,38,35,40,34,41,31,42,29,43,27,44,26,44,25,45,24,47,23,49,21,54,15,57,6,59,-4,59,-13,57,-22,53,-29,49,-33
+,44,-33,42,-33,39,-34,35,-35,31,-37,27,-39,23,-40,20,-42,18,-42,14,-44,12,-45,10,-47,8,-48,6,-50,4,-51,3,-53,2,-54,-1,-55,-4,-55,-7,-53
+,-11,-50,-14,-46,-17,-41,-19,-37,-21,-32,-22,-28,-25,-23,-28,-19,-32,-15,-36,-11,-39,-8,-41,-4,-42,-1,-42,6,-41,9,-39,15,-36,29,-34,40,-34,51,-32,59
+,-31,66,-29,71,-25,73,-19,73,-10,70,-5,68,1,67,9,67,18,67,27,66,37,65,47,64,57,62,65,58,73,53,79,46,84,37,87,25,87,11,85,-6
+,79,-26,78,-31,79,-34,80,-36,82,-37,85,-38,87,-39,88,-41,88,-44,86,-47,83,-50,80,-53,75,-56,71,-60,68,-64,65,-70,64,-77,63,-80,61,-81,58,-82
+,55,-82,51,-81,48,-81,44,-81,41,-81,37,-83,33,-84,29,-86,26,-87,23,-89,20,-90,17,-91,15,-92,12,-93,10,-93,7,-94,4,-94,1,-94,-2,-94,-5,-94
+,-9,-93,-12,-92,-15,-90,-18,-88,-21,-84,-24,-81,-27,-77,-31,-73,-34,-69,-37,-65,-40,-61,-44,-57,-48,-54,-51,-52,-55,-50,-60,-49,-64,-49,-67,-48,-69,-45,-69,-42
+,-69,-37,-68,-31,-68,-26,-68,-20,-70,-15,-75,-3,-78,7,-79,17,-79,25,-78,31,-77,36,-78,40,-80,42,-81,43,-82,43,-82,44,-82,46,-81,46,-79,47,-76,47
+,-75,48,-74,51,-74,54,-75,56,-77,58,-79,60,-82,60,-84,58,-86,56,-91,47,-95,41,-97,36,-98,30,-98,24,-94,17,-88,8,-78,-4,-75,-10,-75,-18,-76,-26
+,-77,-34,-79,-42,-78,-48,-75,-53,-69,-54,-65,-55,-61,-56,-57,-58,-54,-61,-51,-64,-48,-67,-46,-71,-43,-75,-41,-79,-38,-83,-36,-87,-34,-90,-31,-93,-28,-96,-26,-98
+,-23,-99,-19,-99,-14,-100,-9,-100,-5,-100,0,-100,5,-100,10,-100,16,-100,21,-99,26,-98,31,-97,37,-96,42,-95,47,-94,51,-92,56,-91,59,-90,62,-89,66,-88
+,69,-86,72,-85,74,-83,76,-80,77,-77,77,-70,79,-65,81,-61,83,-58,86,-55,88,-53,90,-50,91,-47,91,-41,89,-34,89,-27,90,-18,95,-2,97,12,98,25
+,97,36,94,45,90,53,85,60,79,65,72,70,64,73,56,75,47,77,38,77,29,77,20,76,11,75,6,74,1,73,-4,74,-8,74,-12,75,-16,75,-18,76
+,-21,77,-27,79,-32,78,-38,76,-42,72,-44,66,-46,59,-45,50,-43,39,-42,36,-43,33,-44,29,-45,25,-47,20,-48,15,-49,10,-49,4,-48,1,-46,-5,-43,-12
+,-40,-19,-36,-27,-33,-34,-30,-41,-29,-47,-28,-49,-27,-51,-25,-53,-23,-54,-21,-55,-19,-57,-16,-58,-14,-58,-11,-59,-8,-59,-6,-59,-3,-59,-1,-59,1,-59,3,-58
+,4,-57,5,-56,7,-54,8,-53,10,-51,12,-50,14,-49,17,-47,20,-46,23,-45,26,-45,30,-45,34,-46,38,-46,42,-46,45,-47,47,-47,52,-46,57,-40,62,-30
+,65,-18,67,-5,67,8,64,19,59,26,57,28,55,29,53,31,50,32,48,33,46,35,44,37,43,40,41,42,38,42,35,43,31,43,26,43,22,43,19,44
+,17,46,14,48,11,50,9,50,6,50,2,49,-1,48,-3,46,-5,44,-9,41,-12,37,-14,33,-15,28,-17,23,-18,18,-19,12,-20,6,-20,3,-19,0,-18,-2
+,-16,-5,-15,-7,-14,-9,-13,-12,-14,-15,-13,-19,-12,-23,-10,-27,-7,-30,-4,-32,0,-32,4,-30,10,-26,12,-24,15,-22,18,-21,21,-21,25,-20,28,-20,31,-19
+,33,-19,37,-16,37,-10,36,-4,36,0,35,2,34,3,32,4,30,5,28,6,25,7,23,8,22,11,20,13,18,15,17,16,15,16,13,15,12,14,11,12
+,11,11)">
+    <PARAM NAME="Line0005" VALUE="Polygon(17,-69,75,-71,75,-73,75,-74,74,-76,72,-77,69,-76,66,-75,64,-72,64,-69,64,-67,64,-66,63,-65,64,-64,67,-65,71,-66,74,-69,75)">
+    <PARAM NAME="Line0006" VALUE="Polygon(17,-64,88,-64,88,-65,87,-64,86,-64,85,-65,84,-65,82,-65,80,-64,80,-62,80,-60,81,-58,82,-57,84,-58,86,-60,87,-62,88,-64,88)">
+    <PARAM NAME="Line0007" VALUE="Polygon(15,-50,100,-51,99,-52,99,-52,98,-52,97,-52,96,-52,96,-51,95,-50,95,-49,95,-49,96,-48,97,-48,97,-48,99,-50,100)">
+  </OBJECT> </DIV>
+
+<DIV style="position:absolute;top:55px;left:553px;font-family:Verdana;font-size:8pt;color:444444;text-align:center;width:220px;letter-spacing:0.4em;line-height:170%;">
+  <p><span style="color:771111"><b><font color="#FFFFFF">XooPS</font></b></span><br />
+    <font color="#FFFFFF">eXtended object<br />
+    oriented<br />
+    Portal System</font></p>
+  <p><font color="#FFFFFF">...que m? queres...</font></p>
+  </DIV>
+
+<table width="755" border="0" cellspacing="1" cellpadding="3" height="201" bgcolor="#CCCCCC">
+  <tr bgcolor="#CCCCCC">
+    <td colspan="2">
+      <div align="center"><font color="#333333" face="Tahoma" size="2"><b>X2 Theme for XooPS 2.0.x / Tema X2 para XooPS 2.0.x</b></font></div>
+    </td>
+  </tr>
+  <tr>
+    <td bgcolor="#333333" height="78" width="538"><font color="#CCCCCC" face="Tahoma" size="2">
+	<b>| Creators / Creadores </b>: w4z004 - Unfor<br />
+
+	<b>| E-mail / E-mail</b> : <a href="mailto:w4z004 ＠ hotmail.com">w4z004 ＠ hotmail.com</a><br />
+
+	<b>| This is a original work bassed in the ideas of </b>w4z004<br />
+	<b>| and the excelent and professional work of </b> Unfor<br />
+
+	<b>| Date / Fecha </b>: Feb. 2003<br />
+
+	<b>| Thanks to / Gracias a</b> : Chapi <b>for the graphic work colaboration </b><br />
+	<b>| </b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Aitor <b>for the enhancements into the theme </b><br />
+	<b>| </b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ralf57 <b> for the hidde/unhidde idea </b><br />
+	<b>| </b><br />
+
+	<b>| INSTALL:  upload the x2t.tar.gz file with the theme manager</b><br />
+	<b>| </b><br />
+
+	<b>| NEWS TWO COLUMNS: later of installed the theme with the theme manager into</b><br />
+	<b>| the news need upload or copy and paste the files </b> news_index.html <b>and </b><br />
+	<b>| </b> news_item.html <b> that are into the EXTRAS dir to the respective places and obtain</b><br />
+	<b>| a news with 2 columns.</b><br />
+	<b>| </b><br />
+
+	<b>| LAYOUT: into the EXTRAS dir too have a</b> theme.html<b> file that if you replace into</b><br />
+	<b>| the theme skin with copy and paste obtain that the center-center blocks</b><br />
+	<b>| appear in the top (now are changed to the bottom).  </b><br />
+	<b>| </b><br />
+
+	<b>| CHANGELOG:</b><br />
+	<b>| 27/02 - Removed the login in the headerbar.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Fixed the userinfo template</b><br />
+	<b>| </b><br />
+	<b>| 01/03 - Removed the skin changed to the new structure.</b><br />
+	<b>| </b><br />
+	<b>| 30/03 - Finished the notification templates, XHTML cleanup, </b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and added scrolling to the top posters and new users blocks.</b><br />
+	<b>| </b><br />
+	<b>| 20/09 - Upgraded to xoops 2.0.4. </b><br />
+	<b>| </b><br />
+	<b>| 05/07/04 - Upgraded to xoops 2.0.6.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Created the SmartFAQ module templates.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Enhanced the CSS.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Added the hidde/display effect for the notification system.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Modified the main menu / user menu, and added graphics to this.</b><br />
+	<b>| </b><br />
+	<b>| 05/08/04 - Created the Liase module templates.</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Created the RSSfit module templates.</b><br />
+	<b>| </b><br />
+	<b>| 05/16/04 - Fixed the styleNN.css (thnx chapi).</b><br />
+	<b>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- Cleaned to be 100% html transitional 1.0.</b><br />
+
+
+	<b>| </b><br />
+</font></td>
+
+    <td bgcolor="#333333" height="78" rowspan="4" width="202">&nbsp;</td>
+  </tr>
+  <tr>
+    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|</b>
+      Dedicated to all Xoops users.<br />
+      <b>|</b> Dedicado a todos los usuarios de Xoops.</font></td>
+  </tr>
+  <tr>
+    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|
+      ENGLISH SUPPORT :</b><br />
+      <b>|</b>&gt; <a href="http://www.xoops.org">http://www.xoops.org</a>
+      </font></td>
+  </tr>
+  <tr>
+    <td bgcolor="#333333" width="538"><font color="#CCCCCC" face="Tahoma" size="2"><b>|
+      SOPORTE EN CASTELLANO :</b><br />
+      <b>|</b>&gt; <a href="http://www.esxoops.com">http://www.esxoops.com</a><br />
+  </tr>
+</table>
+</body>
+</html>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:03:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:03:50 +0900
Subject: [xoops-cvslog 5651] CVS update: xoops2jp/extras/theme_x2t
Message-ID: <20061107080350.B66312AC0C8@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:03:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:03:50 +0900
Subject: [xoops-cvslog 5652] CVS update: xoops2jp/extras/theme_x2t/extras
Message-ID: <20061107080350.E003E2AC0B2@users.sourceforge.jp>

Index: xoops2jp/extras/theme_x2t/extras/theme.html
diff -u xoops2jp/extras/theme_x2t/extras/theme.html:1.1 xoops2jp/extras/theme_x2t/extras/theme.html:1.2
--- xoops2jp/extras/theme_x2t/extras/theme.html:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/extras/theme_x2t/extras/theme.html	Sat Jun 11 11:32:37 2005
@@ -1,146 +1,146 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
-<meta name="robots" content="<{$xoops_meta_robots}>" />
-<meta name="keywords" content="<{$xoops_meta_keywords}>" />
-<meta name="description" content="<{$xoops_meta_description}>" />
-<meta name="rating" content="<{$xoops_meta_rating}>" />
-<meta name="author" content="<{$xoops_meta_author}>" />
-<meta name="copyright" content="<{$xoops_meta_copyright}>" />
-<meta name="generator" content="XOOPS" />
-<title><{$xoops_sitename}> - <{$xoops_pagetitle}></title>
-<link href="<{$xoops_url}>/favicon.ico" rel="SHORTCUT ICON" />
-<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css" />
-<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_themecss}>" />
-<script type="text/javascript">
-<!--
-<{$xoops_js}>
-//-->
-</script>
-</head>
-<body>
-<!-- Start Header -->
-<table cellspacing="0" cellpadding="0" width="100%" border="0" style="background-color : #2F5376; color: #ffffff">
-  <tr>
-    <td height="70" width="150" valign="middle" align="left" rowspan="2">
-    <a href="<{$xoops_url}>"><img src="<{$xoops_imageurl}>logo.gif" alt="" /></a></td>
-<td valign="middle" align="center" width="100%">
-<{$xoops_banner}>
-</td></tr><tr>
-    <td width="100%" valign="bottom" align="right" class="navbar" >
-	<table border="0" cellpadding="1" cellspacing="0">
-	   <tr>
-         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="<{$xoops_url}>">Home</a></td>
-         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/newbb/">XOOPS Support</a></td>
-         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/xoopsfaq/">XOOPS FAQ</a></td>
-	   </tr>
-	</table>
-     </td>
-  </tr>
-</table>
-<!-- End Header -->
-<!-- Start Headerbar -->
-<table border='0' width='100%' cellspacing='0' cellpadding='0'>
-        <tr>
-          <td width='10'><img src='<{$xoops_imageurl}>hbar_left.gif' width='10' height='23' alt='' /></td>
-          <td style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='left'>&nbsp;</td>
-<td width='15%' style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='right'>
-<form action="<{$xoops_url}>/search.php" method="post">
-        <input type="text" name="query" class="navinput" /><input type="hidden" name="action" value="results" /> <input class="navinputImage" type="image" src="<{$xoops_imageurl}>searchButton.gif" name="searchSubmit" />
-    </form></td>
-          <td width='10'><img src='<{$xoops_imageurl}>hbar_right.gif' width='10' height='23' alt='' /></td>
-        </tr>
-</table>
-<!-- End Headerbar -->
-
-    <table width="100%"  cellspacing="0" cellpadding="0" border="0">
-  <tr>
-         <td class="leftcolumn" valign="top" style='background-image: url(<{$xoops_imageurl}>bg_left.gif);'><div class="leftcolumn">
-        <!-- Start left blocks loop -->
-        <{foreach item=block from=$xoops_lblocks}>
-          <{include file="x2t/theme_blockleft.html"}>
-        <{/foreach}>
-        <!-- End left blocks loop -->
-         </div></td>
-         <td width="100%" valign="top" class="contentbox">
-
-         <!-- Display center blocks if any -->
-         <{if $xoops_showcblock == 1}>
-<br />
-<table width="95%" border="0" cellpadding="0" cellspacing="0" align="center">
-<tr>
-<td class="bcenterleft">&nbsp;</td>
-<td class="bcenterbg">&nbsp;</td>
-<td class="bcenterright">&nbsp;</td>
-</tr>
-</table>
-
-         <table width="95%" cellpadding="3" cellspacing="0" align="center" style="border-left: #cccccc 1px solid;border-right: #cccccc 1px solid;border-bottom: #cccccc 1px solid;">
-              <tr>
-                <td class="centercolumn" valign="top" colspan="2">
-                <div class="centercolumn">
-              <!-- Start center-center blocks loop -->
-              <{foreach item=block from=$xoops_ccblocks}>
-              <{include file="x2t/theme_blockcenter_c.html"}>
-              <br />
-              <{/foreach}>
-              <!-- End center-center blocks loop -->
-                </div>
-                </td></tr>
-              <tr>
-                <td class="centerLcolumn" valign="top">
-                <div class="centerLcolumn">
-            <!-- Start center-left blocks loop -->
-              <{foreach item=block from=$xoops_clblocks}>
-                <{include file="x2t/theme_blockcenter_l.html"}>
-                <br />
-              <{/foreach}>
-            <!-- End center-left blocks loop -->
-                </div>
-               </td>
-                <td class="centerRcolumn" valign="top">
-                <div class="centerRcolumn">
-            <!-- Start center-right blocks loop -->
-              <{foreach item=block from=$xoops_crblocks}>
-                <{include file="x2t/theme_blockcenter_r.html"}>
-                <br />
-              <{/foreach}>
-            <!-- End center-right blocks loop -->
-                </div>
-       		   </td>
-              </tr>
-            </table>
-            <{/if}>
-            <!-- End display center blocks -->
-
-
-         <br />
-            <div class="content"><{$xoops_contents}></div>
-         </td>
-         <{if $xoops_showrblock == 1}>
-         <td class="rightcolumn" valign="top" align="right" style='background-image: url(<{$xoops_imageurl}>bg_right.gif);'><div class="rightcolumn">
-        <!-- Start right blocks loop -->
-        <{foreach item=block from=$xoops_rblocks}>
-          <{include file="x2t/theme_blockright.html"}>
-        <{/foreach}>
-        <!-- End right blocks loop -->
-         </div>
-         </td>
-<{else}>
-<td width='10' style='background-image: url(<{$xoops_imageurl}>bg_right2.gif);'><img src='<{$xoops_imageurl}>dummy.gif' width='10' height='10' alt='' /></td>
-<{/if}>
-   </tr>
-           <tr>
-          <td colspan="3" width="100%">
-
-<table border='0' width='100%' cellspacing='0' cellpadding='0'>
-        <tr>
-          <td width='10'><img src='<{$xoops_imageurl}>hbar_left.gif' width='10' height='23' alt='' /></td>
-          <td style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='center'>&nbsp;<span class="copyright"><{$footer}></span></td>
-          <td width='10'><img src='<{$xoops_imageurl}>hbar_right.gif' width='10' height='23' alt='' /></td></tr>
-</table>
-</td></tr></table>
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
+<meta name="robots" content="<{$xoops_meta_robots}>" />
+<meta name="keywords" content="<{$xoops_meta_keywords}>" />
+<meta name="description" content="<{$xoops_meta_description}>" />
+<meta name="rating" content="<{$xoops_meta_rating}>" />
+<meta name="author" content="<{$xoops_meta_author}>" />
+<meta name="copyright" content="<{$xoops_meta_copyright}>" />
+<meta name="generator" content="XOOPS" />
+<title><{$xoops_sitename}> - <{$xoops_pagetitle}></title>
+<link href="<{$xoops_url}>/favicon.ico" rel="SHORTCUT ICON" />
+<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css" />
+<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_themecss}>" />
+<script type="text/javascript">
+<!--
+<{$xoops_js}>
+//-->
+</script>
+</head>
+<body>
+<!-- Start Header -->
+<table cellspacing="0" cellpadding="0" width="100%" border="0" style="background-color : #2F5376; color: #ffffff">
+  <tr>
+    <td height="70" width="150" valign="middle" align="left" rowspan="2">
+    <a href="<{$xoops_url}>"><img src="<{$xoops_imageurl}>logo.gif" alt="" /></a></td>
+<td valign="middle" align="center" width="100%">
+<{$xoops_banner}>
+</td></tr><tr>
+    <td width="100%" valign="bottom" align="right" class="navbar" >
+	<table border="0" cellpadding="1" cellspacing="0">
+	   <tr>
+         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="<{$xoops_url}>">Home</a></td>
+         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/newbb/">XOOPS Support</a></td>
+         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/xoopsfaq/">XOOPS FAQ</a></td>
+	   </tr>
+	</table>
+     </td>
+  </tr>
+</table>
+<!-- End Header -->
+<!-- Start Headerbar -->
+<table border='0' width='100%' cellspacing='0' cellpadding='0'>
+        <tr>
+          <td width='10'><img src='<{$xoops_imageurl}>hbar_left.gif' width='10' height='23' alt='' /></td>
+          <td style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='left'>&nbsp;</td>
+<td width='15%' style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='right'>
+<form action="<{$xoops_url}>/search.php" method="post">
+        <input type="text" name="query" class="navinput" /><input type="hidden" name="action" value="results" /> <input class="navinputImage" type="image" src="<{$xoops_imageurl}>searchButton.gif" name="searchSubmit" />
+    </form></td>
+          <td width='10'><img src='<{$xoops_imageurl}>hbar_right.gif' width='10' height='23' alt='' /></td>
+        </tr>
+</table>
+<!-- End Headerbar -->
+
+    <table width="100%"  cellspacing="0" cellpadding="0" border="0">
+  <tr>
+         <td class="leftcolumn" valign="top" style='background-image: url(<{$xoops_imageurl}>bg_left.gif);'><div class="leftcolumn">
+        <!-- Start left blocks loop -->
+        <{foreach item=block from=$xoops_lblocks}>
+          <{include file="x2t/theme_blockleft.html"}>
+        <{/foreach}>
+        <!-- End left blocks loop -->
+         </div></td>
+         <td width="100%" valign="top" class="contentbox">
+
+         <!-- Display center blocks if any -->
+         <{if $xoops_showcblock == 1}>
+<br />
+<table width="95%" border="0" cellpadding="0" cellspacing="0" align="center">
+<tr>
+<td class="bcenterleft">&nbsp;</td>
+<td class="bcenterbg">&nbsp;</td>
+<td class="bcenterright">&nbsp;</td>
+</tr>
+</table>
+
+         <table width="95%" cellpadding="3" cellspacing="0" align="center" style="border-left: #cccccc 1px solid;border-right: #cccccc 1px solid;border-bottom: #cccccc 1px solid;">
+              <tr>
+                <td class="centercolumn" valign="top" colspan="2">
+                <div class="centercolumn">
+              <!-- Start center-center blocks loop -->
+              <{foreach item=block from=$xoops_ccblocks}>
+              <{include file="x2t/theme_blockcenter_c.html"}>
+              <br />
+              <{/foreach}>
+              <!-- End center-center blocks loop -->
+                </div>
+                </td></tr>
+              <tr>
+                <td class="centerLcolumn" valign="top">
+                <div class="centerLcolumn">
+            <!-- Start center-left blocks loop -->
+              <{foreach item=block from=$xoops_clblocks}>
+                <{include file="x2t/theme_blockcenter_l.html"}>
+                <br />
+              <{/foreach}>
+            <!-- End center-left blocks loop -->
+                </div>
+               </td>
+                <td class="centerRcolumn" valign="top">
+                <div class="centerRcolumn">
+            <!-- Start center-right blocks loop -->
+              <{foreach item=block from=$xoops_crblocks}>
+                <{include file="x2t/theme_blockcenter_r.html"}>
+                <br />
+              <{/foreach}>
+            <!-- End center-right blocks loop -->
+                </div>
+       		   </td>
+              </tr>
+            </table>
+            <{/if}>
+            <!-- End display center blocks -->
+
+
+         <br />
+            <div class="content"><{$xoops_contents}></div>
+         </td>
+         <{if $xoops_showrblock == 1}>
+         <td class="rightcolumn" valign="top" align="right" style='background-image: url(<{$xoops_imageurl}>bg_right.gif);'><div class="rightcolumn">
+        <!-- Start right blocks loop -->
+        <{foreach item=block from=$xoops_rblocks}>
+          <{include file="x2t/theme_blockright.html"}>
+        <{/foreach}>
+        <!-- End right blocks loop -->
+         </div>
+         </td>
+<{else}>
+<td width='10' style='background-image: url(<{$xoops_imageurl}>bg_right2.gif);'><img src='<{$xoops_imageurl}>dummy.gif' width='10' height='10' alt='' /></td>
+<{/if}>
+   </tr>
+           <tr>
+          <td colspan="3" width="100%">
+
+<table border='0' width='100%' cellspacing='0' cellpadding='0'>
+        <tr>
+          <td width='10'><img src='<{$xoops_imageurl}>hbar_left.gif' width='10' height='23' alt='' /></td>
+          <td style='background-image: url(<{$xoops_imageurl}>hbar_middle.gif);' align='center'>&nbsp;<span class="copyright"><{$footer}></span></td>
+          <td width='10'><img src='<{$xoops_imageurl}>hbar_right.gif' width='10' height='23' alt='' /></td></tr>
+</table>
+</td></tr></table>
+</body>
 </html>
\ No newline at end of file
Index: xoops2jp/extras/theme_x2t/extras/news_item.html
diff -u xoops2jp/extras/theme_x2t/extras/news_item.html:1.1 xoops2jp/extras/theme_x2t/extras/news_item.html:1.2
--- xoops2jp/extras/theme_x2t/extras/news_item.html:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/extras/theme_x2t/extras/news_item.html	Sat Jun 11 11:32:37 2005
@@ -1,44 +1,44 @@
-<table width="100%" border="0" cellpadding="0" cellspacing="5" align="center">
-  <tr>
-    <td width="100%" valign="top" class="newsTitle" colspan="2"><img src="<{$xoops_imageurl}>/folder.gif" align="middle" alt="" /> <b><{$story.title}></b></td>
-  </tr>
-  <tr>
-    <td width="100%" colspan="2" class="newsPoster">  <{$lang_postedby}> <{$story.poster}> <span class="textPoster"><{$lang_on}> <{$story.posttime}> (<{$story.hits}> <{$lang_reads}>)</span></td>
-  </tr>
-  <tr>
- <{if $story.align == "left" }>
-    <td width="17%" valign="top" class="newsMisc">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    <td width="100%" valign="top" align="center">
-    <{$story.imglink}></td>
-    <tr>
-    <td width="100%" valign="top" align="center" style="padding: 3px;">
-    <a href="print.php?storyid=<{$story.id}>" target="_BLANK"><{$lang_printerpage}></a>
-    <a target="_top" href="<{$story.mail_link}>"><{$lang_sendstory}></a>
-    </td></tr></table>
-    </td>
-    <td width="83%" class="newsContent" valign="top">
-    <{$story.text}>
-    </td>
-  <{else}>
-    <td width="83%" class="newsContent" valign="top">
-    <{$story.text}>
-    </td>
-    <td width="17%" valign="top" class="newsMisc">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-    <tr>
-    <td width="100%" valign="top" align="center" style="padding: 3px;" class="newsPoster">
-   <a href="print.php?storyid=<{$story.id}>" target="_BLANK"><img src="images/print.gif" alt="<{$lang_printerpage}>" /></a>
-    <a target="_top" href="<{$story.mail_link}>"><img src="images/friend.gif" alt="<{$lang_sendstory}>" /></a>
-    </td></tr></table>
-
-    </td>
-  <{/if}>
-  </tr>
-  <tr>
-    <td width="100%" colspan="2" class="newsPoster" align="right"><span class="textPoster"><{$story.adminlink}> <{$story.morelink}>  </span></td>
-  </tr>
-</table>
+<table width="100%" border="0" cellpadding="0" cellspacing="5" align="center">
+  <tr>
+    <td width="100%" valign="top" class="newsTitle" colspan="2"><img src="<{$xoops_imageurl}>/folder.gif" align="middle" alt="" /> <b><{$story.title}></b></td>
+  </tr>
+  <tr>
+    <td width="100%" colspan="2" class="newsPoster">  <{$lang_postedby}> <{$story.poster}> <span class="textPoster"><{$lang_on}> <{$story.posttime}> (<{$story.hits}> <{$lang_reads}>)</span></td>
+  </tr>
+  <tr>
+ <{if $story.align == "left" }>
+    <td width="17%" valign="top" class="newsMisc">
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+    <td width="100%" valign="top" align="center">
+    <{$story.imglink}></td>
+    <tr>
+    <td width="100%" valign="top" align="center" style="padding: 3px;">
+    <a href="print.php?storyid=<{$story.id}>" target="_BLANK"><{$lang_printerpage}></a>
+    <a target="_top" href="<{$story.mail_link}>"><{$lang_sendstory}></a>
+    </td></tr></table>
+    </td>
+    <td width="83%" class="newsContent" valign="top">
+    <{$story.text}>
+    </td>
+  <{else}>
+    <td width="83%" class="newsContent" valign="top">
+    <{$story.text}>
+    </td>
+    <td width="17%" valign="top" class="newsMisc">
+    <table width="100%" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+    <tr>
+    <td width="100%" valign="top" align="center" style="padding: 3px;" class="newsPoster">
+   <a href="print.php?storyid=<{$story.id}>" target="_BLANK"><img src="images/print.gif" alt="<{$lang_printerpage}>" /></a>
+    <a target="_top" href="<{$story.mail_link}>"><img src="images/friend.gif" alt="<{$lang_sendstory}>" /></a>
+    </td></tr></table>
+
+    </td>
+  <{/if}>
+  </tr>
+  <tr>
+    <td width="100%" colspan="2" class="newsPoster" align="right"><span class="textPoster"><{$story.adminlink}> <{$story.morelink}>  </span></td>
+  </tr>
+</table>
 <br />
\ No newline at end of file
Index: xoops2jp/extras/theme_x2t/extras/news_index.html
diff -u xoops2jp/extras/theme_x2t/extras/news_index.html:1.1 xoops2jp/extras/theme_x2t/extras/news_index.html:1.2
--- xoops2jp/extras/theme_x2t/extras/news_index.html:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/extras/theme_x2t/extras/news_index.html	Sat Jun 11 11:32:37 2005
@@ -1,50 +1,50 @@
-<{if $displaynav == true}>
-  <div style="text-align: center;">
-    <form name="form1" action="index.php" method="get">
-    <{$topic_select}> <select name="storynum"><{$storynum_options}></select> <input type="submit" value="<{$lang_go}>" class="formButton" /></form>
-  <hr />
-  </div>
-<{/if}>
-
-
-<{section name=i loop=$stories}>
-<{php}>
-global $totalarticulos;
-global $impar;
-$totalarticulos = $totalarticulos +1;
-<{/php}>
-<{/section}>
-
-<{php}>
-if (($totalarticulos % 2)==1){
-	$impar=true;
-	echo '<table width=100%><tr><td colspan=2 width="100%">';
-}else{
-	echo '<table width=100%><tr><td width="50%">';
-}
-<{/php}>
-<div style="text-align: right; margin: 10px;"><{$pagenav}></div>
-<br />
-<!-- start news item loop -->
-<{section name=i loop=$stories}>
-  <{include file="db:news_item.html" story=$stories[i]}>
-<{php}>
-global $contador;
-$contador = $contador +1;
-if ($contador && $impar && (!$arrancado)){
-	$arrancado = true;
-	$contador = 0;
-	echo "</td></tr><tr><td>";
-}else{
-	if (($contador % 2)==1){
-		echo "</td><td width='50%'>";
-	}else{
-		echo "</td></tr><tr><td width='50%'>";
-	}
-}
-<{/php}>
-<{/section}>
-</td></tr></table>
-<!-- end news item loop -->
-<div style="text-align: right; margin: 10px;"><{$pagenav}></div>
+<{if $displaynav == true}>
+  <div style="text-align: center;">
+    <form name="form1" action="index.php" method="get">
+    <{$topic_select}> <select name="storynum"><{$storynum_options}></select> <input type="submit" value="<{$lang_go}>" class="formButton" /></form>
+  <hr />
+  </div>
+<{/if}>
+
+
+<{section name=i loop=$stories}>
+<{php}>
+global $totalarticulos;
+global $impar;
+$totalarticulos = $totalarticulos +1;
+<{/php}>
+<{/section}>
+
+<{php}>
+if (($totalarticulos % 2)==1){
+	$impar=true;
+	echo '<table width=100%><tr><td colspan=2 width="100%">';
+}else{
+	echo '<table width=100%><tr><td width="50%">';
+}
+<{/php}>
+<div style="text-align: right; margin: 10px;"><{$pagenav}></div>
+<br />
+<!-- start news item loop -->
+<{section name=i loop=$stories}>
+  <{include file="db:news_item.html" story=$stories[i]}>
+<{php}>
+global $contador;
+$contador = $contador +1;
+if ($contador && $impar && (!$arrancado)){
+	$arrancado = true;
+	$contador = 0;
+	echo "</td></tr><tr><td>";
+}else{
+	if (($contador % 2)==1){
+		echo "</td><td width='50%'>";
+	}else{
+		echo "</td></tr><tr><td width='50%'>";
+	}
+}
+<{/php}>
+<{/section}>
+</td></tr></table>
+<!-- end news item loop -->
+<div style="text-align: right; margin: 10px;"><{$pagenav}></div>
 <br />
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:27 +0900
Subject: [xoops-cvslog 5653] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20061107080427.C4D852AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:1.1.2.4	Fri Sep  1 12:12:26 2006
+++ xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,54 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/actions/SearchShowallAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchShowallbyuserForm.class.php";
-
-class Legacy_SearchShowallbyuserAction extends Legacy_SearchShowallAction
-{
-	function _setupActionForm()
-	{
-		$this->mActionForm =& new Legacy_SearchShowallbyuserForm($this->mConfig['keyword_min']);
-		$this->mActionForm->prepare();
-	}
-	
-	function _getTemplateName()
-	{
-		return "legacy_search_showallbyuser.html";
-	}
-	
-	function _getSelectedMids()
-	{
-		$ret = array();
-		$ret[] = $this->mActionForm->get('mid');
-		
-		return $ret;
-	}
-	
-	function _doSearch(&$client, &$xoopsUser, &$params)
-	{
-		return $client->call('searchItemsOfUser', $params);
-	}
-
-	function _getMaxHit()
-	{
-		return LEGACY_SEARCH_SHOWALL_MAXHIT;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		parent::executeViewIndex($controller, $xoopsUser, $render);
-		
-		$handler =& xoops_gethandler('user');
-		$user =& $handler->get($this->mActionForm->get('uid'));
-		
-		$render->setAttribute('targetUser', $user);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/MiscFriendAction.class.php
diff -u xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:removed
--- xoops2jp/html/modules/base/actions/MiscFriendAction.class.php:1.1.2.3.2.2	Fri Oct 13 14:10:51 2006
+++ xoops2jp/html/modules/base/actions/MiscFriendAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,74 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/MiscFriendForm.class.php";
-
-class Legacy_MiscFriendAction extends Legacy_Action
-{
-	var $mActionForm = null;
-	var $mMailer = null;
-	
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		return is_object($xoopsUser);
-	}
-
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm =& new Legacy_MiscFriendForm();
-		$this->mActionForm->prepare();
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->load($xoopsUser);
-		return LEGACY_FRAME_VIEW_INPUT;
-	}
-	
-	function execute(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if ($this->mActionForm->hasError()) {
-			return LEGACY_FRAME_VIEW_INPUT;
-		}
-		
-		$this->mMailer =& getMailer();
-		$this->mMailer->setTemplate("tellfriend.tpl");
-		$this->mMailer->assign("SITENAME", $this->mRoot->mContext->getXoopsConfig('sitename'));
-		$this->mMailer->assign("ADMINMAIL", $this->mRoot->mContext->getXoopsConfig('adminmail'));
-		$this->mMailer->assign("SITEURL", XOOPS_URL . '/');
-		
-		$this->mActionForm->update($this->mMailer);
-		
-		$this->mMailer->setSubject(sprintf(_MSC_INTSITE, $this->mRoot->mContext->getXoopsConfig('sitename')));
-		
-		return $this->mMailer->send() ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
-	}
-	
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_misc_friend.html");
-		$render->setAttribute('actionForm', $this->mActionForm);
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_misc_friend_success.html");
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_misc_friend_error.html");
-		$render->setAttribute('xoopsMailer', $this->mMailer);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/BackendAction.class.php
diff -u xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7.2.2 xoops2jp/html/modules/base/actions/BackendAction.class.php:removed
--- xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.7.2.2	Wed Oct 11 17:13:54 2006
+++ xoops2jp/html/modules/base/actions/BackendAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,109 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Legacy_BackendAction extends Legacy_Action
-{
-	var $mItems = array();
-	
-	/**
-	 * The spec of getRSS():
-	 * append your RSS item to $eventArgs array. You don't need to sanitize your values. Use raw value.
-	 * 
-	 *  $item['title']
-	 *  $item['link'] ... permanent link
-	 *  $item['guid'] ... permanent link
-	 *  $item['pubdate'] ... unixtime
-	 *  $item['description'] ... not required. 
-	 *  $item['category'] ... not required. 
-	 *  $item['author'] ... not required. 
-	 *  
-	 * @var XCube_Delegate
-	 */
-	var $mGetRSSItems = null;
-	
-	function Legacy_BackendAction($flag)
-	{
-		parent::Legacy_Action($flag);
-		
-		$this->mGetRSSItems =& new XCube_Delegate();
-		$this->mGetRSSItems->register('Legacy_BackendAction.GetRSSItems');
-	}
-	
-	function getDefaultView(&$controll, &$xoopsUser)
-	{
-		$items = array();
-		$this->mGetRSSItems->call(new XCube_Ref($items));
-
-		$sortArr = array();
-		foreach ($items as $item) {
-			$i = intval($item['pubdate']);
-			for (; isset($sortArr[$i]) ; $i++);
-			
-			$sortArr[$i] = $item;
-		}
-		krsort($sortArr);
-	    $this->mItems = $sortArr;
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$xoopsConfig = $controller->mRoot->mContext->mXoopsConfig;
-		
-		//
-		// Set up the render buffer.
-		//
-		$renderSystem =& $controller->mRoot->getRenderSystem('Legacy_RenderSystem');
-		
-		$renderTarget =& $renderSystem->createRenderTarget('main');
-
-		$renderTarget->setTemplateName("legacy_rss.html");
-		
-		$renderTarget->setAttribute('channel_title', $xoopsConfig['sitename']);
-		$renderTarget->setAttribute('channel_link', XOOPS_URL . '/');
-		$renderTarget->setAttribute('channel_desc', $xoopsConfig['slogan']);
-		$renderTarget->setAttribute('channel_lastbuild', formatTimestamp(time(), 'rss'));
-		$renderTarget->setAttribute('channel_webmaster', $xoopsConfig['adminmail']);
-		$renderTarget->setAttribute('channel_editor', $xoopsConfig['adminmail']);
-		$renderTarget->setAttribute('channel_category', 'News');
-		$renderTarget->setAttribute('channel_generator', 'XOOPS Cube');
-		$renderTarget->setAttribute('image_url', XOOPS_URL . '/images/logo.gif');
-		
-		$dimention = getimagesize(XOOPS_ROOT_PATH . '/images/logo.gif');
-
-		$width = 0;		
-		if (empty($dimention[0])) {
-			$width = 88;
-		}
-		else {
-			$width = ($dimention[0] > 144) ? 144 : $dimention[0];
-		}
-		
-		$height = 0;
-		if (empty($dimention[1])) {
-			$height = 31;
-		} else {
-			$height = ($dimention[1] > 400) ? 400 : $dimention[1];
-		}
-		
-		$renderTarget->setAttribute('image_width', $width);
-		$renderTarget->setAttribute('image_height', $height);
-		$renderTarget->setAttribute('items', $this->mItems);
-
-		//
-		// Rendering
-		//
-		$renderSystem->renderWithTarget($renderTarget);
-		
-		if (function_exists('mb_http_output')) {
-			mb_http_output('pass');
-		}
-		header ('Content-Type:text/xml; charset=utf-8');
-		
-		
-		print xoops_utf8_encode($renderTarget->getResult());
-		
-		exit(0);
-	}
-}
Index: xoops2jp/html/modules/base/actions/index.html
diff -u xoops2jp/html/modules/base/actions/index.html:1.1.2.1 xoops2jp/html/modules/base/actions/index.html:removed
--- xoops2jp/html/modules/base/actions/index.html:1.1.2.1	Mon Mar 27 11:41:52 2006
+++ xoops2jp/html/modules/base/actions/index.html	Tue Nov  7 17:04:27 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/actions/ImageUploadAction.class.php
diff -u xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:removed
--- xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:1.1.2.4	Mon Sep 25 18:34:29 2006
+++ xoops2jp/html/modules/base/actions/ImageUploadAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,80 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/admin/actions/ImageEditAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/ImageUploadForm.class.php";
-
-class Legacy_ImageUploadAction extends Legacy_ImageEditAction
-{
-	var $mCategory = null;
-
-	function prepare(&$controller, &$xoopsUser)
-	{
-		parent::prepare($controller, $xoopsUser);
-		$controller->setDialogMode(true);
-		
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-	}
-	
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('image', 'base');
-		return $handler;
-	}
-
-	function _setupObject()
-	{
-		$this->mObjectHandler =& $this->_getHandler();
-		$this->mObject =& $this->mObjectHandler->create();
-		$this->mObject->set('imgcat_id', xoops_getrequest('imgcat_id'));
-	}
-
-	function _setupActionForm()
-	{
-		$this->mActionForm =& new Legacy_ImageUploadForm();
-		$this->mActionForm->prepare();
-	}
-	
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		$groups = array();
-		if (is_object($xoopsUser)) {
-			$groups =& $xoopsUser->getGroups();
-		}
-		else {
-			$groups = array(XOOPS_GROUP_ANONYMOUS);
-		}
-			
-		$handler =& xoops_getmodulehandler('imagecategory', 'base');
-		$this->mCategory =& $handler->get(xoops_getrequest('imgcat_id'));
-		if (!is_object($this->mCategory ) || (is_object($this->mCategory) && !$this->mCategory->hasUploadPerm($groups))) {
-			return false;
-		}
-
-		return true;
-	}
-
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_image_upload.html");
-		$render->setAttribute('actionForm', $this->mActionForm);
-		$render->setAttribute('object', $this->mObject);
-		
-		$render->setAttribute('category', $this->mCategory);
-		$render->setAttribute('target', xoops_getrequest('target'));
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward(XOOPS_URL . "/imagemanager.php?imgcat_id=" . $this->mActionForm->get('imgcat_id') . "&target=" . xoops_getrequest('target'));
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		redirect_header(XOOPS_URL . "/imagemanager.php", 1, _MD_BASE_ERROR_DBUPDATE_FAILED);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php
diff -u xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php:removed
--- xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php:1.1.2.1	Thu Jul 27 18:31:02 2006
+++ xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,28 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * TODO This action should be implemented by base. We must move it to user.
- */
-class Legacy_MiscSslloginAction extends Legacy_Action
-{
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		//
-		// Because this action's template uses USER message catalog, load it.
-		//
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('user');
-
-		$render->setTemplateName("legacy_misc_ssllogin.html");
-		$render->setAttribute("message", @sprintf(_US_LOGGINGU, $xoopsUser->getVar('uname')));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php
diff -u xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php:1.1.2.1.2.1 xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php:removed
--- xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php:1.1.2.1.2.1	Thu Oct  5 18:06:25 2006
+++ xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,22 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: NotifyCancelAction.class.php,v 1.1.2.1.2.1 2006/10/05 09:06:25 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Legacy_NotifyCancelAction extends Legacy_Action
-{
-	function getDefaultView(&$contoller, &$xoopsUser)
-	{
-		$contoller->executeForward(XOOPS_URL . '/');
-	}
-
-	function execute(&$contoller, &$xoopsUser)
-	{
-		$contoller->executeForward(XOOPS_URL . '/');
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/SearchAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/SearchAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SearchAction.class.php:1.1.2.3	Fri Sep  1 12:12:26 2006
+++ xoops2jp/html/modules/base/actions/SearchAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,54 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: SearchAction.class.php,v 1.1.2.3 2006/09/01 03:12:26 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/actions/SearchResultsAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchResultsForm.class.php";
-
-class Legacy_SearchAction extends Legacy_SearchResultsAction
-{
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$root =& $controller->mRoot;
-		$service =& $root->mServiceManager->getService("LegacySearch");
-		if (is_object($service)) {
-			$client =& $root->mServiceManager->createClient($service);
-
-			$this->mModules =& $client->call('getActiveModules', array());
-		}
-		
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function _getSelectedMids()
-	{
-		$ret = array();
-		foreach(array_keys($this->mModules) as $key) {
-			$ret[] = $this->mModules[$key]['mid'];
-		}
-		
-		return $ret;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_search_form.html");
-	
-		$render->setAttribute('actionForm', $this->mActionForm);
-			
-		$render->setAttribute('moduleArr', $this->mModules);
-
-		//
-		// If the request include $mids, setAttribute it. If it don't include, 
-		// setAttribute $mid or $this->mModules.
-		//		
-		$render->setAttribute('selectedMidArr', $this->_getSelectedMids());
-		$render->setAttribute('searchRuleMessage', @sprintf(_SR_KEYTOOSHORT, $this->mConfig['keyword_min']));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php
diff -u xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php:1.1.2.1.2.2 xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php:removed
--- xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php:1.1.2.1.2.2	Fri Oct 13 18:20:07 2006
+++ xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,57 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: MiscSmiliesAction.class.php,v 1.1.2.1.2.2 2006/10/13 09:20:07 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/SmilesFilterForm.class.php";
-
-class Legacy_MiscSmiliesAction extends Legacy_AbstractListAction
-{
-	/**
-	 * @var string
-	 */
-	var $mTargetName = null;
-
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('smiles', 'base');
-		return $handler;
-	}
-
-	function &_getFilterForm(&$navi)
-	{
-		$filter =& new Legacy_SmilesFilterForm($this->_getPageNavi(), $this->_getHandler());
-		return $filter;
-	}
-
-	function _getBaseUrl()
-	{
-		return "./misc.php?type=Smilies";
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mTargetName = xoops_getrequest('target');
-		return parent::getDefaultView($controller, $xoopsUser);
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		//
-		// Because this action's template uses BASE message catalog, load it.
-		//
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-		
-		$render->setTemplateName("legacy_misc_smilies.html");
-		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
-		$render->setAttribute("targetName", $this->mTargetName);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/SearchShowallAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:1.1.2.4	Fri Sep  1 12:12:26 2006
+++ xoops2jp/html/modules/base/actions/SearchShowallAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,52 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/actions/SearchResultsAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchShowallForm.class.php";
-
-class Legacy_SearchShowallAction extends Legacy_SearchResultsAction
-{
-	function _setupActionForm()
-	{
-		$this->mActionForm =& new Legacy_SearchShowallForm($this->mConfig['keyword_min']);
-		$this->mActionForm->prepare();
-	}
-	
-	function _getTemplateName()
-	{
-		return "legacy_search_showall.html";
-	}
-	
-	function _getSelectedMids()
-	{
-		$ret = array();
-		$ret[] = $this->mActionForm->get('mid');
-		
-		return $ret;
-	}
-	
-	function _getMaxHit()
-	{
-		return LEGACY_SEARCH_SHOWALL_MAXHIT;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		parent::executeViewIndex($controller, $xoopsUser, $render);
-		
-		$prevStart = $this->mActionForm->get('start') - LEGACY_SEARCH_SHOWALL_MAXHIT;
-		if ($prevStart < 0) {
-			$prevStart = 0;
-		}
-		
-		$render->setAttribute('prevStart', $prevStart);
-		$render->setAttribute('nextStart', $this->mActionForm->get('start') + LEGACY_SEARCH_SHOWALL_MAXHIT);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/SearchResultsAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.10.2.2 xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.10.2.2	Sat Oct 14 02:50:13 2006
+++ xoops2jp/html/modules/base/actions/SearchResultsAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,158 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchResultsForm.class.php";
-
-define('LEGACY_SEARCH_RESULT_MAXHIT', 5);
-define('LEGACY_SEARCH_SHOWALL_MAXHIT', 20);
-
-class Legacy_SearchResultsAction extends Legacy_Action
-{
-	var $mActionForm = null;
-	var $mSearchResults = array();
-	var $mModules = array();
-	
-	var $mConfig = array();
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadPageTypeMessageCatalog('search');
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-		
-		$handler =& xoops_gethandler('config');
-		$this->mConfig =& $handler->getConfigsByCat(XOOPS_CONF_SEARCH);
-		
-		$this->_setupActionForm();
-	}
-	
-	function _setupActionForm()
-	{
-		$this->mActionForm =& new Legacy_SearchResultsForm($this->mConfig['keyword_min']);
-		$this->mActionForm->prepare();
-	}
-	
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		if ($this->mConfig['enable_search'] != 1) {
-			$controller->executeRedirect(XOOPS_URL . '/', 3, _MD_BASE_ERROR_SEARCH_NOT_ENABLED);
-			return false;
-		}
-		return true;
-	}
-	
-	function _getMaxHit()
-	{
-		return LEGACY_SEARCH_RESULT_MAXHIT;
-	}
-	
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if ($this->mActionForm->hasError()) {
-			return LEGACY_FRAME_VIEW_INDEX;
-		}
-
-		//
-		// TODO ErrorHandling
-		//
-		$root =& $controller->mRoot;
-		$service =& $root->mServiceManager->getService("LegacySearch");
-		if (is_object($service)) {
-			$client =& $root->mServiceManager->createClient($service);
-
-			$this->mModules =& $client->call('getActiveModules', array());
-			
-			$this->mActionForm->update($params);
-			
-			$handler =& xoops_gethandler('module');
-			foreach ($this->_getSelectedMids() as $mid) {
-				$t_module =& $handler->get($mid);
-				if (is_object($t_module)) {
-					$module = array();
-					
-					$module['mid'] = $mid;
-					$module['name'] = $t_module->get('name');
-					
-					$params['mid'] = $mid;
-					$module['results'] = $this->_doSearch($client, $xoopsUser, $params);
-					
-					if (count($module['results']) > 0) {
-						$module['has_more'] = (count($module['results']) >= $this->_getMaxHit()) ? true : false;
-						$this->mSearchResults[] = $module;
-					}
-				}
-			}
-		}
-		else {
-			return LEGACY_FRAME_VIEW_ERROR;
-		}
-
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function _doSearch(&$client, &$xoopsUser, &$params)
-	{
-		$root =& XCube_Root::getSingleton();
-		$timezone = $root->mContext->getXoopsConfig('server_TZ') * 3600;
-		
-		$results = $client->call('searchItems', $params);
-		
-		foreach (array_keys($results) as $key) {
-			if ($results[$key]['time'] > 0) {
-				$results[$key]['time'] = $results[$key]['time'] + $timezone;
-			}
-		}
-		
-		return $results;
-	}
-	
-	function execute(&$controller, &$xoopsUser)
-	{
-		return $this->getDefaultView($controller, $xoopsUser);
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName($this->_getTemplateName());
-	
-		$render->setAttribute('actionForm', $this->mActionForm);
-			
-		$render->setAttribute('searchResults', $this->mSearchResults);
-		$render->setAttribute('moduleArr', $this->mModules);
-
-		//
-		// If the request include $mids, setAttribute it. If it don't include, 
-		// setAttribute $mid or $this->mModules.
-		//		
-		$render->setAttribute('selectedMidArr', $this->_getSelectedMids());
-		$render->setAttribute('searchRuleMessage', @sprintf(_SR_KEYTOOSHORT, $this->mConfig['keyword_min']));
-	}
-	
-	function _getTemplateName()
-	{
-		return "legacy_search_results.html";
-	}
-	
-	function _getSelectedMids()
-	{
-		$ret = $this->mActionForm->get('mids');
-		if (!count($ret)) {
-			foreach ($this->mModules as $module) {
-				$ret[] = $module['mid'];
-			}
-		}
-		
-		return $ret;
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward(XOOPS_URL . '/');
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/NotifyListAction.class.php
diff -u xoops2jp/html/modules/base/actions/NotifyListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/NotifyListAction.class.php:removed
--- xoops2jp/html/modules/base/actions/NotifyListAction.class.php:1.1.2.2	Mon Sep 25 18:34:29 2006
+++ xoops2jp/html/modules/base/actions/NotifyListAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,147 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: NotifyListAction.class.php,v 1.1.2.2 2006/09/25 09:34:29 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/include/notification_functions.php";
-
-require_once XOOPS_MODULE_PATH . "/base/forms/NotifyDeleteForm.class.php";
-
-/**
- * List up notifications. This action is like notifications.php (when $op is
- * 'list').
- */
-class Legacy_NotifyListAction extends Legacy_Action
-{
-	var $mModules = array();
-	var $mActionForm = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-		
-		$this->mActionForm =& new Legacy_NotifyDeleteForm();
-		$this->mActionForm->prepare();
-	}
-	
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		return is_object($xoopsUser);
-	}
-
-	function getDefaultView(&$contoller, &$xoopsUser)
-	{
-		$criteria =& new Criteria('not_uid', $xoopsUser->get('uid'));
-		$criteria->setSort('not_modid, not_category, not_itemid');
-		
-		$handler =& xoops_gethandler('notification');
-		$notificationArr =& $handler->getObjects($criteria);
-
-		$moduleHandler =& xoops_gethandler('module');
-		
-		$prev_modid = -1;
-		$prev_category = -1;
-		$prev_item = -1;
-		foreach ($notificationArr as $notify) {
-			$t_modid = $notify->get('not_modid');
-			if ($t_modid != $prev_modid) {
-				$prev_modid = $t_modid;
-				$prev_category = -1;
-				$prev_item = -1;
-				
-				$module =& $moduleHandler->get($t_modid);
-				$this->mModules[$t_modid] = array (
-					'id' => $t_modid,
-					'name' => $module->getShow('name'),
-					'categories' => array()
-				);
-
-
-				//
-				// [ToDo] (Original)
-				// note, we could auto-generate the url from the id
-				// and category info... (except when category has multiple
-				// subscription scripts defined...)
-				// OR, add one more option to xoops_version 'view_from'
-				// which tells us where to redirect... BUT, e.g. forums, it
-				// still wouldn't give us all the required info... e.g. the
-				// topic ID doesn't give us the ID of the forum which is
-				// a required argument...
-				
-				//
-				// Get the lookup function, if exists
-				//
-				$notifyConfig = $module->getInfo('notification');
-				$lookupFunc = '';
-				if (!empty($notifyConfig['lookup_file'])) {
-					$t_filepath = XOOPS_ROOT_PATH . '/modules/' . $module->get('dirname') . '/' . $notifyConfig['lookup_file'];
-					if (file_exists($t_filepath)) {
-						require_once $t_filepath;
-						if (!empty($notifyConfig['lookup_func']) && function_exists($notifyConfig['lookup_func'])) {
-							$lookupFunc = $notifyConfig['lookup_func'];
-						}
-					}
-				}
-			}
-			
-			$t_category = $notify->get('not_category');
-			if ($t_category != $prev_category) {
-				$prev_category = $t_category;
-				$prev_item = -1;
-				$categoryInfo =& notificationCategoryInfo($t_category, $t_modid);
-			}
-			
-			$t_item = $notify->get('not_itemid');
-			if ($t_item != $prev_item) {
-				$prev_item = $t_item;
-				if (!empty($lookupFunc)) {
-					$itemInfo = $lookupFunc($t_category, $t_item);
-				}
-				else {
-					$itemInfo = array ('name' => '[' . _NOT_NAMENOTAVAILABLE . ']', 'url' => '');
-				}
-				$this->mModules[$t_modid]['categories'][$t_category]['items'][$t_item] = array(
-					'id' => $t_item,
-					'name' => $itemInfo['name'],
-					'url' => $itemInfo['url'],
-					'notifications' => array()
-				);
-			}
-			
-			$eventInfo =& notificationEventInfo($t_category, $notify->get('not_event'), $notify->get('not_modid'));
-			$this->mModules[$t_modid]['categories'][$t_category]['items'][$t_item]['notifications'][] = array(
-				'id' => $notify->get('not_id'),
-				'module_id' => $notify->get('not_modid'),
-				'category' => $notify->get('not_category'),
-				'category_title' => $categoryInfo['title'],
-				'item_id' => $notify->get('not_itemid'),
-				'event' => $notify->get('not_event'),
-				'event_title' => $eventInfo['title'],
-				'user_id' => $notify->get('not_uid')
-			);
-		}
-		
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_notification_list.html");
-		
-		$render->setAttribute('modules', $this->mModules);
-		$render->setAttribute('currentUser', $xoopsUser);
-		$render->setAttribute('actionForm', $this->mActionForm);
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward("./index.php?Action=ImageList");
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php
diff -u xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php:removed
--- xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php:1.1.2.2	Mon Sep 25 18:34:29 2006
+++ xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,87 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: NotifyDeleteAction.class.php,v 1.1.2.2 2006/09/25 09:34:29 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/include/notification_functions.php";
-
-require_once XOOPS_MODULE_PATH . "/base/forms/NotifyDeleteForm.class.php";
-
-/**
- * List up notifications. This action is like notifications.php (when $op is
- * 'list').
- */
-class Legacy_NotifyDeleteAction extends Legacy_Action
-{
-	var $mModules = array();
-	var $mActionForm = null;
-	
-	var $mErrorMessage = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('notification');
-		$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
-		
-		$this->mActionForm =& new Legacy_NotifyDeleteForm();
-		$this->mActionForm->prepare();
-	}
-
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		return is_object($xoopsUser);
-	}
-
-	/**
-	 * This member function is a special case. Because the confirm is must, it
-	 * uses token error for displaying confirm.
-	 */	
-	function execute(&$contoller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		//
-		// If input values are error, the action form returns fatal error flag.
-		// If it's not fatal, display confirm form.
-		//
-		if ($this->mActionForm->hasError()) {
-			return $this->mActionForm->mFatalError ? LEGACY_FRAME_VIEW_ERROR : LEGACY_FRAME_VIEW_INPUT;
-		}
-
-		//
-		// Execute deleting.
-		//
-		$successFlag = true;
-		$handler =& xoops_gethandler('notification');
-		foreach ($this->mActionForm->mNotifiyIds as $t_idArr) {
-			$t_notify =& $handler->get($t_idArr['id']);
-			if (is_object($t_notify) && $t_notify->get('not_uid') == $xoopsUser->get('uid') && $t_notify->get('not_modid') == $t_idArr['modid']) {
-				$successFlag = $successFlag & $handler->delete($t_notify);
-			}
-		}
-		
-		return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
-	}
-		
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_notification_delete.html");
-		$render->setAttribute('actionForm', $this->mActionForm);
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward(XOOPS_URL . "/notifications.php");
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeRedirect(XOOPS_URL . "/notifications.php", 2, _NOT_NOTHINGTODELETE);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3.2.3 xoops2jp/html/modules/base/actions/ImageListAction.class.php:removed
--- xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3.2.3	Fri Oct 13 18:19:21 2006
+++ xoops2jp/html/modules/base/actions/ImageListAction.class.php	Tue Nov  7 17:04:27 2006
@@ -1,93 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/ImageFilterForm.class.php";
-
-class Legacy_ImageListAction extends Legacy_AbstractListAction
-{
-	var $mImgcatId = null;
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$controller->setDialogMode(true);
-		
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-	}
-	
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('image', 'base');
-		return $handler;
-	}
-
-	function &_getFilterForm()
-	{
-		$filter =& new Legacy_ImageFilterForm($this->_getPageNavi(), $this->_getHandler());
-		return $filter;
-	}
-
-	function _getBaseUrl()
-	{
-		return XOOPS_URL . "/imagemanager.php?op=list";
-	}
-	
-	function getDefaultView(&$contoller, &$xoopsUser)
-	{
-		$result = parent::getDefaultView($controller, $xoopsUser);
-		if ($result == LEGACY_FRAME_VIEW_INDEX) {
-			$this->mImgcatId = xoops_getrequest('imgcat_id');
-			$handler =& xoops_getmodulehandler('imagecategory', 'base');
-			$this->mCategory =& $handler->get($this->mImgcatId );
-		}
-		
-		return $result;
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_image_list.html");
-		
-		foreach (array_keys($this->mObjects) as $key) {
-			$this->mObjects[$key]->loadImagecategory();
-		}
-		
-		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
-		
-		$render->setAttribute('imgcatId', $this->mImgcatId);
-		
-		$handler =& xoops_getmodulehandler('imagecategory', 'base');
-		
-		if (is_object($xoopsUser)) {
-			$groups =& $xoopsUser->getGroups();
-		}
-		else {
-			$groups = array(XOOPS_GROUP_ANONYMOUS);
-		}
-		$categoryArr =& $handler->getObjectsWithReadPerm($groups);
-		
-		$render->setAttribute('categoryArr', $categoryArr);
-		
-		//
-		// If current category object exists, check the permission of uploading.
-		//
-		$hasUploadPerm = null;
-		if ($this->mCategory != null) {
-			$hasUploadPerm = $this->mCategory->hasUploadPerm($groups);
-		}
-		$render->setAttribute('hasUploadPerm', $hasUploadPerm);
-		$render->setAttribute("category", $this->mCategory);
-		
-		$render->setAttribute('target', xoops_getrequest('target'));
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward("./index.php?Action=ImageList");
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:27 +0900
Subject: [xoops-cvslog 5654] CVS update:
	xoops2jp/html/modules/base/language/japanese/help
Message-ID: <20061107080428.01FD72AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/help/help.html
diff -u xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.12 xoops2jp/html/modules/base/language/japanese/help/help.html:removed
--- xoops2jp/html/modules/base/language/japanese/help/help.html:1.1.2.12	Sun Sep 10 14:54:33 2006
+++ xoops2jp/html/modules/base/language/japanese/help/help.html	Tue Nov  7 17:04:27 2006
@@ -1,51 +0,0 @@
-<h4>概要</h4>
-<ul>
-  <li>このモジュールは、XOOPS 2.0.x/2.0.xJP用のモジュールをXOOPS Cube2.1で利用する際に使用します。</li>
-  <li>このモジュールをインストールすると、XOOPS CubeにXOOPSモジュールを動かすための各クラスを実装して、XOOPS 2.0.xと互換性のある動作を提供します。</li>
-  <li>また、XOOPS 2.0.x互換モジュールの管理機能を提供します。</li>
-  <li>管理者メニューに対して管理用のテーマエンジンを提供します。</li>
-  <li>未完成のため、systemモジュールを併用してご利用ください。</li>
-</ul>
-
-<h4>コマンド検索(アクションサーチ)</h4>
-<ul>
-  <li>入力されたキーワードに関する情報を、管理メニューやヘルプから検索します。</li>
-  <li>XOOPS Cubeの使い方に迷ったときには、先ずこちらを検索してみてください。</li>
-</ul>
-
-<h4>モジュールの管理／インストール</h4>
-<ul>
-  <li>インストールされているモジュールの一覧が表示されます。</li>
-  <li>モジュールをインストールする際は、「モジュールのインストール」よりインストールするモジュールを選んでインストールして下さい。</li>
-  <li>モジュール一覧の「操作」から、「インフォメーション(！)」ボタンを押すと、モジュールの詳細情報を確認できます。</li>
-  <li>一覧画面でモジュールの「名前」を変更すると、メインメニューなどサイト内で表示されるモジュールの名称を変更できます。表示順の数字を変更すると、メインメニューでの表示順を変更できます。数字を「0」にすると、メインメニューでは表示されません。これらは、XOOPS
-  2.0.xのモジュール管理と同様の動作です。</li>
-</ul>
-
-<h4>ブロックの管理／インストール</h4>
-<ul>
-  <li>詳しくは<a href="<{'block.html'|helpurl}>">こちら</a>をご覧下さい。</li>
-</ul>
-
-<h4>テーマの管理／インストール</h4>
-<ul>
-  <li>詳しくは<a href="<{'theme.html'|helpurl}>">こちら</a>をご覧下さい。</li>
-</ul>
-
-<h4>XOOPS 2.0.x 操作移行リスト</h4>
-<ul>
-  <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
-</ul>
-
-<h4>Cube 2.1 alpha 既知の問題点・注意事項</h4>
-<ul>
-  <li>「base module」の名称（ディレクトリ名を含む）は、正式版までに「Legacy module」に変更の予定です。</li>
-  <li>幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。</li>
-</ul>
-
-<h4>Cube Legacy 2.1 の次バージョンへ向けての ToDo</h4>
-<ul>
-  <li>カスタムブロックにプレビュー機能がなく、実装されなくてはならない。</li>
-  <li>ユーザー検索において、前方一致や後方一致の指定ができなくなっている。</li>
-  <li>IISを利用した環境の場合、.sqlファイルを持つモジュールのインストールが上手く行かないケースがあります。IISを利用されている方からの動作状況の報告をお待ちしております。</li>
-</ul>
Index: xoops2jp/html/modules/base/language/japanese/help/block.html
diff -u xoops2jp/html/modules/base/language/japanese/help/block.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/help/block.html:removed
--- xoops2jp/html/modules/base/language/japanese/help/block.html:1.1.2.1	Wed Aug  2 18:41:55 2006
+++ xoops2jp/html/modules/base/language/japanese/help/block.html	Tue Nov  7 17:04:27 2006
@@ -1,38 +0,0 @@
-<h4>ブロックの使い方</h4>
-<p>ブロックはあなたが指定したモジュールに表示される小さなコンテンツです。
-それはブロックを持つモジュールと一緒にインストールされます。</p>
-
-<h5>ブロックのインストール</h5>
-<p>まずはじめに、あなたはブロックを使うためにブロックをインストールしなければなりません。
-ブロックのインストールを始めるために、<a href="<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList">ここ</a>をクリックしてください。
-入力フォームで、ブロックの名前やブロックにアクセス可能なグループを指定することが出来ます。
-優先度はあなたが指定したカラムにおける表示順序です。</p>
-
-<h5>カラム</h5>
-<p>ほとんどのテーマは３ペイン方式をとっています。
-中央ペインはさらに２つのペインを持っています。
-これらのペインは、左カラム、中央左カラム、中央カラム、中央右カラム、右カラムと呼ばれています。
-あなたは指定モジュールの指定カラムにブロックを表示させることが出来ます。</p>
-
-<p>いくつかのテーマは左カラムか右カラムを持っていません。
-そのようなケースでは、片方のカラムはもう片方のカラムに挿入されています。
-そのようなテーマの特徴を理解するために、テーマのマニュアルを読んでください。</p>
-
-<h6>注</h6>
-<p>特別なレンダーシステムはブロックに関して特別な機能を付与するかもしれません。
-もしそのようなものをインストールしているのであれば、そのレンダーシステムのマニュアルを読んでください。</p>
-
-<h5>ブロック管理</h5>
-<p>ブロック管理で、いつでもブロックの設定を変更できます。
-<a href="<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockList">ここ</a>をクリックしてください。その使い方は、他の操作機能に基づいており、ほとんど違いはありません。
-設定を変更する場合は編集アイコンをクリックしてください。</p>
-
-<h6>ブロックのアンインストール</h6>
-<p>ブロックの表示を一時停止したい場合は、アンインストールアイコンをクリックしてください。
-ブロックはアンインストールブロックのリストへ戻ります。
-ブロックの設定はあなたがそのブロックを含むモジュールをアンインストールするまで、保持されます。
-あなたはいつでもそのブロックを再インストールできます。</p>
-
-<h5>FOR XOOPS2 USERS</h5>
-<p>XOOPS Cube Legacy 2.1 では、ブロック管理から未使用ブロックのリストを切り離しました。
-モジュール管理のようなコンセプトになっています。</p>
Index: xoops2jp/html/modules/base/language/japanese/help/theme.html
diff -u xoops2jp/html/modules/base/language/japanese/help/theme.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/help/theme.html:removed
--- xoops2jp/html/modules/base/language/japanese/help/theme.html:1.1.2.1	Wed Aug  2 18:42:07 2006
+++ xoops2jp/html/modules/base/language/japanese/help/theme.html	Tue Nov  7 17:04:27 2006
@@ -1,46 +0,0 @@
-<p>
-テーマとは XOOPS Cube におけるスキン（外観）です。メイン・テーマを変更すると、着せ替え人形のように、あなたのサイトの見た目は大きく変わります。<br/>
-XOOPS Cube のためにテーマを配布しているテーマデザイナーのサイトから新しいテーマを入手して、サイトの見た目をカスタマイズしましょう。
-</p>
-
-<h4>メインテーマを変更してみよう</h4>
-<p>
-メインテーマとは、あなたのサイトにおけるデフォルトのテーマです。ひとつのサイトにつき、ひとつのメインテーマを指定できます。
-</p>
-<ol>
-  <li>互換モジュールのサイドメニューから「テーマの管理」をクリックしてください。
-  <li>メインテーマとして使用したいテーマの「選択」ボタンをクリックしてください。
-</ol>
-<p>
-設定が終わったら、公開サイトにアクセスしてみてみましょう。新しいデザインのサイトがあなたを待っています。
-</p>
-
-<h4>新しいテーマをインストールしてみよう</h4>
-<p>
-テーマデザイナーのサイトで新しいテーマを手に入れましょう。
-配布されているテーマはたいてい圧縮されています。解凍ソフトでファイルを展開してから、使用中の XOOPS Cube の themes ディレクトリへアップロードします。
-</p>
-
-<h5>テーマディレクトリに注意しましょう</h5>
-<ul>
-  <li>展開したテーマのディレクトリをXOOPS Cubeのルートディレクトリ下にあるthemesディレクトリへアップロードして下さい。</li>
-  <li>ディレクトリが二重にならないように、たとえばdefaultテーマであればdefaultディレクトリのすぐ下にtheme.htmlかpackage.ini.phpがある状態でアップロードします。</li>
-</ul>
-
-<h5>テーマの注意書きをよく読んで！</h5>
-<p>
-特定のテーマは、特定の<strong>「レンダーシステム」</strong>を必要とする場合があります。
-デフォルトで含まれている「互換レンダーシステム」は XOOPS2 のテーマ形式を扱うことができますが、レンダーシステムを追加すれば、異なるフォーマットのテーマを読み込んで使用することができるようになります。
-テーマに注意書きがある場合は、それをよく読んでから、テーマをインストールしてください。
-</p>
-
-<h4>訪問客に好きなテーマを選んでもらおう</h4>
-<p>
-訪問客に、あなたが指定したテーマリストから好きなテーマを選択させることができます。
-そのために、選択可能なテーマをリストアップして、「テーマ選択」ブロックをインストールする必要があります。
-</p>
-<ol>
-  <li>まず、テーマリストを作りましょう。互換モジュールのサイドメニューから「テーマの管理」をクリックしてください。</li>
-  <li>選択可能にしたいテーマをチェックして、送信ボタンをクリックしてください。</li>
-  <li>「テーマ選択」ブロックをインストールしてください。もし XOOPS Cube のブロックについて分らなければ、それについてのヘルプを参照してください。</li>
-</ol>
Index: xoops2jp/html/modules/base/language/japanese/help/index.html
diff -u xoops2jp/html/modules/base/language/japanese/help/index.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/help/index.html:removed
--- xoops2jp/html/modules/base/language/japanese/help/index.html:1.1.2.1	Mon Jun  5 18:30:10 2006
+++ xoops2jp/html/modules/base/language/japanese/help/index.html	Tue Nov  7 17:04:27 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/japanese/help/xoops2.html
diff -u xoops2jp/html/modules/base/language/japanese/help/xoops2.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/help/xoops2.html:removed
--- xoops2jp/html/modules/base/language/japanese/help/xoops2.html:1.1.2.1	Wed Aug  2 18:41:55 2006
+++ xoops2jp/html/modules/base/language/japanese/help/xoops2.html	Tue Nov  7 17:04:27 2006
@@ -1,46 +0,0 @@
-<h4>XOOPS2移行リスト</h4>
-<h5>まずはじめに</h5>
-<p>
-  systemモジュールの管理機能もすべて有効ですが、これは開発途中のためです。<br/>
-   すべての管理機能は各モジュールの管理機能へ適切に移行する予定です。
-</p>
-
-<h5>モジュールの管理</h5>
-<ul>
-<li>baseモジュールの管理からモジュールの管理を行うことが出来ます。</li>
-<li>今回、未インストールのモジュールとインストール済のモジュールは操作が分けられました。</li>
-<li>インストール済みのモジュールを管理する場合は「モジュールの管理」、新たにモジュールをインストールする場合は、「モジュールのインストール」を使ってください。</li>
-<li>インストーラはコールバックを行っていないなど、現在不完全な点があります。</li>
-<li>従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。baseモジュールでは、管理者に対してのみ権限を振っています。</li>
-</ul>
-
-<h5>ユーザーの管理</h5>
-<ul>
-<li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
-<li>このうち、メールに関しては移行を終えていません。</li>
-</ul>
-
-<h5>テーマの管理</h5>
-<ul>
-<li>テーマの管理は、各テーマエンジン（レンダーシステム）で行います。</li>
-<li>ＤＢテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。</li>
-</ul>
-
-<div style="color:red;">New!</div>
-<h5>ブロックの管理</h5>
-<ul>
-<li>XOOPS Cube 2.1 + Legacy モジュールでは、ブロックの考え方を整理し、「可視／不可視」をモジュール同様、<strong>インストール</strong>という概念で考えています。</li>
-<li>モジュールをインストールするとブロックも XOOPS Cube + Legacy に登録されますが、使用可能な状態ではありません。モジュールと同様に、ブロックのインストールリストへ進み、導入したいブロックのインストールアイコンをクリックしてください。</li>
-<li>アンインストールすると、そのブロックはインストール候補リストに戻ります。</li>
-<li>XOOPS Cube 2.1 では非インストールブロックには権限の概念も、アサイン列の概念も、アサインモジュールの概念もありません。ただし、設定は記憶されており、再インストール時の初期値は最後のパラメータが使用されます。</li>
-</ul>
-
-<h5>TODO</h5>
-<ul>
-<li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
-<li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
-<li>イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。</li>
-<li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
-</ul>
-
-

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:29 +0900
Subject: [xoops-cvslog 5655] CVS update: xoops2jp/html/modules/base/.xml/data
Message-ID: <20061107080429.0E28B2AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/.xml/data/imagecategory.cbs.xml
diff -u xoops2jp/html/modules/base/.xml/data/imagecategory.cbs.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/data/imagecategory.cbs.xml:removed
--- xoops2jp/html/modules/base/.xml/data/imagecategory.cbs.xml:1.1.2.1	Tue May  9 19:19:25 2006
+++ xoops2jp/html/modules/base/.xml/data/imagecategory.cbs.xml	Tue Nov  7 17:04:28 2006
@@ -1,22 +0,0 @@
-鏤??xml version="1.0" encoding="utf-8"?>
-<cubson-mapping>
-  <class name="imagecategory">
-    <id name="imgcat_id" type="XOBJ_DTYPE_INT" column="imgcat_id">
-      <generator type="increment" />
-    </id>
-    <property name="imgcat_name" type="XOBJ_DTYPE_STRING" column="imgcat_name" not-null="true" length="100" />
-    <property name="imgcat_maxsize" type="XOBJ_DTYPE_INT" column="imgcat_maxsize" not-null="true" default="50000" />
-    <property name="imgcat_maxwidth" type="XOBJ_DTYPE_INT" column="imgcat_maxwidth" not-null="true" default="120" />
-    <property name="imgcat_maxheight" type="XOBJ_DTYPE_INT" column="imgcat_maxheight" not-null="true" default="120" />
-    <property name="imgcat_display" type="XOBJ_DTYPE_BOOL" column="imgcat_display" not-null="true" default="1" />
-    <property name="imgcat_weight" type="XOBJ_DTYPE_INT" column="imgcat_weight" not-null="true" default="0" />
-    <property name="imgcat_type" type="XOBJ_DTYPE_STRING" column="imgcat_type" not-null="true" length="1" default="C" />
-    <property name="imgcat_storetype" type="XOBJ_DTYPE_STRING" column="imgcat_storetype" not-null="true" length="5" default="file" />
-    <set name="mImage">
-      <key>
-        <column name="imagecat_id" />
-      </key>
-      <one-to-many class="Entity.image" />
-    </set>
-  </class>
-</cubson-mapping>
\ No newline at end of file
Index: xoops2jp/html/modules/base/.xml/data/image.cbs.xml
diff -u xoops2jp/html/modules/base/.xml/data/image.cbs.xml:1.1.2.2 xoops2jp/html/modules/base/.xml/data/image.cbs.xml:removed
--- xoops2jp/html/modules/base/.xml/data/image.cbs.xml:1.1.2.2	Mon May 15 17:33:07 2006
+++ xoops2jp/html/modules/base/.xml/data/image.cbs.xml	Tue Nov  7 17:04:29 2006
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cubson-mapping>
-  <class name="image">
-    <id name="image_id" type="XOBJ_DTYPE_INT" column="image_id">
-      <generator type="increment" />
-    </id>
-    <property name="image_name" type="XOBJ_DTYPE_STRING" column="image_name" not-null="true" length="30" />
-    <property name="image_nicename" type="XOBJ_DTYPE_STRING" column="image_nicename" not-null="true" length="255" />
-    <property name="image_mimetype" type="XOBJ_DTYPE_STRING" column="image_mimetype" not-null="true" length="30" />
-    <property name="image_created" type="XOBJ_DTYPE_INT" column="image_created" not-null="true" default="0" />
-    <property name="image_display" type="XOBJ_DTYPE_BOOL" column="image_display" not-null="true" default="0" />
-    <property name="image_weight" type="XOBJ_DTYPE_INT" column="image_weight" not-null="true" default="0" />
-    <property name="imgcat_id" type="XOBJ_DTYPE_INT" column="imgcat_id" not-null="true" default="0" />
-    <many-to-one name="mImageCategory" column="imgcat_id" class="Entity.imagecategory" />
-    <one-to-one name="mImageBody" column="image_id" class="Entity.imagebody" />
-  </class>
-</cubson-mapping>
\ No newline at end of file
Index: xoops2jp/html/modules/base/.xml/data/imagebody.cbs.xml
diff -u xoops2jp/html/modules/base/.xml/data/imagebody.cbs.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/data/imagebody.cbs.xml:removed
--- xoops2jp/html/modules/base/.xml/data/imagebody.cbs.xml:1.1.2.1	Mon May 15 17:33:18 2006
+++ xoops2jp/html/modules/base/.xml/data/imagebody.cbs.xml	Tue Nov  7 17:04:29 2006
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<cubson-mapping>
-  <class name="imagebody">
-    <id name="image_id" type="XOBJ_DTYPE_INT" column="image_id" />
-    
-    <property name="image_body" type="XOBJ_DTYPE_TEXT" column="image_body" not-null="true" />
-    <one-to-one name="mImageBody" column="image_id" class="Entity.imagebody" />
-  </class>
-</cubson-mapping>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:29 +0900
Subject: [xoops-cvslog 5656] CVS update:
	xoops2jp/html/modules/base/templates/blocks
Message-ID: <20061107080429.BAB322AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_search.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_search.html:1.1.2.2 xoops2jp/html/modules/base/templates/blocks/legacy_block_search.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_search.html:1.1.2.2	Wed Mar 29 22:52:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_search.html	Tue Nov  7 17:04:29 2006
@@ -1,6 +0,0 @@
-<form style="margin-top: 0px;" action="<{$xoops_url}>/search.php" method="get">
-  <{xoops_input type=text name=query size=14 }>
-  <{xoops_input type=hidden name=action value=results }><br />
-  <{xoops_input type=submit name=submit value=$smarty.const._MB_BASE_SEARCH }>
-</form>
-<a href="<{$xoops_url}>/search.php"><{$smarty.const._MB_BASE_ADVS}></a>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_waiting.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_waiting.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_waiting.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_waiting.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_waiting.html	Tue Nov  7 17:04:29 2006
@@ -1,5 +0,0 @@
-<ul>
-<{foreach item=module from=$block.modules}>
-  <li><a href="<{$module.adminlink}>"><{$module.lang_linkname}></a>: <{$module.pendingnum}></li>
-<{/foreach}>
-</ul>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_siteinfo.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_siteinfo.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_siteinfo.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_siteinfo.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_siteinfo.html	Tue Nov  7 17:04:29 2006
@@ -1,27 +0,0 @@
-<table class="outer" cellspacing="0">
-<{if $block.showgroups == true}>
-<{foreach item=group from=$block.groups}>
-  <tr>
-    <th colspan="2"><{$group.name}></th>
-  </tr>
-<{foreach item=user from=$group.users}>
-  <tr>
-    <td class="even" valign="middle" align="center">
-      <img src="<{$user.avatar}>" alt="" width="32" /><br />
-      <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>"><{$user.name}></a>
-    </td>
-    <td class="odd" width="20%" align="right" valign="middle">
-      <{$user.msglink}>
-    </td>
-  </tr>
-<{/foreach}>
-<{/foreach}>
-<{/if}>
-</table>
-<br />
-<div style="margin: 3px; text-align:center;">
-  <img src="<{$block.logourl}>" alt="" border="0" /><br />
-<{if $block.recoomendtime != 0}>
-  <a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&amp;type=friend&amp;op=sendform&amp;t=<{$block.recoomendtime}>','friend',<{$block.popup_width}>,<{$block.popup_height}>)"><{$smarty.const._MB_BASE_RECO}></a>
-<{/if}>
-</div>
Index: xoops2jp/html/modules/base/templates/blocks/index.html
diff -u xoops2jp/html/modules/base/templates/blocks/index.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/index.html:removed
--- xoops2jp/html/modules/base/templates/blocks/index.html:1.1.2.1	Mon Mar 27 11:41:55 2006
+++ xoops2jp/html/modules/base/templates/blocks/index.html	Tue Nov  7 17:04:29 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_comments.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_comments.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_comments.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_comments.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_comments.html	Tue Nov  7 17:04:29 2006
@@ -1,11 +0,0 @@
-<table width="100%" cellspacing="1" class="outer">
-<{foreach item=comment from=$block.comments}>
-  <tr class="<{cycle values="even,odd"}>">
-    <td align="center"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
-    <td><{$comment.title}></td>
-    <td align="center"><{$comment.module}></td>
-    <td align="center"><{$comment.poster}></td>
-    <td align="right"><{$comment.time}></td>
-  </tr>
-<{/foreach}>
-</table>
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_notification.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_notification.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_notification.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_notification.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_notification.html	Tue Nov  7 17:04:29 2006
@@ -1,31 +0,0 @@
-<form action="<{$block.target_page}>" method="post">
-<table class="outer">
-<{foreach item=category from=$block.categories}>
-<{foreach name=inner item=event from=$category.events}>
-<{if $smarty.foreach.inner.first}>
-  <tr>
-    <td class="head" colspan="2">
-      <{$category.title}>
-    </td>
-  </tr>
-<{/if}>
-  <tr>
-    <td class="odd">
-      <{counter assign=index}>
-      <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
-      <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
-    </td>
-    <td class="odd">
-      <{$event.caption}>
-    </td>
-  </tr>
-<{/foreach}>
-<{/foreach}>
-  <tr>
-    <td class="foot" colspan="2">
-      <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>" />
-      <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
-    </td>
-  </tr>
-</table>
-</form>
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html:1.1.2.1	Wed Aug  2 18:47:25 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_themes.html	Tue Nov  7 17:04:29 2006
@@ -1,18 +0,0 @@
-<div style="text-align: center;">
-<form action="index.php" method="post">
-<{if $block.mode==1}>
-  <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" title="screenshot" width="<{$block.width}>" /><br />
-  <select id="xoops_theme_select" name="xoops_theme_select" onchange="showImgSelected('xoops_theme_img','xoops_theme_select','themes','/screenshot.png', '<{$xoops_url}>');">
-<{else}>
-  <select id="xoops_theme_select" name="xoops_theme_select" onchange="submit();" size="3">
-<{/if}>
-<{foreach item=theme_option from=$block.theme_options}>
-    <option value="<{$theme_option.name}>" <{$theme_option.selected}> ><{$theme_option.name}></option>
-<{/foreach}>
-  </select>
-<{if $block.mode==1}>
-  <input type="submit" value="<{$smarty.const._GO}>" />
-<{/if}>
-<br />(<{"<b>"|cat:$block.count|cat:"</b>"|string_format:$smarty.const._MB_BASE_LANG_NUMTHEME}>)<br />
-</form>
-</div>
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:1.1.2.2 xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:1.1.2.2	Mon Apr  3 14:43:58 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html	Tue Nov  7 17:04:29 2006
@@ -1,13 +0,0 @@
-<table cellspacing="0">
-  <tr>
-    <td id="mainmenu">
-      <a class="menuTop" href="<{$xoops_url}>/"><{$smarty.const._MB_BASE_HOME}></a>
-<{foreach item=module from=$block.modules}>
-      <a class="menuMain" href="<{$xoops_url}>/modules/<{$module.directory}>/"><{$module.name}></a>
-<{foreach item=sublink from=$module.sublinks}>
-        <a class="menuSub" href="<{$sublink.url}>"><{$sublink.name}></a>
-<{/foreach}>
-<{/foreach}>
-    </td>
-  </tr>
-</table>
Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:1.1.2.3 xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:removed
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:1.1.2.3	Mon Sep 25 18:37:55 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html	Tue Nov  7 17:04:29 2006
@@ -1,20 +0,0 @@
-<table cellspacing="0">
-  <tr>
-    <td id="usermenu">
-      <a class="menuTop" href="<{$xoops_url}>/user.php"><{$smarty.const._MB_BASE_VACNT}></a>
-      <a href="<{$xoops_url}>/edituser.php"><{$smarty.const._MB_BASE_EACNT}></a>
-      <a href="<{$xoops_url}>/notifications.php"><{$smarty.const._MB_BASE_NOTIF}></a>
-      <a href="<{$xoops_url}>/user.php?op=logout"><{$smarty.const._MB_BASE_LOUT}></a>
-      <{if $block.flagShowInbox}>
-        <{if $block.new_messages > 0}>
-          <a class="highlight" href="<{$block.inbox_url}>"><{$smarty.const._MB_BASE_INBOX}> (<span style="color:#ff0000; font-weight: bold;"><{$block.new_messages}></span>)</a>
-        <{else}>
-          <a href="<{$block.inbox_url}>"><{$smarty.const._MB_BASE_INBOX}></a>
-        <{/if}>
-      <{/if}>
-      <{if $block.show_adminlink}>
-        <a href="<{$xoops_url}>/admin.php"><{$smarty.const._MB_BASE_ADMENU}></a>
-      <{/if}>
-    </td>
-  </tr>
-</table>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:29 +0900
Subject: [xoops-cvslog 5657] CVS update:
	xoops2jp/html/modules/base/admin/blocks
Message-ID: <20061107080429.E78422AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10.2.3 xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:removed
--- xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php:1.1.2.10.2.3	Sat Oct 14 02:50:57 2006
+++ xoops2jp/html/modules/base/admin/blocks/AdminSideMenu.class.php	Tue Nov  7 17:04:29 2006
@@ -1,98 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * This is test menu block for control panel of legacy module.
- * This loads module objects by a permission of the current user.
- * Then this load module's adminmenu and module's information.
- *
- * [ASSIGN]
- *  Array of module objects.
- * 
- * @package legacy
- */
-class Legacy_AdminSideMenu extends Legacy_AbstractBlockProcedure
-{
-	var $mModules = array();
-	
-	/**
-	 * protected, but read OK.
-	 * 
-	 * @access protected
-	 */
-	var $mCurrentModule = null;
-
-	function getName()
-	{
-		return "sidemenu";
-	}
-
-	function getTitle()
-	{
-		return "TEST: AdminSideMenu";
-	}
-	
-	function getEntryIndex()
-	{
-		return 0;
-	}
-
-	function enableCache()
-	{
-		return false;
-	}
-
-	function execute()
-	{
-		$root =& XCube_Root::getSingleton();
-		
-		$controller =& $root->mController;
-		$user =& $root->mController->mRoot->mContext->mXoopsUser;
-		$render =& $this->getRenderBuffer();
-		
-		$this->mCurrentModule =& $controller->mRoot->mContext->mXoopsModule;
-		
-		if ($this->mCurrentModule->get('dirname') == 'base') {
-			if (xoops_getrequest('action') == "help") {
-				$moduleHandler =& xoops_gethandler('module');
-				$t_module =& $moduleHandler->getByDirname(xoops_gethandler('dirname'));
-				if (is_object($t_module)) {
-					$this->mCurrentModule =& $t_module;
-				}
-			}
-		}
-		
-		$db=&$controller->getDB();
-
-		$mod = $db->prefix("modules");
-		$perm = $db->prefix("group_permission");
-		$groups = implode(",", $user->getGroups());
-						 
-		$sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " .
-		       "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
-		       "ORDER BY ${mod}.weight, ${mod}.mid";
-
-		$result=$db->query($sql);
-		
-		$handler =& xoops_gethandler('module');
-		
-		while($row = $db->fetchArray($result)) {
-			$xoopsModule =& $handler->get($row['mid']);
-			$module =& Legacy_Utils::createModule($xoopsModule);
-
-			$this->mModules[] =& $module;
-			unset($module);
-		}
-		
-		$render->setTemplateName('legacy_admin_block_sidemenu.html');
-		$render->setAttribute('modules', $this->mModules);
-		$render->setAttribute('currentModule', $this->mCurrentModule);
-		
-		$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
-		
-		$renderSystem->renderBlock($render);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php
diff -u xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4.2.2 xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:removed
--- xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php:1.1.2.4.2.2	Thu Oct  5 18:06:54 2006
+++ xoops2jp/html/modules/base/admin/blocks/AdminActionSearch.class.php	Tue Nov  7 17:04:29 2006
@@ -1,63 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * This is test menu block for control panel of legacy module.
- *
- * [ASSIGN]
- *  No
- * 
- * @package legacy
- */
-class Legacy_AdminActionSearch extends Legacy_AbstractBlockProcedure
-{
-	function getName()
-	{
-		return "action_search";
-	}
-
-	function getTitle()
-	{
-		return "TEST: AdminActionSearch";
-	}
-
-	function getEntryIndex()
-	{
-		return 0;
-	}
-
-	function enableCached()
-	{
-		return false;
-	}
-
-	function execute()
-	{
-		$render =& $this->getRenderBuffer();
-		$render->setTemplateName('legacy_admin_block_actionsearch.html');
-		
-		$root =& XCube_Root::getSingleton();
-		$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
-		
-		$renderSystem->renderBlock($render);
-	}
-
-	function hasResult()
-	{
-		return true;
-	}
-
-	function &getResult()
-	{
-		$dmy = "dummy";
-		return $dmy;
-	}
-
-	function getRenderSystemName()
-	{
-		return 'Legacy_AdminRenderSystem';
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/blocks/index.html
diff -u xoops2jp/html/modules/base/admin/blocks/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/blocks/index.html:removed
--- xoops2jp/html/modules/base/admin/blocks/index.html:1.1.2.1	Mon Mar 27 11:41:52 2006
+++ xoops2jp/html/modules/base/admin/blocks/index.html	Tue Nov  7 17:04:29 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:30 +0900
Subject: [xoops-cvslog 5658] CVS update: xoops2jp/html/modules/base/include
Message-ID: <20061107080430.1E6562AC146@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/include/groupperm.php
diff -u xoops2jp/html/modules/base/include/groupperm.php:1.1.2.2 xoops2jp/html/modules/base/include/groupperm.php:removed
--- xoops2jp/html/modules/base/include/groupperm.php:1.1.2.2	Fri Sep 15 14:38:04 2006
+++ xoops2jp/html/modules/base/include/groupperm.php	Tue Nov  7 17:04:30 2006
@@ -1,84 +0,0 @@
-<?php
-/**
- * This file has been moved from XOOPS2 for some things which need
- * full-compatibility with XOOPS2.
- * 
- * @package Legacy
- * @version $Id: groupperm.php,v 1.1.2.2 2006/09/15 05:38:04 minahito Exp $
- */
-
-include '../../../include/cp_header.php';
-$modid = isset($_POST['modid']) ? intval($_POST['modid']) : 0;
-
-//
-// Load Message catalog
-//
-$root =& XCube_Root::getSingleton();
-$root->mLanguageManager->loadModuleAdminMessageCatalog('base');
-
-// we dont want system module permissions to be changed here
-if ($modid <= 1 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
-	redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
-	exit();
-}
-$module_handler =& xoops_gethandler('module');
-$module =& $module_handler->get($modid);
-if (!is_object($module) || !$module->getVar('isactive')) {
-	redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
-	exit();
-}
-$member_handler =& xoops_gethandler('member');
-$group_list =& $member_handler->getGroupList();
-if (is_array($_POST['perms']) && !empty($_POST['perms'])) {
-	$gperm_handler = xoops_gethandler('groupperm');
-	foreach ($_POST['perms'] as $perm_name => $perm_data) {
-		if (false != $gperm_handler->deleteByModule($modid, $perm_name)) {
-			if (is_array($perm_data['groups'])) {
-				foreach ($perm_data['groups'] as $group_id => $item_ids) {
-					foreach ($item_ids as $item_id => $selected) {
-						if ($selected == 1) {
-							// make sure that all parent ids are selected as well
-							if ($perm_data['parents'][$item_id] != '') {
-								$parent_ids = explode(':', $perm_data['parents'][$item_id]);
-								foreach ($parent_ids as $pid) {
-									if ($pid != 0 && !in_array($pid, array_keys($item_ids))) {
-										// one of the parent items were not selected, so skip this item
-										$msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>').' ('._MD_AM_PERMADDNGP.')';
-										continue 2;
-									}
-								}
-							}
-							$gperm =& $gperm_handler->create();
-							$gperm->setVar('gperm_groupid', $group_id);
-							$gperm->setVar('gperm_name', $perm_name);
-							$gperm->setVar('gperm_modid', $modid);
-							$gperm->setVar('gperm_itemid', $item_id);
-							if (!$gperm_handler->insert($gperm)) {
-								$msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
-							} else {
-								$msg[] = sprintf(_MD_AM_PERMADDOK, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
-							}
-							unset($gperm);
-						}
-					}
-				}
-			}
-		} else {
-			$msg[] = sprintf(_MD_AM_PERMRESETNG, $module->getVar('name').'('.$perm_name.')');
-		}
-	}
-}
-
-$backlink = XOOPS_URL.'/admin.php';
-if ($module->getVar('hasadmin')) {
-    $adminindex = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : $module->getInfo('adminindex');
-	if ($adminindex) {
-		$backlink = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$adminindex;
-	}
-}
-
-$msg[] = '<br /><br /><a href="'.$backlink.'">'._BACK.'</a>';
-xoops_cp_header();
-xoops_result($msg);
-xoops_cp_footer();
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php
diff -u xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php:1.1.2.1 xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php:removed
--- xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php:1.1.2.1	Wed Aug  9 18:39:39 2006
+++ xoops2jp/html/modules/base/include/xoops2_system_constants.inc.php	Tue Nov  7 17:04:30 2006
@@ -1,29 +0,0 @@
-<?php
-/**
- * This file defines constants which were defined in system module of XOOPS2.
- * Legacy module already has removed all codes which depend on these constants.
- * This file may be loaded by some developers who need these constants.
- * 
- * @package Legacy
- * @version $Id: xoops2_system_constants.inc.php,v 1.1.2.1 2006/08/09 09:39:39 minahito Exp $
- */
-
-if (!defined('XOOPS_SYSTEM_GROUP')) {
-	define('XOOPS_SYSTEM_GROUP', 1);
-	define('XOOPS_SYSTEM_USER', 2);
-	define('XOOPS_SYSTEM_PREF', 3);
-	define('XOOPS_SYSTEM_MODULE', 4);
-	define('XOOPS_SYSTEM_BLOCK', 5);
-	// define('XOOPS_SYSTEM_THEME', 6);
-	define('XOOPS_SYSTEM_FINDU', 7);
-	define('XOOPS_SYSTEM_MAILU', 8);
-	define('XOOPS_SYSTEM_IMAGE', 9);
-	define('XOOPS_SYSTEM_AVATAR', 10);
-	define('XOOPS_SYSTEM_URANK', 11);
-	define('XOOPS_SYSTEM_SMILE', 12);
-	define('XOOPS_SYSTEM_BANNER', 13);
-	define('XOOPS_SYSTEM_COMMENT', 14);
-	define('XOOPS_SYSTEM_TPLSET', 15);
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:30 +0900
Subject: [xoops-cvslog 5659] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20061107080430.561092AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.18 xoops2jp/html/modules/base/language/japanese/modinfo.php:removed
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.18	Fri Aug 18 20:28:34 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Tue Nov  7 17:04:30 2006
@@ -1,39 +0,0 @@
-<?php
-
-define('_MI_BASE_BLOCK_COMMENTS_DESC', "最近のコメント一覧を表示します");
-define('_MI_BASE_BLOCK_COMMENTS_NAME', "最近のコメント");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "メインメニューを表示します");
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "メインメニュー");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "イベント通知の設定フォームを表示します");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "イベント通知設定");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "検索フォームを表示します");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "検索");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報");
-define('_MI_BASE_BLOCK_THEMES_DESC', "テーマ選択フォームを表示します");
-define('_MI_BASE_BLOCK_THEMES_NAME', "テーマ選択");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー");
-define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します");
-define('_MI_BASE_BLOCK_WAITING_NAME', "承認待ちコンテンツ");
-define('_MI_BASE_KEYWORD_BLOCKINSTALL', "ブロック 新規");
-define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
-define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
-define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
-define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
-define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
-define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
-define('_MI_BASE_MENU_BLOCKINSTALL', "ブロックのインストール");
-define('_MI_BASE_MENU_BLOCKLIST', "ブロックの管理");
-define('_MI_BASE_MENU_COMMENT_MANAGE', "コメントの管理");
-define('_MI_BASE_MENU_CREATE_SMILES', "顔アイコンの新規作成");
-define('_MI_BASE_MENU_IMAGE_MANAGE', "イメージ・マネージャー");
-define('_MI_BASE_MENU_MODULEINSTALL', "モジュールのインストール");
-define('_MI_BASE_MENU_MODULELIST', "モジュールの管理");
-define('_MI_BASE_MENU_PREFERENCE', "一般設定");
-define('_MI_BASE_MENU_SMILES_MANAGE', "顔アイコンの管理");
-define('_MI_BASE_MENU_THEME_MANAGE', "テーマの管理");
-define('_MI_BASE_NAME', "互換モジュール");
-define('_MI_BASE_NAME_DESC', "XOOPS Cube にXOOPS 2.0.x シリーズの互換性を与えます");
-
-?>
Index: xoops2jp/html/modules/base/language/japanese/global.php
diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.11 xoops2jp/html/modules/base/language/japanese/global.php:removed
--- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.11	Mon Sep 25 18:37:32 2006
+++ xoops2jp/html/modules/base/language/japanese/global.php	Tue Nov  7 17:04:30 2006
@@ -1,203 +0,0 @@
-<?php
-
-define('_TOKEN_ERROR', '照合用のワンタイム・チケットが見つかりませんでした。ほとんどの場合は操作手順の関係でワンタイム・チケットが消費されただけですが、CSRF攻撃を受けた可能性もあります（この操作は本当にあなたが望んだ操作ですか？）　操作内容をしっかり確認し、もう一度操作を行ってください。');
-define('_SYSTEM_MODULE_ERROR', '以下のモジュールが導入されていません');
-define('_INSTALL','インストール');
-define('_UNINSTALL','削除');
-define('_SYS_MODULE_UNINSTALLED','必須(未導入)');
-define('_SYS_MODULE_DISABLED','必須(無効)');
-define('_SYS_RECOMMENDED_MODULES','導入推奨');
-define('_SYS_OPTION_MODULES','選択導入可能');
-define('_UNINSTALL_CONFIRM','必須モジュールのアンインストールを行いますか？');
-
-//%%%%%%	File Name mainfile.php 	%%%%%
-define('_PLEASEWAIT','しばらくお待ちください');
-define('_FETCHING','Loading...');
-define('_TAKINGBACK','元の場所へと戻ります....');
-define('_LOGOUT','ログアウト');
-define('_SUBJECT','表題');
-define('_MESSAGEICON','アイコン');
-define('_COMMENTS','コメント');
-define('_POSTANON','匿名で投稿');
-define('_DISABLESMILEY','顔アイコンを無効');
-define('_DISABLEHTML','HTMLタグを無効');
-define('_PREVIEW','プレビュー');
-
-define('_GO','送信');
-define('_NESTED','ネスト表示');
-define('_NOCOMMENTS','コメント非表示');
-define('_FLAT','フラット表示');
-define('_THREADED','スレッド表示');
-define('_OLDESTFIRST','古いものから');
-define('_NEWESTFIRST','新しいものから');
-define('_MORE','もっと...');
-define("_MULTIPAGE","[pagebreak]タグを本文内に記入することでページ区切りを挿入することができます。");
-define('_IFNOTRELOAD','ページが自動的に更新されない場合は<a href="%s">ここ</a>をクリックしてください');
-define('_WARNINSTALL2','注意：ファイル%sがサーバ上に存在します。インストール完了後は必ず削除してください。');
-define('_WARNINWRITEABLE','注意：ファイル%sへの書き込みが可能となっています。このファイルのパーミッション設定を変更してください。');
-define('_WARNPHPENV','注意：PHPの設定環境の中で、"%s" が "%s"になっています。%s');
-define('_WARNSECURITY','（サイトの脆弱につながる危険性があります。）');
-
-//%%%%%%	File Name themeuserpost.php 	%%%%%
-define('_POSTEDBY','投稿者：'); // Posted date
-define('_PROFILE','プロフィール');
-define('_VISITWEBSITE','ホームページ');
-define('_SENDPMTO','%sさんにプライベートメッセージを送る。');
-define('_SENDEMAILTO','%sさんにメールを送る。');
-define('_ADD','追加');
-define('_REPLY','返信');
-define('_DATE','投稿日時：');
-
-//%%%%%%	File Name admin_functions.php 	%%%%%
-define('_MAIN','トップ');
-define('_MANUAL','マニュアル');
-define('_INFO','バージョン情報');
-define('_CPHOME','管理メニュー');
-define('_YOURHOME','ホームページ');
-
-//%%%%%%	File Name misc.php (who's-online popup)	%%%%%
-define('_WHOSONLINE','オンライン状況'); 
-define('_GUESTS', 'ゲスト');
-define('_MEMBERS', '登録ユーザ');
-define('_ONLINEPHRASE','%s 人のユーザが現在オンラインです。');
-define('_ONLINEPHRASEX','%s 人のユーザが %s を参照しています。');
-define('_CLOSE','閉じる');  // Close window
-
-//%%%%%%	File Name module.textsanitizer.php 	%%%%%
-define('_QUOTEC','引用：');
-
-//%%%%%%	File Name admin.php 	%%%%%
-define('_NOPERM','このエリアへのアクセスは許可されていません。');
-
-//%%%%%		Common Phrases		%%%%%
-define('_NO','いいえ');
-define('_YES','はい');
-define('_EDIT','編集');
-define('_DELETE','削除');
-define('_VIEW','閲覧');
-define('_SUBMIT','送信');
-define('_MODULENOEXIST','選択されたページは存在しません');
-define('_ALIGN','位置');
-define('_LEFT','左');
-define('_CENTER','中央');
-define('_RIGHT','右');
-define('_FORM_ENTER', '%sを入力してください');
-// %s represents file name
-define('_MUSTWABLE','ファイル %s への書き込み権限があるかどうか確認してください。');
-
-define('_PREFERENCES', '一般設定');
-define('_VERSION', 'バージョン');
-define('_DESCRIPTION', '説明');
-define('_ERRORS', 'エラー');
-define('_NONE', 'なし');
-define('_ON','投稿日時：');
-define('_READS','ヒット');
-define('_WELCOMETO','%sへようこそ');
-define('_SEARCH','検索');
-define('_ALL', 'すべて');
-define('_TITLE', '題名');      //-no use
-define('_OPTIONS', 'オプション');
-define('_QUOTE', '引用');     //-no use
-define('_LIST', '一覧');
-define('_LOGIN','ログイン');
-define('_USERNAME','ユーザ名: ');
-define('_PASSWORD','パスワード: ');
-define('_SELECT','選択');
-define('_IMAGE','画像');
-define('_SEND','送信');
-define('_CANCEL','キャンセル');
-define('_ASCENDING','昇順');
-define('_DESCENDING','降順');
-define('_BACK', '戻る');
-define('_NOTITLE', '無題');
-define('_RETURN_TOP', 'Topへ戻る');
-
-/* Image manager */
-define('_IMGMANAGER','イメージ・マネジャー');
-define('_NUMIMAGES', '%s 枚');
-define('_ADDIMAGE','画像ファイルの追加');
-define('_IMAGENAME','画像名:');
-define('_IMGMAXSIZE','アップロードを許可するファイルサイズ(バイト数):');
-define('_IMGMAXWIDTH','アップロードを許可する画像の横幅（ピクセル数）:');
-define('_IMGMAXHEIGHT','アップロードを許可する画像の高さ（ピクセル数）:');
-define('_IMAGECAT','カテゴリ:');
-define('_IMAGEFILE','画像ファイル名:');
-define('_IMGWEIGHT','イメージマネジャーでの表示順:');
-define('_IMGDISPLAY','この画像を表示する');
-define('_IMAGEMIME','MIMEタイプ:');
-define('_FAILFETCHIMG', 'アップロードファイル %s が取得できませんでした。');
-define('_FAILSAVEIMG', '画像ファイル %s をデータベースに格納できませんでした。');
-define('_NOCACHE', 'キャッシュなし');
-define('_CLONE', '複製');
-
-
-
-//%%%%%	File Name class/xoopsform/formmatchoption.php 	%%%%%
-define('_STARTSWITH', '前方一致');
-define('_ENDSWITH', '後方一致');
-define('_MATCHES', '完全一致');
-define('_CONTAINS', '次の単語を含む');
-
-//%%%%%%	File Name commentform.php 	%%%%%
-define('_REGISTER','登録');
-
-//%%%%%%	File Name xoopscodes.php 	%%%%%
-define('_SIZE','大きさ');  // font size
-define('_FONT','フォント');  // font family
-define('_COLOR','色');  // font color
-define('_EXAMPLE','サンプル');
-define('_ENTERURL','リンクしたいサイトのURLを入力してください。');
-define('_ENTERWEBTITLE','サイト名を入力してください。');
-define('_ENTERIMGURL','画像ファイルのURLを入力してください。');
-define('_ENTERIMGPOS','画像ファイルの配置を決めてください。');
-define('_IMGPOSRORL','「R」または「r」を入力すると右側に、「L」または「l」を入力すると左側に表示されます。指定しない場合は空欄にしてください。');
-define('_ERRORIMGPOS','入力が正しくありません。画像ファイルの配置を決めてください。');
-define('_ENTEREMAIL','リンクしたいメールアドレスを入力してください。');
-define('_ENTERCODE','プログラムコードを入力してください。');
-define('_ENTERQUOTE','引用したい文を入力してください。');
-define('_ENTERTEXTBOX','テキストボックスに入力してください。');
-define('_ALLOWEDCHAR','最大バイト数：');
-define('_CURRCHAR','現在のバイト数：');
-define('_PLZCOMPLETE','表題およびメッセージ文を記入してください。');
-define('_MESSAGETOOLONG','メッセージ文が長すぎます。');
-
-//%%%%%		TIME FORMAT SETTINGS   %%%%%
-
-define("_DATESTRING","Y-n-j G:i:s");
-define("_MEDIUMDATESTRING","Y-n-j G:i");
-define("_SHORTDATESTRING","Y-n-j");
-
-define('_SECOND', '1秒');
-define('_SECONDS', '%s秒');
-define('_MINUTE', '1分');
-define('_MINUTES', '%s分');
-define('_HOUR', '1時間');
-define('_HOURS', '%s時間');
-define('_DAY', '1日');
-define('_DAYS', '%s日');
-define('_WEEK', '1週間');
-define('_MONTH', '1ヶ月');
-
-define('_HELP', "ヘルプ");
-
-//%%%%%		LANGUAGE SPECIFIC SETTINGS   %%%%%
-if (!defined('_CHARSET')) {
-	define('_CHARSET', 'EUC-JP');
-}
-
-if (!defined('_LANGCODE')) {
-	define('_LANGCODE', 'ja');
-}
-
-// change 0 to 1 if this language is a multi-bytes language
-define('XOOPS_USE_MULTIBYTES', '1');
-
-function xoops_language_trim($text)
-{
-	if (function_exists('mb_convert_kana')) {
-		$text = mb_convert_kana($text, 's');
-	}
-	$text = trim($text);
-	return $text;
-}
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.26.2.2 xoops2jp/html/modules/base/language/japanese/main.php:removed
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.26.2.2	Sat Oct 14 18:05:50 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Tue Nov  7 17:04:30 2006
@@ -1,55 +0,0 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
-define('_MD_BASE_ERROR_EMAIL', "{0}は不正なメールアドレスです");
-define('_MD_BASE_ERROR_INCORRECTLOGIN', "ログイン情報が間違っています。");
-define('_MD_BASE_ERROR_MASK', "{0}は入力フォーマットに反しています");
-define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
-define('_MD_BASE_ERROR_PERMISSION', "パーミッションエラー");
-define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_MD_BASE_ERROR_SEARCH_NOT_ENABLED', "検索が無効です");
-define('_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED', "有効な長さの検索キーワードを入力してください。");
-define('_MD_BASE_ERROR_YOU_MUST_UPLOAD', "画像をアップロードしてください");
-define('_MD_BASE_FORMAT_SEARCH_SEPARATOR', "/[\s,　]+/");
-define('_MD_BASE_LANG_ANDOR', "AndOr");
-define('_MD_BASE_LANG_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
-define('_MD_BASE_LANG_CODE', "コード");
-define('_MD_BASE_LANG_COM_EXPARAMS', "拡張パラメータ");
-define('_MD_BASE_LANG_COM_ICON', "アイコン");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "アイテムID");
-define('_MD_BASE_LANG_COM_MODID', "モジュール");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_TEXT', "コメント");
-define('_MD_BASE_LANG_COM_TITLE', "表題");
-define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
-define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
-define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
-define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
-define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
-define('_MD_BASE_LANG_EMOTION', "意味");
-define('_MD_BASE_LANG_ERROR', "エラー");
-define('_MD_BASE_LANG_FMAIL', "友達のEmail");
-define('_MD_BASE_LANG_FNAME', "友達の名前");
-define('_MD_BASE_LANG_IMAGE', "イメージ");
-define('_MD_BASE_LANG_IMAGE_FILE', "イメージファイル");
-define('_MD_BASE_LANG_IMAGE_MIMETYPE', "MIMEタイプ");
-define('_MD_BASE_LANG_IMAGE_NICENAME', "イメージ名");
-define('_MD_BASE_LANG_IMAGE_POSITION', "位置");
-define('_MD_BASE_LANG_IMAGE_UPLOAD', "画像のアップロード");
-define('_MD_BASE_LANG_MID', "mid");
-define('_MD_BASE_LANG_OPTION', "オプション");
-define('_MD_BASE_LANG_POST', "投稿する");
-define('_MD_BASE_LANG_PREV_PAGE', "前のページ");
-define('_MD_BASE_LANG_SHOW_ALL', "すべて表示");
-define('_MD_BASE_LANG_SMILIES', "顔アイコン");
-define('_MD_BASE_LANG_UID', "uid");
-define('_MD_BASE_LANG_YMAIL', "あなたのEmail");
-define('_MD_BASE_LANG_YNAME', "あなたの名前");
-define('_MD_BASE_MESSAGE_LOGGEDOUT', "ログアウトしました。");
-define('_MD_BASE_MESSAGE_LOGIN_SUCCESS', "{0}さん、ようこそ。ログイン処理中です");
-define('_MD_BASE_MESSAGE_THANKYOUFORVISIT', "当サイトをご利用いただきありがとうございました。");
-
-?>
Index: xoops2jp/html/modules/base/language/japanese/blocks.php
diff -u xoops2jp/html/modules/base/language/japanese/blocks.php:1.1.2.3 xoops2jp/html/modules/base/language/japanese/blocks.php:removed
--- xoops2jp/html/modules/base/language/japanese/blocks.php:1.1.2.3	Mon Sep 25 18:37:21 2006
+++ xoops2jp/html/modules/base/language/japanese/blocks.php	Tue Nov  7 17:04:30 2006
@@ -1,36 +0,0 @@
-<?php
-define("_MB_BASE_HOME",  "ホーム");
-
-define("_MB_BASE_VACNT", "アカウント情報");
-define("_MB_BASE_EACNT", "アカウント編集");
-define("_MB_BASE_NOTIF", "イベント通知機能");
-define("_MB_BASE_INBOX", "受信箱");
-define("_MB_BASE_LOUT",  "ログアウト");
-define("_MB_BASE_ADMENU","管理者メニュー");
-
-define("_MB_BASE_SEARCH","検索");
-define("_MB_BASE_ADVS",  "高度な検索");
-
-define("_MB_BASE_SUBMS", "新規投稿ニュース記事");
-define("_MB_BASE_WLNKS", "新規投稿リンク");
-define("_MB_BASE_BLNK",  "破損リンク報告");
-define("_MB_BASE_MLNKS", "修正リンク");
-define("_MB_BASE_WDLS",  "新規投稿ダウンロード情報");
-define("_MB_BASE_BFLS",  "破損ファイル報告");
-define("_MB_BASE_MFLS",  "修正ダウンロード情報");
-define("_MB_BASE_COMPEND", "コメント");
-
-define("_MB_BASE_RECO",  "当サイトを推薦する");
-define("_MB_BASE_PWWIDTH", "ポップアップウィンドウの横幅");
-define("_MB_BASE_PWHEIGHT","ポップアップウィンドウの高さ");
-define("_MB_BASE_LOGO",    "%s ディレクトリ内のロゴファイル名");  // %s is your root image directory name
-define("_MB_BASE_SADMIN",  "管理者グループを表示する");
-define("_MB_BASE_DISPLAYC","%s 件表示する");
-
-define("_MB_BASE_LANG_NUMTHEME", "%s テーマ");
-define("_MB_BASE_LANG_THSHOW", "スクリーンショット画像の表示");
-define("_MB_BASE_LANG_THWIDTH", "スクリーンショット画像のピクセル幅");
-
-define('_MB_BASE_LANG_RECOMMENDSITE', "当サイトを友達に薦める");
-
-?>
Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.59.2.1 xoops2jp/html/modules/base/language/japanese/admin.php:removed
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.59.2.1	Tue Oct 10 17:55:12 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Tue Nov  7 17:04:30 2006
@@ -1,359 +0,0 @@
-<?php
-
-define('_AD_BASE_ERROR_ACTION_SEARCH_NORESULT', "入力されたキーワードで検索結果を得ることができませんでした。");
-define('_AD_BASE_ERROR_ACTION_SEARCH_TRY_AGAIN', "キーワードを変えて再検索して下さい。");
-define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "ブロックテンプレート '{0}' のインストールに失敗しました");
-define('_AD_BASE_ERROR_BMODULE', "表示先のモジュールを１つ以上指定してください");
-define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "アクティブなモジュールをアンインストールすることはできません。アンインストーするには、モジュールのアクティブ・ステータスをオフにしてください。");
-define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "ブロックテンプレートを削除することができませんでした : {0}");
-define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "コンフィグ {0} をインサートできませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK', "ブロック {0} をインストールできませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE', "Could not install template");
-define('_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION', "管理権限を設定できませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION', "{0}ブロックのアクセス権限を設定できませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "{0}ブロックにおいて、モジュールとのリンクを設定できませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "アクセス権限を設定できませんでした");
-define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "システム管理権限を設定できませんでした");
-define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除できませんでした");
-define('_AD_BASE_ERROR_DROP_TABLE', "テーブル {0} をドロップできませんでした");
-define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
-define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "コールバック '{0}' を実行することができませんでした");
-define('_AD_BASE_ERROR_GROUPID', "最低１グループ以上にアクセス権限を与えてください");
-define('_AD_BASE_ERROR_IMG_FILESIZE', "画像の最大ファイルサイズは{0}バイトです");
-define('_AD_BASE_ERROR_IMG_SIZE', "画像の最大サイズは {0} x {1} です");
-define('_AD_BASE_ERROR_IMGCAT_READ_GROUPS', "最低１グループ以上にアクセス権限を与えてください");
-define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "{0} モジュールのインストールに失敗しました");
-define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
-define('_AD_BASE_ERROR_MIN', "{0}は{1}以上の数値を指定して下さい");
-define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "指定されたモジュールが見つかりませんでした");
-define('_AD_BASE_ERROR_NO_HELP_FILE', "ヘルプファイルが見つかりませんでした");
-define('_AD_BASE_ERROR_OBJECTEXIST', "{0}の値が不正です");
-define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
-define('_AD_BASE_ERROR_READGROUPS', "最低１グループ以上に使用権限を与えてください");
-define('_AD_BASE_ERROR_SEARCH_REQUIRED', "キーワードを入力して下さい");
-define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "{0}でSQLファイルが見つかりませんでした");
-define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "テンプレート '{0}' をアンインストールできませんでした");
-define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました");
-define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました");
-define('_AD_BASE_ERROR_UPLOADGROUPS', "最低１グループ以上にアップロード権限を与えてください");
-define('_AD_BASE_LANG_ACTIONSEARCH', "アクションサーチ");
-define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。<br/>管理メニューの位置を忘れたときに使いましょう (例)利用許諾文");
-define('_AD_BASE_LANG_ACTIVE', "アクティブ");
-define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加");
-define('_AD_BASE_LANG_ADMIN_MENU', "管理画面情報");
-define('_AD_BASE_LANG_ADMINMENU_HAS_MAIN', "管理画面");
-define('_AD_BASE_LANG_ADMINMENU_INDEX', "管理画面ページ");
-define('_AD_BASE_LANG_ADMINMENU_MENU', "管理メニュー設定ファイル");
-define('_AD_BASE_LANG_ADMINMENU_NAME', "管理画面名");
-define('_AD_BASE_LANG_ADMINMENU_URL', "管理画面URL");
-define('_AD_BASE_LANG_AGREE', "同意する");
-define('_AD_BASE_LANG_ALL_MODULE', "すべてのモジュール");
-define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール");
-define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス");
-define('_AD_BASE_LANG_AUTHOR', "作者");
-define('_AD_BASE_LANG_BCACHETIME', "キャッシュ");
-define('_AD_BASE_LANG_BID', "BID");
-define('_AD_BASE_LANG_BLOCK_EDIT', "ブロック編集");
-define('_AD_BASE_LANG_BLOCK_INSTALL', "ブロックのインストール");
-define('_AD_BASE_LANG_BLOCK_KEY', "キー");
-define('_AD_BASE_LANG_BLOCK_MOD', "モジュール");
-define('_AD_BASE_LANG_BLOCK_TYPE', "ブロックタイプ");
-define('_AD_BASE_LANG_BLOCK_UNINSTALL', "ブロックのアンインストール");
-define('_AD_BASE_LANG_BLOCK_VAL', "値");
-define('_AD_BASE_LANG_BLOCKS_INFO', "ブロック情報");
-define('_AD_BASE_LANG_C_TYPE', "タイプ");
-define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "中央ブロック - 中央");
-define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "中央ブロック - 左");
-define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "中央ブロック - 右");
-define('_AD_BASE_LANG_COM_CREATED', "作成日時");
-define('_AD_BASE_LANG_COM_MODIFIED', "編集日時");
-define('_AD_BASE_LANG_COM_SIG', "署名");
-define('_AD_BASE_LANG_COM_STATUS', "ステータス");
-define('_AD_BASE_LANG_COM_UID', "ユーザー");
-define('_AD_BASE_LANG_COMMENT_DELETE', "コメント削除");
-define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集");
-define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加");
-define('_AD_BASE_LANG_COMMENT_SVC', "コメント機能");
-define('_AD_BASE_LANG_COMMENT_VIEW', "コメント閲覧");
-define('_AD_BASE_LANG_CONFCAT_ID', "コンフィグカテゴリ ID");
-define('_AD_BASE_LANG_CONFCAT_NAME', "コンフィグカテゴリ名");
-define('_AD_BASE_LANG_CONFIG_INFO', "一般設定情報");
-define('_AD_BASE_LANG_CONFIG_KEY', "キー");
-define('_AD_BASE_LANG_CONFIG_VAL', "値");
-define('_AD_BASE_LANG_CONTENT', "コンテンツ");
-define('_AD_BASE_LANG_CONTROL', "操作");
-define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
-define('_AD_BASE_LANG_CTYPE_HTML', "HTMLタグ");
-define('_AD_BASE_LANG_CTYPE_PHP', "PHPスクリプト");
-define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "自動フォーマット（顔アイコン有効）");
-define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "自動フォーマット（顔アイコン無効）");
-define('_AD_BASE_LANG_CUSTOM_HTML', "カスタム(HTML)");
-define('_AD_BASE_LANG_CUSTOM_PHP', "カスタム(PHP)");
-define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "カスタム(顔アイコン有効)");
-define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "カスタム(顔アイコン無効)");
-define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "カスタムブロック削除");
-define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "カスタムブロック編集");
-define('_AD_BASE_LANG_DEACTIVATE', "非アクティブ");
-define('_AD_BASE_LANG_DIRNAME', "ディレクトリ名");
-define('_AD_BASE_LANG_DISPLAY', "表示");
-define('_AD_BASE_LANG_DOIMAGE', "[img]タグを有効にする");
-define('_AD_BASE_LANG_EDIT_FUNC', "編集用コールバック関数");
-define('_AD_BASE_LANG_FEATURE_SVC_INFO', "フューチャー機能情報");
-define('_AD_BASE_LANG_FORCE_MODE', "強制クリーンアップ:正常なアンインストールが不可能なケースでも、可能な限りアンインストールを続行し、データベースをクリーンにします");
-define('_AD_BASE_LANG_FORMAT', "形式");
-define('_AD_BASE_LANG_FUNC_FILE', "コールバック関数定義ファイル");
-define('_AD_BASE_LANG_FUNC_NUM', "関数ナンバ");
-define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "最新版を入手する");
-define('_AD_BASE_LANG_GROUPID', "グループ");
-define('_AD_BASE_LANG_ID', "ID");
-define('_AD_BASE_LANG_IMAGE_COUNT', "画像数");
-define('_AD_BASE_LANG_IMAGE_CREATED', "作成日");
-define('_AD_BASE_LANG_IMAGE_DELETE', "イメージの削除");
-define('_AD_BASE_LANG_IMAGE_DISPLAY', "表示");
-define('_AD_BASE_LANG_IMAGE_EDIT', "イメージの編集");
-define('_AD_BASE_LANG_IMAGE_ID', "ID");
-define('_AD_BASE_LANG_IMAGE_LIST', "イメージの一覧");
-define('_AD_BASE_LANG_IMAGE_NAME', "画像");
-define('_AD_BASE_LANG_IMAGE_NEW', "イメージの新規追加");
-define('_AD_BASE_LANG_IMAGE_WEIGHT', "表示順");
-define('_AD_BASE_LANG_IMAGECATEGORY_DELETE', "イメージカテゴリの削除");
-define('_AD_BASE_LANG_IMAGECATEGORY_EDIT', "イメージカテゴリの編集");
-define('_AD_BASE_LANG_IMAGECATEGORY_LIST', "イメージカテゴリの一覧");
-define('_AD_BASE_LANG_IMAGECATEGORY_NEW', "イメージカテゴリの新規追加");
-define('_AD_BASE_LANG_IMGCAT_DISPLAY', "表示");
-define('_AD_BASE_LANG_IMGCAT_ID', "カテゴリID");
-define('_AD_BASE_LANG_IMGCAT_MAXHEIGHT', "高さ(px)");
-define('_AD_BASE_LANG_IMGCAT_MAXSIZE', "容量(byte)");
-define('_AD_BASE_LANG_IMGCAT_MAXWIDTH', "横幅(px)");
-define('_AD_BASE_LANG_IMGCAT_NAME', "カテゴリ名");
-define('_AD_BASE_LANG_IMGCAT_READ_GROUPS', "イメージ・マネジャーの使用を許可するグループ");
-define('_AD_BASE_LANG_IMGCAT_STORETYPE', "保存先");
-define('_AD_BASE_LANG_IMGCAT_TYPE', "カテゴリタイプ");
-define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "イメージのアップロードを許可するグループ");
-define('_AD_BASE_LANG_IMGCAT_WEIGHT', "優先度");
-define('_AD_BASE_LANG_INFORMATION', "インフォメーション");
-define('_AD_BASE_LANG_INSTALL', "インストール");
-define('_AD_BASE_LANG_ISACTIVE', "アクティブ");
-define('_AD_BASE_LANG_LAST_MODIFIED', "最終更新日時");
-define('_AD_BASE_LANG_LASTUPDATE', "最終更新日");
-define('_AD_BASE_LANG_LCR', "右-中央-左");
-define('_AD_BASE_LANG_LIST', "一覧");
-define('_AD_BASE_LANG_MAINMENU_HAS_MAIN', "メインメニュー");
-define('_AD_BASE_LANG_MAINMENU_INFO', "メインメニュー情報");
-define('_AD_BASE_LANG_MOD_AUTHOR', "モジュール作者");
-define('_AD_BASE_LANG_MOD_BASIC_INFO', "モジュール概要");
-define('_AD_BASE_LANG_MOD_CREDITS', "署名＆メモ");
-define('_AD_BASE_LANG_MOD_DESC', "モジュール説明");
-define('_AD_BASE_LANG_MOD_DIR_NAME', "ディレクトリ名");
-define('_AD_BASE_LANG_MOD_LICENSE_INFO', "ライセンス情報");
-define('_AD_BASE_LANG_MOD_MID', "MID");
-define('_AD_BASE_LANG_MOD_NAME', "モジュール名");
-define('_AD_BASE_LANG_MODINSTALL', "モジュールのインストール");
-define('_AD_BASE_LANG_MODINSTALL_ADVICE', "_%s_ をインストールします。よろしいですか？");
-define('_AD_BASE_LANG_MODINSTALL_CONF', "モジュールインストールの確認");
-define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "安全のために : 使用する予定がないモジュールは、サーバーから削除しましょう");
-define('_AD_BASE_LANG_MODINSTALL_LOG', "モジュールインストール ログ");
-define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "モジュールインストール終了");
-define('_AD_BASE_LANG_MODLIST', "モジュール管理");
-define('_AD_BASE_LANG_MODULE_LICENSE', "ライセンス");
-define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "_%s_ をアンインストールします。よろしいですか？");
-define('_AD_BASE_LANG_MODUNINSTALL_CONF', "モジュールアンインストールの確認");
-define('_AD_BASE_LANG_MODUNINSTALL_LOG', "モジュールアンインストール ログ");
-define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "モジュールアンインストール終了");
-define('_AD_BASE_LANG_MODUPDATE_ADVICE', "_%s_ をアップデートします。よろしいですか？");
-define('_AD_BASE_LANG_MODUPDATE_CONF', "モジュールアップデートの確認");
-define('_AD_BASE_LANG_MODUPDATE_LOG', "モジュールアップデート ログ");
-define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "モジュールアップデート終了");
-define('_AD_BASE_LANG_NAME', "名前");
-define('_AD_BASE_LANG_NO', "いいえ");
-define('_AD_BASE_LANG_NO_ADMINMENU', "管理画面情報は設定されていません");
-define('_AD_BASE_LANG_NO_AGREE', "同意しない");
-define('_AD_BASE_LANG_NO_BLOCK', "ブロック情報は設定されていません");
-define('_AD_BASE_LANG_NO_CHANGE', "変更なし");
-define('_AD_BASE_LANG_NO_CONFIG', "一般設定情報は設定されていません");
-define('_AD_BASE_LANG_NO_MAINMENU', "メインメニュー情報は設定されていません");
-define('_AD_BASE_LANG_NO_SETTING', "管理画面はありません");
-define('_AD_BASE_LANG_NO_SQL', "SQL情報は設定されていません");
-define('_AD_BASE_LANG_NO_SUBMENU', "サブメニューは設定されていません");
-define('_AD_BASE_LANG_NO_TEMPLATE', "テンプレート情報は設定されていません");
-define('_AD_BASE_LANG_NONE', "なし");
-define('_AD_BASE_LANG_NOTIF_SVC', "イベント通知機能");
-define('_AD_BASE_LANG_OPTIONS', "オプション");
-define('_AD_BASE_LANG_PACKAGE', "パッケージ情報");
-define('_AD_BASE_LANG_RENDER', "レンダーシステム");
-define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス");
-define('_AD_BASE_LANG_RESULT', "検索結果");
-define('_AD_BASE_LANG_SEARCH', "検索");
-define('_AD_BASE_LANG_SEARCH_SVC', "検索機能");
-define('_AD_BASE_LANG_SELECTED', "選択");
-define('_AD_BASE_LANG_SHOW_FUNC', "表示用コールバック関数");
-define('_AD_BASE_LANG_SIDE', "表示サイド");
-define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "サイドブロック - 左");
-define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "サイドブロック - 右");
-define('_AD_BASE_LANG_SMARTY', "Smarty");
-define('_AD_BASE_LANG_SMILE_URL', "画像");
-define('_AD_BASE_LANG_SMILES_DELETE', "顔アイコン削除");
-define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");
-define('_AD_BASE_LANG_SMILES_NEW', "顔アイコン新規追加");
-define('_AD_BASE_LANG_SQL_ENGINE', "SQLエンジン");
-define('_AD_BASE_LANG_SQL_FILE_NAME', "SQLファイル名");
-define('_AD_BASE_LANG_SQL_HAS_MAIN', "SQLの使用");
-define('_AD_BASE_LANG_SQL_INFO', "SQL情報");
-define('_AD_BASE_LANG_SQL_MYSQL', "MySQL");
-define('_AD_BASE_LANG_SUBMENU_NAME', "サブメニュー名");
-define('_AD_BASE_LANG_SUBMENU_URL', "サブメニューURL");
-define('_AD_BASE_LANG_TABLE_NAME', "テーブル名");
-define('_AD_BASE_LANG_TABLE_NUM', "No");
-define('_AD_BASE_LANG_TABLE_PROPERTIES', "テーブル構造");
-define('_AD_BASE_LANG_TARGET_GROUPS', "アクセス権のあるグループ");
-define('_AD_BASE_LANG_TARGET_MODULES', "表示先のモジュール");
-define('_AD_BASE_LANG_TEMPLATE', "テンプレート");
-define('_AD_BASE_LANG_TEMPLATE_DESC', "テンプレートの説明");
-define('_AD_BASE_LANG_TEMPLATE_ENGINE', "テンプレート エンジン");
-define('_AD_BASE_LANG_TEMPLATE_FILE', "テンプレート ファイル名");
-define('_AD_BASE_LANG_TEMPLATE_HAS_MAIN', "テンプレートの使用");
-define('_AD_BASE_LANG_TEMPLATE_INFO', "テンプレート情報");
-define('_AD_BASE_LANG_TEMPLATE_KEY', "キー");
-define('_AD_BASE_LANG_THEME', "テーマ");
-define('_AD_BASE_LANG_THEME_ADMIN', "テーマ管理");
-define('_AD_BASE_LANG_TITLE', "タイトル");
-define('_AD_BASE_LANG_TOPPAGE', "トップページ");
-define('_AD_BASE_LANG_UNINSTALL', "アンインストール");
-define('_AD_BASE_LANG_UPDATE', "アップデート");
-define('_AD_BASE_LANG_VERSION', "バージョン");
-define('_AD_BASE_LANG_VISIBLE', "可視");
-define('_AD_BASE_LANG_WEIGHT', "並び順");
-define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "ブロック {0} をアンインストールしました");
-define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "ブロック {0} をインストールしました");
-define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
-define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "以下のデータを本当に削除しますか？");
-define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "データベーステーブルのセットアップを終了しました");
-define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除しました");
-define('_AD_BASE_MESSAGE_DROP_TABLE', "テーブル {0} をドロップしました");
-define('_AD_BASE_MESSAGE_INSERT_CONFIG', "コンフィグ {0} を追加しました");
-define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのインストールに成功しました");
-define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "テンプレート {0} をインストールしました");
-define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのアンインストールに成功しました");
-define('_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL', "{0} ブロックのアンインストールに成功しました");
-define('_AD_BASE_MESSAGE_UPDATE_STARTED', "アップデートを開始します");
-define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "{0} モジュールのアップデートに成功しました");
-define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "<a href=\"index.php?action=BlockInstallList\">新しいブロックをインストール</a>して、サイトをカスタマイズしましょう。<br/>モジュール付属のブロック以外にも、<a href=\"index.php?action=CustomBlockEdit\">カスタムブロックを追加</a>して、自由なメッセージをブロックカラムに追加できます。");
-define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Ｑ：ブロックをアンインストールすると？<br/>Ａ：すべての設定を記録したまま、表示やリストから消えます。設定を記録してますので、簡単に再インストールすることができます。");
-define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Ｑ：カスタムブロックをアンインストールすると？<br/>Ａ：削除されずに、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。");
-define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "イメージ・ファイルの保存先に、ファイルシステムもしくはデータベースを選択できます。この設定は後から変更できません。<br />データベースへの保存はBLOBというバックアップやリストアに不向きなフォーマットが用いられることに注意しましょう。");
-define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。<br/>ウェルカムメッセージなど、文章を表示したい場合は、<a href=\"index.php?action=CustomBlockEdit\">カスタムブロックを追加</a>しましょう。");
-define('_AD_BASE_TIPS_THEME_ADMIN', "選択ボタンを押して、このサイトの外観をお好みのテーマに変更しましょう。<br/>ユーザーにテーマを選択させたいですか？　チェックボックスにチェックを入れて、「テーマ選択ブロック」にリストアップしてください。詳しくはヘルプをご覧ください。");
-define('_MD_AM_ADMINML', "管理者メールアドレス");
-define('_MD_AM_ADMNOTSET', "管理者のメールアドレスが設定されていません。");
-define('_MD_AM_ALLOWHTML', "コメント文においてHTMLタグの使用を許可する");
-define('_MD_AM_ALLOWIMAGE', "投稿への画像ファイルの表示を許可する");
-define('_MD_AM_ALLOWREG', "新規ユーザの登録を許可する");
-define('_MD_AM_ALLOWREGDSC', "「はい」を選択すると新規ユーザの登録を許可します。");
-define('_MD_AM_ALLOWTHEME', "サイトテーマの選択を許可する");
-define('_MD_AM_ALWDHTML', "投稿文の中で使用可能なHTMLタグ");
-define('_MD_AM_ANONNAME', "未登録ユーザの表示名");
-define('_MD_AM_ANONPOST', "未登録ユーザの投稿を許可する");
-define('_MD_AM_BADIPS', "このサイトへのアクセス拒否IPを入れてください。<br />IPとIPの間は<b>|</b>で区切ってください。大文字小文字は区別しません。正規表現が使用可能です。");
-define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc は それで始まる IPアドレスからのアクセスを拒否します。<br />aaa.bbb.ccc$ は それで終わる IPアドレスからのアクセスを拒否します。<br />aaa.bbb.ccc はその IPアドレスを含むアドレスからのアクセスを拒否します。");
-define('_MD_AM_CENSOR', "禁止用語設定");
-define('_MD_AM_CENSORRPLC', "禁止用語を置き換える文字列:");
-define('_MD_AM_CENSORRPLCDSC', "禁止用語がこのテキストボックスで指定した文字列に置き換えられます。");
-define('_MD_AM_CENSORWRD', "禁止用語");
-define('_MD_AM_CENSORWRDDSC', "ユーザが投稿する際に使用を禁止ｓする文字列を入力してください。文字列と文字列の間は <br /> | で区切り、大文字小文字は区別しません。");
-define('_MD_AM_CHNGUTHEME', "全てのユーザのテーマを変更する");
-define('_MD_AM_CLOSESITE', "サイトを閉鎖する");
-define('_MD_AM_CLOSESITEDSC', "特定グループ以外はサイトにアクセスすることができないようにします。");
-define('_MD_AM_CLOSESITEOK', "サイト閉鎖時でもアクセスが認められているグループ");
-define('_MD_AM_CLOSESITEOKDSC', "デフォルトの管理者グループは常にアクセスできます");
-define('_MD_AM_CLOSESITETXT', "サイト閉鎖の理由");
-define('_MD_AM_CLOSESITETXTDSC', "サイト閉鎖時に表示します");
-define('_MD_AM_COMMODE', "デフォルトのコメント表示モード");
-define('_MD_AM_COMORDER', "デフォルトのコメント表示順");
-define('_MD_AM_DEBUGMODE', "デバッグモードを有効にする");
-define('_MD_AM_DEBUGMODE0', "オフ");
-define('_MD_AM_DEBUGMODE1', "PHPデバグ");
-define('_MD_AM_DEBUGMODE2', "MySQL/Blocksデバグ");
-define('_MD_AM_DEBUGMODE3', "Smartyテンプレート・デバグ");
-define('_MD_AM_DEBUGMODEDSC', "（デバッグ用に使用してください。実際のサイト運営時には解除してください。）");
-define('_MD_AM_DEFAULTTZ', "デフォルト・タイムゾーン");
-define('_MD_AM_DOBADIPS', "IPアクセス拒否を有効にしますか？");
-define('_MD_AM_DOBADIPSDSC', "アクセス拒否IPからのユーザはあなたのサイトには入れません。");
-define('_MD_AM_DOCENSOR', "禁止用語処理を有効にする");
-define('_MD_AM_DOCENSORDSC', "このオプションを有効にすると禁止用語のチェックを行うようになります。このオプションを無効にすることでサイトの処理速度が向上するかもしれません。");
-define('_MD_AM_DONTCHNG', "以下は絶対に変更しないで下さい");
-define('_MD_AM_DOSEARCH', "グローバルサーチを有効にする");
-define('_MD_AM_DOSEARCHDSC', "サイト内の投稿/記事の全検索を行います。");
-define('_MD_AM_DTHEME', "デフォルト・サイトテーマ");
-define('_MD_AM_DTPLSET', "デフォルトのテンプレート・セット");
-define('_MD_AM_GENERAL', "一般設定");
-define('_MD_AM_IFUCANT', "もしファイルのアクセス権限を変更できない場合は、このファイルを直接編集してください。");
-define('_MD_AM_INVLDMINPASS', "パスワードの最低文字数が正しくありません。");
-define('_MD_AM_INVLDSCOOK', "セッションIDクッキーの名称が正しくありません。");
-define('_MD_AM_INVLDSEXP', "セッションのタイムアウト時間が正しくありません。");
-define('_MD_AM_INVLDUCOOK', "ユーザクッキーの名称が正しくありません。");
-define('_MD_AM_IPBAN', "IP Banning");
-define('_MD_AM_LANGUAGE', "使用言語");
-define('_MD_AM_LOADINGIMG', "「loading..」画像を表示させる");
-define('_MD_AM_MAILER', "メール設定");
-define('_MD_AM_MAILER_', "");
-define('_MD_AM_MAILER_MAIL', "");
-define('_MD_AM_MAILER_SENDMAIL', "");
-define('_MD_AM_MAILERMETHOD', "メール送信方法");
-define('_MD_AM_MAILERMETHODDESC', "メールを送信する方法を選択してください。デフォルトではPHPのmail()関数を使用します。");
-define('_MD_AM_MAILFROM', "送信者メールアドレス");
-define('_MD_AM_MAILFROMDESC', "");
-define('_MD_AM_MAILFROMNAME', "送信者");
-define('_MD_AM_MAILFROMNAMEDESC', "メール送信の際に送信者として表示される名前を入力してください");
-define('_MD_AM_MAILFROMUID', "PM送信者");
-define('_MD_AM_MAILFROMUIDDESC', "プライベートメッセージ送信の際に送信者としてデフォルト表示されるユーザを選択してください");
-define('_MD_AM_MINSEARCH', "キーワード最低文字数");
-define('_MD_AM_MINSEARCHDSC', "ユーザが検索を行う際に必要なキーワードの最低文字数を指定してください。");
-define('_MD_AM_MODCACHE', "モジュール・キャッシュ");
-define('_MD_AM_MODCACHEDSC', "各モジュールのコンテンツをキャッシュしておく時間の長さを指定してください。モジュールに既にキャッシュ機能がある場合は「キャッシュしない」を選択することをお勧めします。ブロック・キャッシュは含まれません。");
-define('_MD_AM_MODCONFIG', "モジュール設定オプション");
-define('_MD_AM_MYIP', "あなたのIPアドレスを入力してください。");
-define('_MD_AM_MYIPDSC', "このIPは、バナーのインプレッションおよびサイト統計においてカウントされません。");
-define('_MD_AM_NO', "いいえ");
-define('_MD_AM_NOMODULE', "キャッシュ可能なモジュールはありません。");
-define('_MD_AM_NONE', "なし");
-define('_MD_AM_NOTIFYTO', "通知先グループ");
-define('_MD_AM_PERMADDNG', "グループ・パーミッションの追加に失敗しました（パーミッション名：%s 対象アイテム：%s 対象グループ：%s）");
-define('_MD_AM_PERMADDNGP', "このアイテムの上位アイテム全てにパーミッションを与える必要があります");
-define('_MD_AM_PERMADDOK', "グループ・パーミッションを追加しました（パーミッション名：%s 対象アイテム：%s 対象グループ：%s）");
-define('_MD_AM_PERMRESETNG', "「%s」モジュールのグループ・パーミッション設定の初期化に失敗しました");
-define('_MD_AM_PREFMAIN', "システム設定メイン");
-define('_MD_AM_REMEMBER', "このファイルをウェブ上の管理者画面から編集できるようにするには、このファイルのアクセス権限を666（chmod 666）に設定する必要があります。");
-define('_MD_AM_SEARCH', "検索オプション");
-define('_MD_AM_SENDMAILPATH', "sendmailへのパス");
-define('_MD_AM_SENDMAILPATHDESC', "sendmailへのフルパスを記入してください");
-define('_MD_AM_SERVERTZ', "サーバのタイムゾーン");
-define('_MD_AM_SESSEXPIRE', "セッションがタイムアウトするまでの時間(単位：分）");
-define('_MD_AM_SESSEXPIREDSC', "セッションがタイムアウトするまでの時間を分単位で指定してください。（「セッションの設定をカスタマイズする」が有効の場合のみ）");
-define('_MD_AM_SESSNAME', "セッションIDの保存に使用するクッキーの名称");
-define('_MD_AM_SESSNAMEDSC', "このクッキーに保存されるセッションIDは、セッションがタイムアウトするか、ユーザがログアウトするまでの間有効です。（「セッションの設定をカスタマイズする」が有効の場合のみ）");
-define('_MD_AM_SITECACHE', "サイト・キャッシュ");
-define('_MD_AM_SITECACHEDSC', "サイト内のコンテンツをモジュール別にキャッシュします。サイト・キャッシュは、モジュール独自のキャッシュ機能（ある場合）よりも優先されます。");
-define('_MD_AM_SITENAME', "サイト名");
-define('_MD_AM_SITEPREF', "サイト一般設定");
-define('_MD_AM_SLOGAN', "サイト副題");
-define('_MD_AM_SMTPHOST', "SMTPサーバアドレス");
-define('_MD_AM_SMTPHOSTDESC', "SMTPサーバのアドレスの一覧を記入してください。");
-define('_MD_AM_SMTPPASS', "SMTPAuthパスワード");
-define('_MD_AM_SMTPPASSDESC', "SMTPAuthを使用してSMTPサーバにアクセスするためのパスワード");
-define('_MD_AM_SMTPUSER', "SMTPAuthユーザ名");
-define('_MD_AM_SMTPUSERDESC', "SMTPAuthを使用してSMTPサーバにアクセスするためのユーザ名");
-define('_MD_AM_SSLLINK', "SSLログインページへのURL");
-define('_MD_AM_SSLPOST', "SSLログイン時に使用するPOST変数の名称");
-define('_MD_AM_STARTPAGE', "開始モジュール");
-define('_MD_AM_THEMEFILE', "themes/ ディレクトリからの自動アップデートを有効にする");
-define('_MD_AM_THEMEFILEDSC', "現在使用中のテーマよりも更新日時が新しいファイルが themes/ディレクトリ下にある場合に、自動的にデータベース内のデータを更新します。サイト公開時には無効にする事をお勧めします。");
-define('_MD_AM_THEMEOK', "選択可能なテーマ");
-define('_MD_AM_THEMEOKDSC', "ユーザが選択することのできるテーマファイルを指定してください");
-define('_MD_AM_THEMESET', "テーマ・セット");
-define('_MD_AM_USEGZIP', "gzip圧縮を使用する");
-define('_MD_AM_USEMYSESS', "セッションの設定をカスタマイズする");
-define('_MD_AM_USEMYSESSDSC', "セッションの設定のカスタマイズ（セッションがタイムアウトするまでの時間の設定や、セッション名の変更）を行えます");
-define('_MD_AM_USESSL', "ログインにSSLを使用する");
-define('_MD_AM_YES', "はい");
-
-?>
Index: xoops2jp/html/modules/base/language/japanese/index.html
diff -u xoops2jp/html/modules/base/language/japanese/index.html:1.1.2.1 xoops2jp/html/modules/base/language/japanese/index.html:removed
--- xoops2jp/html/modules/base/language/japanese/index.html:1.1.2.1	Mon Mar 27 11:41:55 2006
+++ xoops2jp/html/modules/base/language/japanese/index.html	Tue Nov  7 17:04:30 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/japanese/charset_mysql.php
diff -u xoops2jp/html/modules/base/language/japanese/charset_mysql.php:1.1.2.2 xoops2jp/html/modules/base/language/japanese/charset_mysql.php:removed
--- xoops2jp/html/modules/base/language/japanese/charset_mysql.php:1.1.2.2	Sat Jun 17 00:46:01 2006
+++ xoops2jp/html/modules/base/language/japanese/charset_mysql.php	Tue Nov  7 17:04:30 2006
@@ -1,8 +0,0 @@
-<?php
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET NAMES ujis */");
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET SESSION character_set_database=ujis */");
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET SESSION character_set_server=ujis */");
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET SESSION collation_connection=ujis_japanese_ci */");
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET SESSION collation_database=ujis_japanese_ci */");
-    $GLOBALS['xoopsDB']->queryF("/*!41000 SET SESSION collation_server=ujis_japanese_ci */");
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:30 +0900
Subject: [xoops-cvslog 5660] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20061107080430.CA7432AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/SearchShowallForm.class.php
diff -u xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:removed
--- xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:1.1.2.3.2.2	Fri Sep 29 17:14:09 2006
+++ xoops2jp/html/modules/base/forms/SearchShowallForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,42 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchResultsForm.class.php";
-
-class Legacy_SearchShowallForm extends Legacy_SearchResultsForm
-{
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['mid'] =& new XCube_IntProperty('mid');
-		$this->mFormProperties['andor'] =& new XCube_StringProperty('andor');
-		$this->mFormProperties['query'] =& new XCube_StringProperty('query');
-		$this->mFormProperties['start'] =& new XCube_IntProperty('start');
-	
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['andor'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['andor']->setDependsByArray(array('mask'));
-		$this->mFieldProperties['andor']->addMessage('required', _MD_BASE_ERROR_MASK, _MD_BASE_LANG_ANDOR);
-		$this->mFieldProperties['andor']->addVar('mask', '/^(AND|OR|exact)$/i');
-
-		$this->set('start', 0);
-	}
-	
-	function update(&$params)
-	{
-		$params['queries'] = $this->mQueries;
-		$params['andor'] = $this->get('andor');
-		$params['maxhit'] = LEGACY_SEARCH_SHOWALL_MAXHIT;
-		$params['start'] = $this->get('start');
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/SearchResultsForm.class.php
diff -u xoops2jp/html/modules/base/forms/SearchResultsForm.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/forms/SearchResultsForm.class.php:removed
--- xoops2jp/html/modules/base/forms/SearchResultsForm.class.php:1.1.2.3.2.2	Fri Sep 29 17:14:09 2006
+++ xoops2jp/html/modules/base/forms/SearchResultsForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-class Legacy_SearchResultsForm extends XCube_ActionForm
-{
-	var $mQueries = array();
-	var $_mKeywordMin = 0;
-	
-	function Legacy_SearchResultsForm($keywordMin)
-	{
-		parent::XCube_ActionForm();
-		$this->_mKeywordMin = intval($keywordMin);
-	}
-		
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['mids'] =& new XCube_IntArrayProperty('mids');
-		$this->mFormProperties['andor'] =& new XCube_StringProperty('andor');
-		$this->mFormProperties['query'] =& new XCube_StringProperty('query');
-	
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['andor'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['andor']->setDependsByArray(array('mask'));
-		$this->mFieldProperties['andor']->addMessage('required', _MD_BASE_ERROR_MASK, _MD_BASE_LANG_ANDOR);
-		$this->mFieldProperties['andor']->addVar('mask', '/^(AND|OR|exact)$/i');
-	}
-	
-	function fetch()
-	{
-		parent::fetch();
-		
-		$t_queries = array();
-		
-		$myts =& MyTextSanitizer::getInstance();
-		if ($this->get('andor') == 'exact' && strlen($this->get('query')) >= $this->_mKeywordMin) {
-			$this->mQueries[] = $myts->addSlashes($this->get('query'));
-		}
-		else {
-			$separator = '/[\s,]+/';
-			if (defined('_MD_BASE_FORMAT_SEARCH_SEPARATOR')) {
-				$separator = _MD_BASE_FORMAT_SEARCH_SEPARATOR;
-			}
-		
-			$tmpArr = preg_split($separator, $this->get('query'));
-			foreach ($tmpArr as $tmp) {
-				if (strlen($tmp) >= $this->_mKeywordMin) {
-					$this->mQueries[] = $myts->addSlashes($tmp);
-				}
-			}
-		}
-		
-		$this->set('query', implode(" ", $this->mQueries));
-	}
-	
-	function validate()
-	{
-		parent::validate();
-		
-		if (!count($this->mQueries)) {
-			$this->addErrorMessage(_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED);
-		}
-	}
-	
-	function update(&$params)
-	{
-		$mids = $this->get('mids');
-		if (count($mids) > 0) {
-			$params['mids'] = $mids;
-		}
-		
-		$params['queries'] = $this->mQueries;
-		$params['andor'] = $this->get('andor');
-		$params['maxhit'] = LEGACY_SEARCH_RESULT_MAXHIT;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/SearchShowallbyuserForm.class.php
diff -u xoops2jp/html/modules/base/forms/SearchShowallbyuserForm.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/forms/SearchShowallbyuserForm.class.php:removed
--- xoops2jp/html/modules/base/forms/SearchShowallbyuserForm.class.php:1.1.2.3.2.2	Fri Sep 29 17:14:09 2006
+++ xoops2jp/html/modules/base/forms/SearchShowallbyuserForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,42 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-require_once XOOPS_MODULE_PATH . "/base/forms/SearchShowallForm.class.php";
-
-class Legacy_SearchShowallbyuserForm extends XCube_ActionForm
-{
-	function prepare()
-	{
-		parent::prepare();
-		
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
-		$this->mFormProperties['mid'] =& new XCube_IntProperty('mid');
-		$this->mFormProperties['start'] =& new XCube_IntProperty('start');
-		
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['uid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['uid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['uid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_UID);
-		
-		$this->mFieldProperties['mid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['mid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['mid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_MID);
-	}
-	
-	function update(&$params)
-	{
-		$params['uid'] = $this->get('uid');
-		$params['start'] = $this->get('start');
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/CommentEditForm.class.php
diff -u xoops2jp/html/modules/base/forms/CommentEditForm.class.php:1.1.2.4.2.2 xoops2jp/html/modules/base/forms/CommentEditForm.class.php:removed
--- xoops2jp/html/modules/base/forms/CommentEditForm.class.php:1.1.2.4.2.2	Fri Sep 29 17:14:09 2006
+++ xoops2jp/html/modules/base/forms/CommentEditForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,174 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- */
-class Legacy_CommentEditForm extends XCube_ActionForm
-{
-	function getTokenName()
-	{
-		return "module.base.Legacy_CommentEditForm.TOKEN";
-	}
-
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['com_id'] =& new XCube_IntProperty('com_id');
-		$this->mFormProperties['com_pid'] =& new XCube_IntProperty('com_pid');
-		$this->mFormProperties['com_rootid'] =& new XCube_IntProperty('com_rootid');
-		$this->mFormProperties['com_modid'] =& new XCube_IntProperty('com_modid');
-		$this->mFormProperties['com_itemid'] =& new XCube_IntProperty('com_itemid');
-		$this->mFormProperties['com_icon'] =& new XCube_StringProperty('com_icon');
-		$this->mFormProperties['com_created'] =& new XCube_IntProperty('com_created');
-		$this->mFormProperties['com_modified'] =& new XCube_IntProperty('com_modified');
-		$this->mFormProperties['com_ip'] =& new XCube_StringProperty('com_ip');
-		$this->mFormProperties['com_title'] =& new XCube_StringProperty('com_title');
-		$this->mFormProperties['com_text'] =& new XCube_TextProperty('com_text');
-		$this->mFormProperties['com_sig'] =& new XCube_BoolProperty('com_sig');
-		$this->mFormProperties['com_status'] =& new XCube_IntProperty('com_status');
-		$this->mFormProperties['com_exparams'] =& new XCube_StringProperty('com_exparams');
-		$this->mFormProperties['dosmiley'] =& new XCube_BoolProperty('dosmiley');
-		$this->mFormProperties['doxcode'] =& new XCube_BoolProperty('doxcode');
-		$this->mFormProperties['doimage'] =& new XCube_BoolProperty('doimage');
-		$this->mFormProperties['dobr'] =& new XCube_BoolProperty('dobr');
-
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['com_id'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_id']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_id']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_ID);
-
-		$this->mFieldProperties['com_pid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_pid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_pid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_PID);
-
-		$this->mFieldProperties['com_rootid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_rootid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_rootid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_ROOTID);
-
-		$this->mFieldProperties['com_modid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_modid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_modid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_MODID);
-
-		$this->mFieldProperties['com_itemid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_itemid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_itemid']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_ITEMID);
-
-		$this->mFieldProperties['com_icon'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_icon']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_icon']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_ICON, '25');
-		$this->mFieldProperties['com_icon']->addMessage('maxlength', _MD_BASE_ERROR_MAXLENGTH, _MD_BASE_LANG_COM_ICON, '25');
-		$this->mFieldProperties['com_icon']->addVar('maxlength', 25);
-
-		$this->mFieldProperties['com_ip'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_ip']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_ip']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_IP, '15');
-		$this->mFieldProperties['com_ip']->addMessage('maxlength', _MD_BASE_ERROR_MAXLENGTH, _MD_BASE_LANG_COM_IP, '15');
-		$this->mFieldProperties['com_ip']->addVar('maxlength', 15);
-
-		$this->mFieldProperties['com_title'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_title']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_title']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_TITLE, '255');
-		$this->mFieldProperties['com_title']->addMessage('maxlength', _MD_BASE_ERROR_MAXLENGTH, _MD_BASE_LANG_COM_TITLE, '255');
-		$this->mFieldProperties['com_title']->addVar('maxlength', 255);
-
-		$this->mFieldProperties['com_text'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_text']->setDependsByArray(array('required'));
-		$this->mFieldProperties['com_text']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_TEXT);
-
-		$this->mFieldProperties['com_exparams'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['com_exparams']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['com_exparams']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_COM_EXPARAMS, '255');
-		$this->mFieldProperties['com_exparams']->addMessage('maxlength', _MD_BASE_ERROR_MAXLENGTH, _MD_BASE_LANG_COM_EXPARAMS, '255');
-		$this->mFieldProperties['com_exparams']->addVar('maxlength', 255);
-	}
-
-	function load(&$obj)
-	{
-		$this->set('com_id', $obj->get('com_id'));
-		$this->set('com_pid', $obj->get('com_pid'));
-		$this->set('com_rootid', $obj->get('com_rootid'));
-		$this->set('com_modid', $obj->get('com_modid'));
-		$this->set('com_itemid', $obj->get('com_itemid'));
-		$this->set('com_icon', $obj->get('com_icon'));
-		$this->set('com_created', $obj->get('com_created'));
-		$this->set('com_modified', $obj->get('com_modified'));
-		$this->set('com_ip', $obj->get('com_ip'));
-		$this->set('com_title', $obj->get('com_title'));
-		$this->set('com_text', $obj->get('com_text'));
-		$this->set('com_sig', $obj->get('com_sig'));
-		$this->set('com_status', $obj->get('com_status'));
-		$this->set('com_exparams', $obj->get('com_exparams'));
-		$this->set('dosmiley', $obj->get('dosmiley'));
-		$this->set('doxcode', $obj->get('doxcode'));
-		$this->set('doimage', $obj->get('doimage'));
-		$this->set('dobr', $obj->get('dobr'));
-	}
-
-	function update(&$obj)
-	{
-		$obj->set('com_id', $this->get('com_id'));
-		$obj->set('com_pid', $this->get('com_pid'));
-		$obj->set('com_rootid', $this->get('com_rootid'));
-		$obj->set('com_modid', $this->get('com_modid'));
-		$obj->set('com_itemid', $this->get('com_itemid'));
-		$obj->set('com_icon', $this->get('com_icon'));
-		$obj->set('com_created', $this->get('com_created'));
-		$obj->set('com_modified', time());
-
-		//
-		// TODO check NONAME form
-		//	$obj->set('com_uid', $this->get('com_uid'));
-
-		//
-		// TODO  IP will be changed when a administrator will edit or a user will
-		//      edit again.
-		//
-		$obj->set('com_ip', $_SERVER['REMOTE_ADDR']);
-		$obj->set('com_title', $this->get('com_title'));
-		$obj->set('com_text', $this->get('com_text'));
-		$obj->set('com_sig', $this->get('com_sig'));
-		$obj->set('com_status', $this->get('com_status'));
-		$obj->set('com_exparams', $this->get('com_exparams'));
-		$obj->set('dosmiley', $this->get('dosmiley'));
-		$obj->set('doxcode', $this->get('doxcode'));
-		$obj->set('doimage', $this->get('doimage'));
-		$obj->set('dobr', $this->get('dobr'));
-	}
-}
-
-class Legacy_CommentEditForm_Admin extends Legacy_CommentEditForm
-{
-	function prepare()
-	{
-		parent::prepare();
-		
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['dohtml'] =& new XCube_BoolProperty('dohtml');
-	}
-
-	function load(&$obj)
-	{
-		parent::load($obj);
-
-		$this->set('dohtml', $obj->get('dohtml'));
-	}
-
-	function update(&$obj)
-	{
-		update::load($obj);
-
-		$obj->set('dohtml', $this->get('dohtml'));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/ImageUploadForm.class.php
diff -u xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:1.1.2.3.2.4 xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:removed
--- xoops2jp/html/modules/base/forms/ImageUploadForm.class.php:1.1.2.3.2.4	Sat Oct  7 15:51:00 2006
+++ xoops2jp/html/modules/base/forms/ImageUploadForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,155 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-class Legacy_ImageUploadForm extends XCube_ActionForm
-{
-	var $mOldFileName = null;
-	var $_mIsNew = null;
-	var $mFormFile = null;
-
-	function getTokenName()
-	{
-		return "module.base.ImageUploadForm.TOKEN" . $this->get('imgcat_id');
-	}
-
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['image_name'] =& new XCube_ImageFileProperty('image_name');
-		$this->mFormProperties['image_nicename'] =& new XCube_StringProperty('image_nicename');
-		$this->mFormProperties['imgcat_id'] =& new XCube_IntProperty('imgcat_id');
-	
-		//
-		// Set field properties
-		//
-		$this->mFieldProperties['image_name'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['image_name']->setDependsByArray(array('extension'));
-		$this->mFieldProperties['image_name']->addVar('extension', 'jpg,gif,png');
-	
-		$this->mFieldProperties['image_nicename'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['image_nicename']->setDependsByArray(array('required'));
-		$this->mFieldProperties['image_nicename']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_IMAGE_NICENAME);
-		
-		$this->mFieldProperties['imgcat_id'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['imgcat_id']->setDependsByArray(array('required','objectExist'));
-		$this->mFieldProperties['imgcat_id']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_IMGCAT_ID);
-		$this->mFieldProperties['imgcat_id']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_IMGCAT_ID);
-		$this->mFieldProperties['imgcat_id']->addVar('handler', 'imagecategory');
-		$this->mFieldProperties['imgcat_id']->addVar('module', 'base');
-	}
-	
-	/**
-	 * Check the permission of uploading.
-	 */	
-	function validateImgcat_id()
-	{
-		$imgcat_id = $this->get('imgcat_id');
-		if ($imgcat_id != null) {
-			$root =& XCube_Root::getSingleton();
-			$xoopsUser =& $root->mController->mRoot->mContext->mXoopsUser;
-			
-			$groups = array();
-			if (is_object($xoopsUser)) {
-				$groups =& $xoopsUser->getGroups();
-			}
-			else {
-				$groups = array(XOOPS_GROUP_ANONYMOUS);
-			}
-			
-			$handler =& xoops_getmodulehandler('imagecategory', 'base');
-			$imgcat =& $handler->get($imgcat_id);
-			if (is_object($imgcat) && !$imgcat->hasUploadPerm($groups)) {
-				$this->addErrorMessage(_MD_BASE_ERROR_PERMISSION);
-			}
-		}
-	}
-
-	function validateImage_name()
-	{
-		$formFile = $this->get('image_name');
-		
-		if ($formFile == null && $this->_mIsNew ) {
-			$this->addErrorMessage(_MD_BASE_ERROR_YOU_MUST_UPLOAD);
-		}
-	}
-	
-	function validate()
-	{
-		parent::validate();
-		
-		$handler =& xoops_getmodulehandler('imagecategory', 'base');
-		$category =& $handler->get($this->get('imgcat_id'));
-		
-		$formFile = $this->get('image_name');
-
-		if ($formFile != null && is_object($category)) {
-			//
-			// Imagefile width & height check.
-			//
-			if ($formFile->getWidth() > $category->get('imgcat_maxwidth') || $formFile->getHeight() > $category->get('imgcat_maxheight')) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_BASE_ERROR_IMG_SIZE, $category->get('imgcat_maxwidth'), $category->get('imgcat_maxheight')));
-			}
-			
-			//
-			// Check file size
-			//
-			if ($formFile->getFilesize() > $category->get('imgcat_maxsize')) {
-				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_BASE_ERROR_IMG_FILESIZE, $category->get('imgcat_maxsize')));
-			}
-		}
-	}
-	
-	function load(&$obj)
-	{
-		$this->set('image_nicename', $obj->get('image_nicename'));
-		$this->set('imgcat_id', $obj->get('imgcat_id'));
-		
-		$this->_mIsNew = $obj->isNew();
-		$this->mOldFileName = $obj->get('image_name');
-	}
-
-	function update(&$obj)
-	{
-		$obj->set('image_nicename', $this->get('image_nicename'));
-		$obj->set('image_display', true);
-		$obj->set('imgcat_id', $this->get('imgcat_id'));
-		
-		$handler =& xoops_getmodulehandler('imagecategory', 'base');
-		$category =& $handler->get($this->get('imgcat_id'));
-
-		$this->mFormFile = $this->get('image_name');
-		
-		if ($this->mFormFile != null) {
-			$this->mFormFile->setRandomToBodyName('img');
-			
-			$filename = $this->mFormFile->getBodyName();
-			$this->mFormFile->setBodyName(substr($filename, 0, 24));
-	
-			$obj->set('image_name', $this->mFormFile->getFileName());
-			$obj->set('image_mimetype', $this->mFormFile->getContentType());
-			
-			//
-			// To store db
-			//
-			if ($category->get('imgcat_storetype') == 'db') {
-				$obj->loadImageBody();
-				if (!is_object($obj->mImageBody)) {
-					$obj->mImageBody =& $obj->createImageBody();
-				}
-					
-				//
-				// Access to private member property.
-				//
-				$obj->mImageBody->set('image_body', file_get_contents($this->mFormFile->_mTmpFileName));
-			}
-		}
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/ImageFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:1.1.2.1.2.1 xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:removed
--- xoops2jp/html/modules/base/forms/ImageFilterForm.class.php:1.1.2.1.2.1	Thu Oct 12 20:03:40 2006
+++ xoops2jp/html/modules/base/forms/ImageFilterForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,60 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
-
-define('IMAGE_SORT_KEY_IMAGE_ID', 1);
-define('IMAGE_SORT_KEY_IMAGE_NAME', 2);
-define('IMAGE_SORT_KEY_IMAGE_NICENAME', 3);
-define('IMAGE_SORT_KEY_IMAGE_MIMETYPE', 4);
-define('IMAGE_SORT_KEY_IMAGE_CREATED', 5);
-define('IMAGE_SORT_KEY_IMAGE_DISPLAY', 6);
-define('IMAGE_SORT_KEY_IMAGE_WEIGHT', 7);
-define('IMAGE_SORT_KEY_IMGCAT_ID', 8);
-define('IMAGE_SORT_KEY_MAXVALUE', 8);
-
-define('IMAGE_SORT_KEY_DEFAULT', IMAGE_SORT_KEY_IMAGE_WEIGHT);
-
-class Legacy_ImageFilterForm extends Legacy_AbstractFilterForm
-{
-	var $_mSortKeys = array(
-		IMAGE_SORT_KEY_IMAGE_ID => 'image_id',
-		IMAGE_SORT_KEY_IMAGE_NAME => 'image_name',
-		IMAGE_SORT_KEY_IMAGE_NICENAME => 'image_nicename',
-		IMAGE_SORT_KEY_IMAGE_MIMETYPE => 'image_mimetype',
-		IMAGE_SORT_KEY_IMAGE_CREATED => 'image_created',
-		IMAGE_SORT_KEY_IMAGE_DISPLAY => 'image_display',
-		IMAGE_SORT_KEY_IMAGE_WEIGHT => 'image_weight',
-		IMAGE_SORT_KEY_IMGCAT_ID => 'imgcat_id'
-	);
-
-	function getDefaultSortKey()
-	{
-		return IMAGE_SORT_KEY_DEFAULT;
-	}
-
-	function fetch()
-	{
-		parent::fetch();
-
-		$this->mNavi->addExtra('target', xoops_getrequest('target'));
-	
-		if (isset($_REQUEST['imgcat_id'])) {
-			$this->mNavi->addExtra('imgcat_id', xoops_getrequest('imgcat_id'));
-			$this->_mCriteria->add(new Criteria('imgcat_id', array(XOBJ_DTYPE_INT, xoops_getrequest('imgcat_id'))));
-		}
-		else {
-			$this->_mCriteria->add(new Criteria('imgcat_id', 0));
-		}
-		
-		$this->_mCriteria->add(new Criteria('image_display', 1));
-
-		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
-		if (abs($this->mSort) != IMAGE_SORT_KEY_IMAGE_WEIGHT) {
-			$this->_mCriteria->addSort(IMAGE_SORT_KEY_IMAGE_WEIGHT, $this->getOrder());
-		}
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/MiscFriendForm.class.php
diff -u xoops2jp/html/modules/base/forms/MiscFriendForm.class.php:1.1.2.1.2.2 xoops2jp/html/modules/base/forms/MiscFriendForm.class.php:removed
--- xoops2jp/html/modules/base/forms/MiscFriendForm.class.php:1.1.2.1.2.2	Fri Sep 29 17:14:09 2006
+++ xoops2jp/html/modules/base/forms/MiscFriendForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,64 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-class Legacy_MiscFriendForm extends XCube_ActionForm
-{
-	function getTokenName()
-	{
-		return "module.base.MiscFriendForm.TOKEN";
-	}
-
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['yname'] =& new XCube_StringProperty('yname');
-		$this->mFormProperties['ymail'] =& new XCube_StringProperty('ymail');
-		$this->mFormProperties['fname'] =& new XCube_StringProperty('fname');
-		$this->mFormProperties['fmail'] =& new XCube_StringProperty('fmail');
-	
-		//
-		// Set field properties
-		//
-	
-		$this->mFieldProperties['yname'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['yname']->setDependsByArray(array('required'));
-		$this->mFieldProperties['yname']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_YNAME);
-	
-		$this->mFieldProperties['ymail'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['ymail']->setDependsByArray(array('required','email'));
-		$this->mFieldProperties['ymail']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_YMAIL);
-		$this->mFieldProperties['ymail']->addMessage('required', _MD_BASE_ERROR_EMAIL, _MD_BASE_LANG_YMAIL);
-	
-		$this->mFieldProperties['fname'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['fname']->setDependsByArray(array('required'));
-		$this->mFieldProperties['fname']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_FNAME);
-	
-		$this->mFieldProperties['fmail'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['fmail']->setDependsByArray(array('required','email'));
-		$this->mFieldProperties['fmail']->addMessage('required', _MD_BASE_ERROR_REQUIRED, _MD_BASE_LANG_FMAIL);
-		$this->mFieldProperties['fmail']->addMessage('email', _MD_BASE_ERROR_EMAIL, _MD_BASE_LANG_FMAIL);
-	}
-	
-	function load(&$user)
-	{
-		$this->set('yname', $user->get('uname'));
-		$this->set('ymail', $user->get('email'));
-	}
-	
-	function update(&$mailer)
-	{
-		$mailer->assign("YOUR_NAME", $this->get('yname'));
-		$mailer->assign("FRIEND_NAME", $this->get('fname'));
-		$mailer->setToEmails($this->get('fmail'));
-		$mailer->setFromEmail($this->get('ymail'));
-		$mailer->setFromName($this->get('yname'));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/index.html
diff -u xoops2jp/html/modules/base/forms/index.html:1.1.2.1 xoops2jp/html/modules/base/forms/index.html:removed
--- xoops2jp/html/modules/base/forms/index.html:1.1.2.1	Mon Mar 27 11:41:55 2006
+++ xoops2jp/html/modules/base/forms/index.html	Tue Nov  7 17:04:30 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:removed
--- xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3.2.2	Fri Oct 13 18:21:23 2006
+++ xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,43 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
-
-define('SMILES_SORT_KEY_ID', 1);
-define('SMILES_SORT_KEY_CODE', 2);
-define('SMILES_SORT_KEY_SMILE_URL', 3);
-define('SMILES_SORT_KEY_EMOTION', 4);
-define('SMILES_SORT_KEY_DISPLAY', 5);
-define('SMILES_SORT_KEY_MAXVALUE', 5);
-
-define('SMILES_SORT_KEY_DEFAULT', SMILES_SORT_KEY_ID);
-
-class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm
-{
-	var $mSortKeys = array(
-		SMILES_SORT_KEY_ID => 'id',
-		SMILES_SORT_KEY_CODE => 'code',
-		SMILES_SORT_KEY_SMILE_URL => 'smile_url',
-		SMILES_SORT_KEY_EMOTION => 'emotion',
-		SMILES_SORT_KEY_DISPLAY => 'display'
-	);
-
-	function getDefaultSortKey()
-	{
-		return SMILES_SORT_KEY_ID;
-	}
-
-	function fetch()
-	{
-		parent::fetch();
-	
-		if (isset($_REQUEST['target'])) {
-			$this->mNavi->addExtra('target', xoops_getrequest('target'));
-		}
-		
-		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php
diff -u xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php:1.1.2.1.2.3 xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php:removed
--- xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php:1.1.2.1.2.3	Sat Oct 14 17:34:50 2006
+++ xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php	Tue Nov  7 17:04:30 2006
@@ -1,44 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
-
-class Legacy_NotifyDeleteForm extends XCube_ActionForm
-{
-	var $mNotifiyIds = array();
-	var $mFatalError = false;
-	
-	function getTokenName()
-	{
-		return $_SERVER['REQUEST_METHOD'] == 'POST' ? "module.base.NotifyDeleteForm.TOKEN" : null;
-	}
-
-	function fetch()
-	{
-		parent::fetch();
-		
-		$root =& XCube_Root::getSingleton();
-		$t_arr = $root->mContext->mRequest->getRequest('del_not');
-		
-		if (!is_array($t_arr)) {
-			$this->addErrorMessage(_MD_BASE_LANG_ERROR);
-			$this->mFatalError = true;
-			return;
-		}
-		
-		foreach ($t_arr as $t_modid => $t_idArr) {
-			if (!is_array($t_idArr)) {
-				$this->addErrorMessage(_MD_BASE_LANG_ERROR);
-				$this->mFatalError = true;
-				return;
-			}
-			foreach ($t_idArr as $t_id) {
-				$this->mNotifiyIds[] = array('modid' => intval($t_modid), 'id' => intval($t_id));
-			}
-		}
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:31 +0900
Subject: [xoops-cvslog 5661] CVS update: xoops2jp/html/modules/base/.xml
Message-ID: <20061107080431.08FE22AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/.xml/comment_edit.xml
diff -u xoops2jp/html/modules/base/.xml/comment_edit.xml:1.1.2.4 xoops2jp/html/modules/base/.xml/comment_edit.xml:removed
--- xoops2jp/html/modules/base/.xml/comment_edit.xml:1.1.2.4	Thu Mar 30 18:11:26 2006
+++ xoops2jp/html/modules/base/.xml/comment_edit.xml	Tue Nov  7 17:04:30 2006
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="CommentEditForm" type="XCube_ActionForm">
-		<form-property name="com_id" type="Int" />
-		<form-property name="com_icon" type="String" />
-		<form-property name="com_title" type="String" />
-		<form-property name="com_text" type="Text" />
-		<form-property name="com_sig" type="Bool" />
-		<form-property name="com_status" type="Int" />
-		<form-property name="com_exparams" type="String" />
-		<form-property name="dohtml" type="Bool" />
-		<form-property name="dosmiley" type="Bool" />
-		<form-property name="doxcode" type="Bool" />
-		<form-property name="doimage" type="Bool" />
-		<form-property name="dobr" type="Bool" />
-	</form-bean>
-	<form-validation>
-		<field property="com_id" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_icon" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_COM_ICON" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="25" />
-		</field>
-		<field property="com_title" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_COM_TITLE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="com_text" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_TEXT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_exparams" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_COM_EXPARAMS" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/search_showall.xml
diff -u xoops2jp/html/modules/base/.xml/search_showall.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/search_showall.xml:removed
--- xoops2jp/html/modules/base/.xml/search_showall.xml:1.1.2.1	Sat May 27 22:06:12 2006
+++ xoops2jp/html/modules/base/.xml/search_showall.xml	Tue Nov  7 17:04:30 2006
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="SearchShowallForm" type="Legacy_SearchResultsForm">
-		<form-property name="mid" type="Int" />
-		<form-property name="andor" type="String" />
-		<form-property name="query" type="String" />
-		<form-property name="start" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="andor" depends="mask">
-			<arg0 key="const._MD_BASE_LANG_ANDOR" />
-			<msg name="required" key="const._MD_BASE_ERROR_MASK" />
-			<var name="mask" value="/(AND|OR|exact)/" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/misc_friend.xml
diff -u xoops2jp/html/modules/base/.xml/misc_friend.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/misc_friend.xml:removed
--- xoops2jp/html/modules/base/.xml/misc_friend.xml:1.1.2.1	Sat Aug  5 22:20:44 2006
+++ xoops2jp/html/modules/base/.xml/misc_friend.xml	Tue Nov  7 17:04:30 2006
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="MiscFriendForm" type="XCube_ActionForm">
-		<form-property name="yname" type="String" />
-		<form-property name="ymail" type="String" />
-		<form-property name="fname" type="String" />
-		<form-property name="fmail" type="String" />
-	</form-bean>
-	<form-validation>
-		<field property="yname" depends="required">
-			<arg0 key="const._MD_BASE_LANG_YNAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="ymail" depends="required,email">
-			<arg0 key="const._MD_BASE_LANG_YMAIL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="required" key="const._MD_BASE_ERROR_EMAIL" />
-		</field>
-		<field property="fname" depends="required">
-			<arg0 key="const._MD_BASE_LANG_FNAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="fmail" depends="required,email">
-			<arg0 key="const._MD_BASE_LANG_FMAIL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="required" key="const._MD_BASE_ERROR_EMAIL" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/search_showallbyuser.xml
diff -u xoops2jp/html/modules/base/.xml/search_showallbyuser.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/search_showallbyuser.xml:removed
--- xoops2jp/html/modules/base/.xml/search_showallbyuser.xml:1.1.2.1	Sat May 27 22:06:12 2006
+++ xoops2jp/html/modules/base/.xml/search_showallbyuser.xml	Tue Nov  7 17:04:30 2006
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="SearchShowallbyuserForm" type="Legacy_SearchShowallForm">
-		<form-property name="mid" type="Int" />
-		<form-property name="uid" type="Int" />
-		<form-property name="andor" type="String" />
-		<form-property name="query" type="String" />
-		<form-property name="start" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="andor" depends="mask">
-			<arg0 key="const._MD_BASE_LANG_ANDOR" />
-			<msg name="required" key="const._MD_BASE_ERROR_MASK" />
-			<var name="mask" value="/(AND|OR|exact)/" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/image_upload.xml
diff -u xoops2jp/html/modules/base/.xml/image_upload.xml:1.1.2.2 xoops2jp/html/modules/base/.xml/image_upload.xml:removed
--- xoops2jp/html/modules/base/.xml/image_upload.xml:1.1.2.2	Fri Aug 18 20:30:08 2006
+++ xoops2jp/html/modules/base/.xml/image_upload.xml	Tue Nov  7 17:04:30 2006
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImageUploadForm" type="XCube_ActionForm">
-		<form-property name="image_name" type="ImageFile" />
-		<form-property name="image_nicename" type="String" />
-		<form-property name="imgcat_id" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="image_name" depends="extension">
-			<arg0 key="const._AD_BASE_LANG_IMAGE_NAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._AD_BASE_ERROR_EXTENSION" />
-			<var name="extension" value="jpg,gif,png" />
-		</field>
-		<field property="image_nicename" depends="required">
-			<arg0 key="const._MD_BASE_LANG_IMAGE_NICENAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="imgcat_id" depends="required,objectExist">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="imagecategory" />
-			<var name="module" value="base" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/search_results.xml
diff -u xoops2jp/html/modules/base/.xml/search_results.xml:1.1.2.1 xoops2jp/html/modules/base/.xml/search_results.xml:removed
--- xoops2jp/html/modules/base/.xml/search_results.xml:1.1.2.1	Sat May 27 22:06:12 2006
+++ xoops2jp/html/modules/base/.xml/search_results.xml	Tue Nov  7 17:04:30 2006
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="SearchResultsForm" type="XCube_ActionForm">
-		<form-property name="mids" type="Int[]" />
-		<form-property name="andor" type="String" />
-		<form-property name="query" type="String" />
-	</form-bean>
-	<form-validation>
-		<field property="andor" depends="mask">
-			<arg0 key="const._MD_BASE_LANG_ANDOR" />
-			<msg name="required" key="const._MD_BASE_ERROR_MASK" />
-			<var name="mask" value="/(AND|OR|exact)/" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/.xml/index.html
diff -u xoops2jp/html/modules/base/.xml/index.html:1.1.2.1 xoops2jp/html/modules/base/.xml/index.html:removed
--- xoops2jp/html/modules/base/.xml/index.html:1.1.2.1	Mon Mar 27 11:41:48 2006
+++ xoops2jp/html/modules/base/.xml/index.html	Tue Nov  7 17:04:30 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:31 +0900
Subject: [xoops-cvslog 5662] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20061107080431.37B3E2AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/menu.php
diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.12 xoops2jp/html/modules/base/admin/menu.php:removed
--- xoops2jp/html/modules/base/admin/menu.php:1.1.2.12	Wed Aug  2 18:36:13 2006
+++ xoops2jp/html/modules/base/admin/menu.php	Tue Nov  7 17:04:31 2006
@@ -1,46 +0,0 @@
-<?php
-/**
- * @version $Id: menu.php,v 1.1.2.12 2006/08/02 09:36:13 minahito Exp $
- */
-
-$adminmenu[1]['title']=_MI_BASE_MENU_ACTIONSEARCH;
-$adminmenu[1]['link']="admin/index.php?action=ActSearch";
-
-$adminmenu[2]['title']=_MI_BASE_MENU_PREFERENCE;
-$adminmenu[2]['link']="admin/index.php?action=PreferenceList";
-
-$adminmenu[3]['title']=_MI_BASE_MENU_MODULELIST;
-$adminmenu[3]['keywords']=_MI_BASE_KEYWORD_MODULELIST;
-$adminmenu[3]['link']="admin/index.php?action=ModuleList";
-
-$adminmenu[4]['title']=_MI_BASE_MENU_MODULEINSTALL;
-$adminmenu[4]['keywords']=_MI_BASE_KEYWORD_MODULEINSTALL;
-$adminmenu[4]['link']="admin/index.php?action=InstallList";
-
-$adminmenu[5]['title']=_MI_BASE_MENU_BLOCKLIST;
-$adminmenu[5]['keywords']=_MI_BASE_KEYWORD_BLOCKLIST;
-$adminmenu[5]['link']="admin/index.php?action=BlockList";
-
-$adminmenu[6]['title']=_MI_BASE_MENU_BLOCKINSTALL;
-$adminmenu[6]['keywords']=_MI_BASE_KEYWORD_BLOCKINSTALL;
-$adminmenu[6]['link']="admin/index.php?action=BlockInstallList";
-
-$adminmenu[7]['title']=_MI_BASE_MENU_CREATE_SMILES;
-$adminmenu[7]['link']="admin/index.php?action=SmilesEdit";
-$adminmenu[7]['keywords']=_MI_BASE_KEYWORD_CREATE_SMILES;
-$adminmenu[7]['show']=false;
-
-$adminmenu[8]['title']=_MI_BASE_MENU_SMILES_MANAGE;
-$adminmenu[8]['keywords']=_MI_BASE_KEYWORD_SMILES_MANAGE;
-$adminmenu[8]['link']="admin/index.php?action=SmilesList";
-
-$adminmenu[9]['title']=_MI_BASE_MENU_COMMENT_MANAGE;
-$adminmenu[9]['link']="admin/index.php?action=CommentList";
-
-$adminmenu[10]['title']=_MI_BASE_MENU_IMAGE_MANAGE;
-$adminmenu[10]['link']="admin/index.php?action=ImagecategoryList";
-
-$adminmenu[11]['title']=_MI_BASE_MENU_THEME_MANAGE;
-$adminmenu[11]['link']="admin/index.php?action=ThemeList";
-
-?>
Index: xoops2jp/html/modules/base/admin/index.php
diff -u xoops2jp/html/modules/base/admin/index.php:1.1.2.2.2.2 xoops2jp/html/modules/base/admin/index.php:removed
--- xoops2jp/html/modules/base/admin/index.php:1.1.2.2.2.2	Tue Oct 10 15:12:23 2006
+++ xoops2jp/html/modules/base/admin/index.php	Tue Nov  7 17:04:31 2006
@@ -1,20 +0,0 @@
-<?php
-
-require_once "../../../mainfile.php";
-require_once XOOPS_ROOT_PATH . "/header.php";
-require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
-
-$root =& XCube_Root::getSingleton();
-
-$actionName = isset($_GET['action']) ? trim($_GET['action']) : "ModuleList";
-
-$moduleRunner =& new Legacy_ActionFrame(true);
-$moduleRunner->setActionName($actionName);
-
-$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
-$root->mController->execute();
-
-require_once XOOPS_ROOT_PATH . "/footer.php";
-
-?>
Index: xoops2jp/html/modules/base/admin/css.php
diff -u xoops2jp/html/modules/base/admin/css.php:1.1.2.8.2.2 xoops2jp/html/modules/base/admin/css.php:removed
--- xoops2jp/html/modules/base/admin/css.php:1.1.2.8.2.2	Sat Oct  7 16:28:36 2006
+++ xoops2jp/html/modules/base/admin/css.php	Tue Nov  7 17:04:31 2006
@@ -1,64 +0,0 @@
-<?php
-
-require_once "../../../mainfile.php";
-
-//
-// @todo Why does this file know Legacy_RenderSystem?
-//
-require_once XOOPS_ROOT_PATH . "/header.php";
-
-function Legacy_modifier_css_theme($string)
-{
-	$infoArr = Legacy_get_ovveride_file($string, null, true);
-	
-	if ($infoArr['theme'] != null && $infoArr['dirname'] != null) {
-		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/modules/" . $infoArr['dirname'] . "/" . $string;
-	}
-	elseif ($infoArr['theme'] != null) {
-		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/" . $string;
-	}
-	elseif ($infoArr['dirname'] != null) {
-		return XOOPS_MODULE_URL . "/" . $infoArr['dirname'] . "/admin/templates/" . $string;
-	}
-	
-	return LEGACY_ADMIN_RENDER_FALLBACK_URL . "/" . $string;
-}
-
-$theme = isset($_GET['theme']) ? trim($_GET['theme']) : null;
-$dirname = isset($_GET['dirname']) ? trim($_GET['dirname']) : null;
-$file = "stylesheets/" . trim($_GET['file']);
-
-if (strstr($theme, "..") !== false || strstr($dirname, "..") !== false || strstr($file, "..") !== false) {
-	exit();
-}
-
-$smarty =& new Legacy_AdminSmarty();
-$smarty->register_modifier("theme", "Legacy_modifier_css_theme");
-$smarty->register_function("stylesheet", "Legacy_function_stylesheet");
-
-//
-// TODO Emergency WORK AROUND for compile cache problem.
-//
-$smarty->force_compile = true;
-
-if ($theme != null && $dirname != null) {
-	$path = XOOPS_THEME_PATH . "/${theme}/modules/${dirname}";
-}
-elseif ($theme != null) {
-	$path = XOOPS_THEME_PATH . "/" .$theme;
-}
-elseif ($dirname != null) {
-	$path = XOOPS_MODULE_PATH . "/${dirname}/admin/templates";
-}
-else {
-	$path = LEGACY_ADMIN_RENDER_FALLBACK_PATH;
-}
-
-$smarty->template_dir = $path;
-$smarty->setModulePrefix('_css_' . $theme);
-$result=$smarty->fetch("file:" . $file);
-
-header('Content-Type:text/css;');
-print $result;
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:31 +0900
Subject: [xoops-cvslog 5663] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20061107080431.6D07A2AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/blocks/legacy_usermenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.4.2.1 xoops2jp/html/modules/base/blocks/legacy_usermenu.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.4.2.1	Thu Oct  5 18:07:21 2006
+++ xoops2jp/html/modules/base/blocks/legacy_usermenu.php	Tue Nov  7 17:04:31 2006
@@ -1,44 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: legacy_usermenu.php,v 1.1.2.4.2.1 2006/10/05 09:07:21 minahito Exp $
- */
-
- /**
-  * This function is called back to display the user menu.
-  * 
-  * [Template Variables]
-  *  $block.uid ... Curent user id for the menu.
-  *  $block.flagShowInbox ... If there is the pm module, set true.
-  *  $block.inbox_url ... Return url to access inbox of pm.
-  *  $block.new_messages ... amount of unread messages.
-  */
-function b_legacy_usermenu_show()
-{
-    $root =& XCube_Root::getSingleton();
-    $xoopsUser =& $root->mController->mRoot->mContext->mXoopsUser;
-
-    if (is_object($xoopsUser)) {
-        $block = array();
-        
-        $block['uid'] = $xoopsUser->getVar('uid');
-		$block['flagShowInbox'] = false;
-
-		//
-		// Check does this system have PrivateMessage feature.
-		//
-		$url = $root->mController->getPMInboxUrl($block['uid']);
-
-		if ($url != null) {
-			$block['inbox_url'] = $url;
-			$block['new_messages'] = $root->mController->getCountUnreadPM($block['uid']);
-			$block['flagShowInbox']=true;
-		}
-		
-		$block['show_adminlink'] = $xoopsUser->isAdmin(-1);
-
-        return $block;
-    }
-    return false;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_notification.php
diff -u xoops2jp/html/modules/base/blocks/legacy_notification.php:1.1.2.2 xoops2jp/html/modules/base/blocks/legacy_notification.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_notification.php:1.1.2.2	Thu Jul 20 17:16:45 2006
+++ xoops2jp/html/modules/base/blocks/legacy_notification.php	Tue Nov  7 17:04:31 2006
@@ -1,47 +0,0 @@
-<?php
-function b_legacy_notification_show()
-{
-    global $xoopsConfig, $xoopsUser, $xoopsModule;
-    include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-	
-	$root =& XCube_Root::getSingleton();
-	$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
-	
-    // Notification must be enabled, and user must be logged in
-    if (empty($xoopsUser) || !notificationEnabled('block')) {
-        return false; // do not display block
-    }
-    $notification_handler =& xoops_gethandler('notification');
-    // Now build the a nested associative array of info to pass
-    // to the block template.
-    $block = array();
-    $categories =& notificationSubscribableCategoryInfo();
-    if (empty($categories)) {
-        return false;
-    }
-    foreach ($categories as $category) {
-        $section['name'] = $category['name'];
-        $section['title'] = $category['title'];
-        $section['description'] = $category['description'];
-        $section['itemid'] = $category['item_id'];
-        $section['events'] = array();
-        $subscribed_events =& $notification_handler->getSubscribedEvents ($category['name'], $category['item_id'], $xoopsModule->getVar('mid'), $xoopsUser->getVar('uid'));
-        foreach (notificationEvents($category['name'], true) as $event) {
-            if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
-                continue;
-            }
-            $subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
-            $section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
-        }
-        $block['categories'][$category['name']] = $section;
-    }
-    // Additional form data
-    $block['target_page'] = "notification_update.php";
-    // FIXME: better or more standardized way to do this?
-    $script_url = explode('/', xoops_getenv('PHP_SELF'));
-    $script_name = $script_url[count($script_url)-1];
-    $block['redirect_script'] = $script_name;
-    $block['submit_button'] = _NOT_UPDATENOW;
-    return $block;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_mainmenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.2.2.1 xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.2.2.1	Thu Oct  5 18:07:21 2006
+++ xoops2jp/html/modules/base/blocks/legacy_mainmenu.php	Tue Nov  7 17:04:31 2006
@@ -1,33 +0,0 @@
-<?php
-function b_legacy_mainmenu_show() {
-    $root =& XCube_Root::getSingleton();
-    $xoopsModule =& $root->mContext->mXoopsModule;
-    $xoopsUser =& $root->mController->mRoot->mContext->mXoopsUser;
-    
-    $block = array();
-
-    $module_handler =& xoops_gethandler('module');
-    $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
-    $criteria->add(new Criteria('isactive', 1));
-    $criteria->add(new Criteria('weight', 0, '>'));
-    $modules =& $module_handler->getObjects($criteria, true);
-    $moduleperm_handler =& xoops_gethandler('groupperm');
-    $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
-    $read_allowed = $moduleperm_handler->getItemIds('module_read', $groups);
-    foreach (array_keys($modules) as $i) {
-        if (in_array($i, $read_allowed)) {
-            $block['modules'][$i]['name'] = $modules[$i]->getVar('name');
-            $block['modules'][$i]['directory'] = $modules[$i]->getVar('dirname');
-            $sublinks =& $modules[$i]->subLink();
-            if ((count($sublinks) > 0) && (!empty($xoopsModule)) && ($i == $xoopsModule->getVar('mid'))) {
-                foreach($sublinks as $sublink){
-                    $block['modules'][$i]['sublinks'][] = array('name' => $sublink['name'], 'url' => XOOPS_URL.'/modules/'.$modules[$i]->getVar('dirname').'/'.$sublink['url']);
-                }
-            } else {
-                $block['modules'][$i]['sublinks'] = array();
-            }
-        }
-    }
-    return $block;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_themes.php
diff -u xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1.2.1 xoops2jp/html/modules/base/blocks/legacy_themes.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_themes.php:1.1.2.1.2.1	Sat Oct  7 19:03:17 2006
+++ xoops2jp/html/modules/base/blocks/legacy_themes.php	Tue Nov  7 17:04:31 2006
@@ -1,47 +0,0 @@
-<?php
-function b_legacy_themes_show($options)
-{
-    global $xoopsConfig;
-	
-	if (count($xoopsConfig['theme_set_allowed']) == 0) {
-		return null;
-	}
-	
-    $theme_options = array();
-    foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
-        $theme_option['name'] = $theme;
-        if ($theme == $xoopsConfig['theme_set']) {
-            $theme_option['selected'] = 'selected="selected"';
-        } else {
-            $theme_option['selected'] = '';
-        }
-        $theme_options[] = $theme_option;
-    }
-	
-    $block = array();
-    $block['count'] = count($xoopsConfig['theme_set_allowed']);
-    $block['mode'] = $options[0];
-    $block['width'] = $options[1];
-    $block['theme_options'] = $theme_options;
-    return $block;
-}
-
-function b_legacy_themes_edit($options)
-{
-
-    $chk = "";
-    $form = _MB_BASE_LANG_THSHOW."&nbsp;";
-    if ( $options[0] == 1 ) {
-        $chk = ' checked="checked"';
-    }
-    $form .= '<input type="radio" name="options[0]" value="1"'.$chk.' />&nbsp;'._YES;
-    $chk = "";
-    if ( $options[0] == 0 ) {
-        $chk = ' checked="checked"';
-    }
-    $form .= '&nbsp;<input type="radio" name="options[0]" value="0"'.$chk.' />'._NO;
-    $form .= '<br />'._MB_BASE_LANG_THWIDTH.'&nbsp;';
-    $form .= '<input type="text" name="options[1]" value="'.$options[1].'" />';
-    return $form;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_search.php
diff -u xoops2jp/html/modules/base/blocks/legacy_search.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_search.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_search.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_search.php	Tue Nov  7 17:04:31 2006
@@ -1,7 +0,0 @@
-<?php
-function b_legacy_search_show()
-{
-    $block = array(1);
-    return $block;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/index.html
diff -u xoops2jp/html/modules/base/blocks/index.html:1.1.2.1 xoops2jp/html/modules/base/blocks/index.html:removed
--- xoops2jp/html/modules/base/blocks/index.html:1.1.2.1	Mon Mar 27 11:41:48 2006
+++ xoops2jp/html/modules/base/blocks/index.html	Tue Nov  7 17:04:31 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/blocks/legacy_waiting.php
diff -u xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.3 xoops2jp/html/modules/base/blocks/legacy_waiting.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.3	Sun Jul  9 00:50:58 2006
+++ xoops2jp/html/modules/base/blocks/legacy_waiting.php	Tue Nov  7 17:04:31 2006
@@ -1,8 +0,0 @@
-<?php
-function b_legacy_waiting_show() {
-    $modules = array();
-    XCube_DelegateUtils::call('Legacyblock.Wating.Show', new XCube_Ref(&$modules));
-    $block['modules'] = $modules;
-    return $block;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_comments.php
diff -u xoops2jp/html/modules/base/blocks/legacy_comments.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_comments.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_comments.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_comments.php	Tue Nov  7 17:04:31 2006
@@ -1,47 +0,0 @@
-<?php
-function b_legacy_comments_show($options) {
-    $block = array();
-    include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
-    $comment_handler =& xoops_gethandler('comment');
-    $criteria = new CriteriaCompo(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-    $criteria->setLimit(intval($options[0]));
-    $criteria->setSort('com_created');
-    $criteria->setOrder('DESC');
-    $comments =& $comment_handler->getObjects($criteria, true);
-    $member_handler =& xoops_gethandler('member');
-    $module_handler =& xoops_gethandler('module');
-    $modules =& $module_handler->getObjects(new Criteria('hascomments', 1), true);
-    $comment_config = array();
-    foreach (array_keys($comments) as $i) {
-        $mid = $comments[$i]->getVar('com_modid');
-        $com['module'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/">'.$modules[$mid]->getVar('name').'</a>';
-        if (!isset($comment_config[$mid])) {
-            $comment_config[$mid] = $modules[$mid]->getInfo('comments');
-        }
-        $com['id'] = $i;
-        $com['title'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/'.$comment_config[$mid]['pageName'].'?'.$comment_config[$mid]['itemName'].'='.$comments[$i]->getVar('com_itemid').'&amp;com_id='.$i.'&amp;com_rootid='.$comments[$i]->getVar('com_rootid').'&amp;'.htmlspecialchars($comments[$i]->getVar('com_exparams')).'#comment'.$i.'">'.$comments[$i]->getVar('com_title').'</a>';
-        $com['icon'] = $comments[$i]->getVar('com_icon');
-        $com['icon'] = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
-        $com['time'] = formatTimestamp($comments[$i]->getVar('com_created'),'m');
-        if ($comments[$i]->getVar('com_uid') > 0) {
-            $poster =& $member_handler->getUser($comments[$i]->getVar('com_uid'));
-            if (is_object($poster)) {
-                $com['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>';
-            } else {
-                $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
-            }
-        } else {
-            $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
-        }
-        $block['comments'][] =& $com;
-        unset($com);
-    }
-    return $block;
-}
-
-function b_legacy_comments_edit($options) {
-    $inputtag = "<input type='text' name='options[]' value='".intval($options[0])."' />";
-    $form = sprintf(_MB_BASE_DISPLAYC, $inputtag);
-    return $form;
-}
-?>
Index: xoops2jp/html/modules/base/blocks/legacy_siteinfo.php
diff -u xoops2jp/html/modules/base/blocks/legacy_siteinfo.php:1.1.2.2 xoops2jp/html/modules/base/blocks/legacy_siteinfo.php:removed
--- xoops2jp/html/modules/base/blocks/legacy_siteinfo.php:1.1.2.2	Mon Sep 25 18:35:12 2006
+++ xoops2jp/html/modules/base/blocks/legacy_siteinfo.php	Tue Nov  7 17:04:31 2006
@@ -1,64 +0,0 @@
-<?php
-function b_legacy_siteinfo_show($options) {
-    global $xoopsConfig, $xoopsUser;
-    $xoopsDB =& Database::getInstance();
-    $myts =& MyTextSanitizer::getInstance();
-    $block = array();
-    if (!empty($options[3])) {
-        $block['showgroups'] = true;
-        $result = $xoopsDB->query("SELECT u.uid, u.uname, u.email, u.user_viewemail, u.user_avatar, g.name AS groupname FROM ".$xoopsDB->prefix("groups_users_link")." l LEFT JOIN ".$xoopsDB->prefix("users")." u ON l.uid=u.uid LEFT JOIN ".$xoopsDB->prefix("groups")." g ON l.groupid=g.groupid WHERE g.group_type='Admin' ORDER BY l.groupid, u.uid");
-        if ($xoopsDB->getRowsNum($result) > 0) {
-            $prev_caption = "";
-            $i = 0;
-            while  ($userinfo = $xoopsDB->fetchArray($result)) {
-                if ($prev_caption != $userinfo['groupname']) {
-                    $prev_caption = $userinfo['groupname'];
-                    $block['groups'][$i]['name'] = $myts->htmlSpecialChars($userinfo['groupname']);
-                }
-                if (is_object($xoopsUser)) {
-                    $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => "<a href=\"javascript:openWithSelfMain('".XOOPS_URL."/pmlite.php?send2=1&amp;to_userid=".$userinfo['uid']."','pmlite',450,370);\"><img src=\"".XOOPS_URL."/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>", 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
-                } else {
-                    if ($userinfo['user_viewemail']) {
-                        $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => '<a href="mailto:'.$userinfo['email'].'"><img src="'.XOOPS_URL.'/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>', 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
-                    } else {
-                        $block['groups'][$i]['users'][] = array('id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']), 'msglink' => '&nbsp;', 'avatar' => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
-                    }
-                }
-                $i++;
-            }
-        }
-    } else {
-        $block['showgroups'] = false;
-    }
-    $block['logourl'] = XOOPS_URL.'/images/'.$options[2];
-    if (is_object($xoopsUser)) {
-        $block['recoomendtime'] = time();
-    } else {
-        $block['recoomendtime'] = 0;
-    }
-    $block['popup_width'] = $options[0];
-    $block['popup_height'] = $options[1];
-    return $block;
-}
-
-function b_legacy_siteinfo_edit($options) {
-    $form = _MB_BASE_PWWIDTH."&nbsp;";
-    $form .= "<input type='text' name='options[]' value='".$options[0]."' />";
-    $form .= "<br />"._MB_BASE_PWHEIGHT."&nbsp;";
-    $form .= "<input type='text' name='options[]' value='".$options[1]."' />";
-    $form .= "<br />".sprintf(_MB_BASE_LOGO,XOOPS_URL."/images/")."&nbsp;";
-    $form .= "<input type='text' name='options[]' value='".$options[2]."' />";
-    $chk = "";
-    $form .= "<br />"._MB_BASE_SADMIN."&nbsp;";
-    if ( $options[3] == 1 ) {
-        $chk = " checked='checked'";
-    }
-    $form .= "<input type='radio' name='options[3]' value='1'".$chk." />&nbsp;"._YES."";
-    $chk = "";
-    if ( $options[3] == 0 ) {
-        $chk = " checked=\"checked\"";
-    }
-    $form .= "&nbsp;<input type='radio' name='options[3]' value='0'".$chk." />"._NO."";
-    return $form;
-}
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:31 +0900
Subject: [xoops-cvslog 5664] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20061107080431.A09922AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/index.html
diff -u xoops2jp/html/modules/base/preload/index.html:1.1.2.1 xoops2jp/html/modules/base/preload/index.html:removed
--- xoops2jp/html/modules/base/preload/index.html:1.1.2.1	Mon Mar 27 11:41:46 2006
+++ xoops2jp/html/modules/base/preload/index.html	Tue Nov  7 17:04:31 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/preload/Wating.class.php
diff -u xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2.2.1 xoops2jp/html/modules/base/preload/Wating.class.php:removed
--- xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.2.2.1	Thu Oct 12 21:53:14 2006
+++ xoops2jp/html/modules/base/preload/Wating.class.php	Tue Nov  7 17:04:31 2006
@@ -1,90 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Base_Wating extends XCube_ActionFilter {
-    function preBlockFilter()
-    {
-        $this->mController->mRoot->mDelegateManager->add('Legacyblock.Wating.Show',array(&$this,"callbackWatingShow"));
-    }
-    
-    function callbackWatingShow(&$modules) {
-        $xoopsDB =& Database::getInstance();
-        // for News Module
-        $module_handler =& xoops_gethandler('module');
-        if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories")." WHERE published=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_SUBMS;
-                $modules[] = $blockVal;
-            }
-        }
-        // for MyLinks Module
-        if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_links")." WHERE status=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listNewLinks";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_WLNKS;
-                $modules[] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_broken"));
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listBrokenLinks";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_BLNK;
-                $modules[] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_mod"));
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listModReq";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_MLNKS;
-                $modules[] = $blockVal;
-            }
-        }
-        // for MyDownloads Modules
-        if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listNewDownloads";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_WDLS;
-                $modules[] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_broken")."");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listBrokenDownloads";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_BFLS;
-                $modules[] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_mod")."");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listModReq";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_MFLS;
-                $modules[] = $blockVal;
-            }
-        }
-        // for Comments
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
-        if ( $result ) {
-            $blockVal = array();
-            $blockVal['adminlink'] = XOOPS_URL."/modules/base/admin/index.php?action=CommentList&amp;com_modid=0&amp;com_status=1";
-            list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-            $blockVal['lang_linkname'] =_MB_BASE_COMPEND;
-            $modules[] = $blockVal;
-        }
-    }
-}
-?>
Index: xoops2jp/html/modules/base/preload/IPbanningFilter.class.php
diff -u xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:1.1.2.2.2.1 xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:removed
--- xoops2jp/html/modules/base/preload/IPbanningFilter.class.php:1.1.2.2.2.1	Sun Oct  8 21:15:23 2006
+++ xoops2jp/html/modules/base/preload/IPbanningFilter.class.php	Tue Nov  7 17:04:31 2006
@@ -1,29 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: IPbanningFilter.class.php,v 1.1.2.2.2.1 2006/10/08 12:15:23 nobunobu Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * This burns the access from the specific IP address, which is specified at
- * the preference.
- */
-class Base_IPbanningFilter extends XCube_ActionFilter
-{
-	function preBlockFilter()
-	{
-		if ($this->mRoot->mContext->getXoopsConfig('enable_badips')) {
-			if (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR']) {
-				foreach ($this->mController->mConfig['bad_ips'] as $bi) {
-					if(!empty($bi) && strstr($_SERVER['REMOTE_ADDR'], $bi)!==false) {
-						die();
-					}
-				}
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/preload/IndexRedirector.class.php
diff -u xoops2jp/html/modules/base/preload/IndexRedirector.class.php:1.1.2.1.2.1 xoops2jp/html/modules/base/preload/IndexRedirector.class.php:removed
--- xoops2jp/html/modules/base/preload/IndexRedirector.class.php:1.1.2.1.2.1	Thu Oct  5 19:18:13 2006
+++ xoops2jp/html/modules/base/preload/IndexRedirector.class.php	Tue Nov  7 17:04:31 2006
@@ -1,28 +0,0 @@
-<?php
-/**
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Base_IndexRedirector extends XCube_ActionFilter
-{
-	function preBlockFilter()
-	{
-		$this->mController->mRoot->mDelegateManager->add("Legacypage.Top.Access", array(&$this, "redirect"));
-	}
-
-	function redirect()
-	{
-		$startPage = $this->mRoot->mContext->getXoopsConfig('startpage');
-		if ($startPage != null && $startPage != "--") {
-			$handler =& xoops_gethandler('module');
-			$module =& $handler->get($startPage);
-			if (is_object($module)) {
-				$this->mController->executeForward(XOOPS_URL . '/modules/' . $module->getShow('dirname') . '/');
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.8.2.2 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:removed
--- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.8.2.2	Thu Oct  5 19:18:12 2006
+++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php	Tue Nov  7 17:04:31 2006
@@ -1,72 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: ThemeSelect.class.php,v 1.1.2.8.2.2 2006/10/05 10:18:12 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * Theme select mechanism is that base knows the method to change themes
- * without RenderSystem. So this class uses delegate to check whether the
- * specified theme is selectable. Functions should be added to this delegate in
- * constructor, because the delegate is called in preBlockFilter().
- */
-class Base_ThemeSelect extends XCube_ActionFilter
-{
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mIsSelectableTheme = null;
-	
-	function Base_ThemeSelect(&$controller)
-	{
-		//
-		// TODO remove
-		//
-		parent::XCube_ActionFilter($controller);
-		$this->mIsSelectableTheme =& new XCube_Delegate();
-		$this->mIsSelectableTheme->register('Base_ThemeSelect.IsSelectableTheme');
-		
-		$controller->mSetupUser->add(array(&$this, 'doChangeTheme'));
-	}
-	
-	function preBlockFilter()
-	{
-		$this->mController->mRoot->mDelegateManager->add("Site.CheckLogin.Success", "Base_ThemeSelect::callbackCheckLoginSuccess");
-	}
-	
-	/**
-	 * Because this process needs sessions, this functions is added to
-	 * SiteLogin event.
-	 * 
-	 * @param XoopsUser $xoopsUser Must parameter, because this is added to login event.
-	 */
-	function doChangeTheme(&$principal, &$controller, &$context)
-	{
-		if (!empty($_POST['xoops_theme_select']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
-			$this->mController->setTheme($_POST['xoops_theme_select']);
-			$_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
-		} elseif (!empty($_SESSION['xoopsUserTheme']) && $this->_isSelectableTheme($_SESSION['xoopsUserTheme'])) {
-			$this->mController->setTheme($_SESSION['xoopsUserTheme']);
-		}
-	}
-
-	function callbackCheckLoginSuccess(&$xoopsUser)
-	{
-		//
-		// Check Theme and set it to session.
-		//
-		$userTheme = $xoopsUser->get('theme');
-		if (is_array($userTheme) && in_array($userTheme, $this->mRoot->mContext->getXoopsConfig('theme_set_allowed'))) {
-			$_SESSION['xoopsUserTheme'] = $userTheme;
-		}
-	}
-	
-	function _isSelectableTheme($theme_name)
-	{
-		return in_array($theme_name, $this->mRoot->mContext->getXoopsConfig('theme_set_allowed'));
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:32 +0900
Subject: [xoops-cvslog 5665] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20061107080432.036FC2AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/smiles.php
diff -u xoops2jp/html/modules/base/class/smiles.php:1.1.2.3 xoops2jp/html/modules/base/class/smiles.php:removed
--- xoops2jp/html/modules/base/class/smiles.php:1.1.2.3	Fri Aug  4 19:32:54 2006
+++ xoops2jp/html/modules/base/class/smiles.php	Tue Nov  7 17:04:31 2006
@@ -1,31 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseSmilesObject extends XoopsSimpleObject
-{
-	function BaseSmilesObject()
-	{
-		$this->initVar('id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('code', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('smile_url', XOBJ_DTYPE_STRING, '', true, 100);
-		$this->initVar('emotion', XOBJ_DTYPE_STRING, '', true, 75);
-		$this->initVar('display', XOBJ_DTYPE_BOOL, '0', true);
-	}
-}
-
-class BaseSmilesHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "smiles";
-	var $mPrimary = "id";
-	var $mClass = "BaseSmilesObject";
-	
-	function delete(&$obj)
-	{
-		@unlink(XOOPS_UPLOAD_PATH . "/" . $obj->get('smile_url'));
-		
-		return parent::delete($obj);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/image.php
diff -u xoops2jp/html/modules/base/class/image.php:1.1.2.5 xoops2jp/html/modules/base/class/image.php:removed
--- xoops2jp/html/modules/base/class/image.php:1.1.2.5	Fri Aug  4 19:55:01 2006
+++ xoops2jp/html/modules/base/class/image.php	Tue Nov  7 17:04:31 2006
@@ -1,102 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseImageObject extends XoopsSimpleObject
-{
-	var $mImageCategory = null;
-	var $_mImageCategoryLoadedFlag = false;
-	var $mImageBody = null;
-	var $_mImageBodyLoadedFlag = false;
-
-	function BaseImageObject()
-	{
-		$this->initVar('image_id', XOBJ_DTYPE_INT, '', false);
-		$this->initVar('image_name', XOBJ_DTYPE_STRING, '', true, 30);
-		$this->initVar('image_nicename', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('image_mimetype', XOBJ_DTYPE_STRING, '', true, 30);
-		$this->initVar('image_created', XOBJ_DTYPE_INT, time(), true);
-		$this->initVar('image_display', XOBJ_DTYPE_BOOL, '1', true);
-		$this->initVar('image_weight', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('imgcat_id', XOBJ_DTYPE_INT, '0', true);
-	}
-
-	function loadImagecategory()
-	{
-		if ($this->_mImageCategoryLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('imagecategory', 'base');
-			$this->mImageCategory =& $handler->get($this->get('imgcat_id'));
-			$this->_mImageCategoryLoadedFlag = true;
-		}
-	}
-
-	function loadImagebody()
-	{
-		if ($this->_mImageBodyLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('imagebody', 'base');
-			$this->mImageBody =& $handler->get($this->get('image_id'));
-			$this->_mImageBodyLoadedFlag = true;
-		}
-	}
-
-	function &createImagebody()
-	{
-		$handler =& xoops_getmodulehandler('imagebody', 'base');
-		$obj =& $handler->create();
-		$obj->set('image_id', $this->get('image_id'));
-		return $obj;
-	}
-}
-
-class BaseImageHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "image";
-	var $mPrimary = "image_id";
-	var $mClass = "BaseImageObject";
-
-	function insert(&$obj, $force = false)
-	{
-		if (parent::insert($obj, $force)) {
-			if (is_object($obj->mImageBody)) {
-				$obj->mImageBody->set('image_id', $obj->get('image_id'));
-				$handler =& xoops_getmodulehandler('imagebody', 'base');
-				return $handler->insert($obj->mImageBody, $force);
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-	
-	/**
-	 *
-	 * Delete object and image file.
-	 *
-	 * @param $obj    BaseImageObject
-	 * @param $force  boolean
-	 * @return boolean
-	 */	
-	function delete(&$obj, $force = false)
-	{
-		$obj->loadImagebody();
-			
-		if (parent::delete($obj, $force)) {
-			$filepath = XOOPS_UPLOAD_PATH . "/" . $obj->get('image_name');
-			if (file_exists($filepath)) {
-				@unlink($filepath);
-			}
-			
-			if (is_object($obj->mImageBody)) {
-				$handler =& xoops_getmodulehandler('imagebody', 'base');
-				$handler->delete($obj->mImageBody, $force);
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/block_module_link.php
diff -u xoops2jp/html/modules/base/class/block_module_link.php:1.1.2.1 xoops2jp/html/modules/base/class/block_module_link.php:removed
--- xoops2jp/html/modules/base/class/block_module_link.php:1.1.2.1	Thu Apr  6 14:59:33 2006
+++ xoops2jp/html/modules/base/class/block_module_link.php	Tue Nov  7 17:04:31 2006
@@ -1,21 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseBlock_module_linkObject extends XoopsSimpleObject
-{
-	function BaseBlock_module_linkObject()
-	{
-		$this->initVar('block_id', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('module_id', XOBJ_DTYPE_INT, '0', true);
-	}
-}
-
-class BaseBlock_module_linkHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "block_module_link";
-	var $mPrimary = "block_id";
-	var $mClass = "BaseBlock_module_linkObject";
-}
-
-?>
Index: xoops2jp/html/modules/base/class/columnside.php
diff -u xoops2jp/html/modules/base/class/columnside.php:1.1.2.3 xoops2jp/html/modules/base/class/columnside.php:removed
--- xoops2jp/html/modules/base/class/columnside.php:1.1.2.3	Sat Aug 26 16:15:08 2006
+++ xoops2jp/html/modules/base/class/columnside.php	Tue Nov  7 17:04:31 2006
@@ -1,80 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-
-class BaseColumnsideObject extends XoopsSimpleObject
-{
-	function BaseColumnsideObject()
-	{
-		$this->initVar('id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 255);
-	}
-}
-
-class BaseColumnsideHandler extends XoopsObjectHandler
-{
-	var $_mResults = array();
-	
-	function BaseColumnsideHandler(&$db)
-	{
-		$t_arr = array (
-				0 => _AD_BASE_LANG_SIDE_BLOCK_LEFT,
-				1 => _AD_BASE_LANG_SIDE_BLOCK_RIGHT,
-				3 => _AD_BASE_LANG_CENTER_BLOCK_LEFT,
-				4 => _AD_BASE_LANG_CENTER_BLOCK_RIGHT,
-				5 => _AD_BASE_LANG_CENTER_BLOCK_CENTER
-			);
-			
-		foreach ($t_arr as $id => $name) {
-			$this->_mResults[$id] =& $this->create();
-			$this->_mResults[$id]->setVar('id', $id);
-			$this->_mResults[$id]->setVar('name', $name);
-		}
-	}
-	
-	function &create()
-	{
-		$ret =& new BaseColumnsideObject();
-		return $ret;
-	}
-	
-	function &get($id)
-	{
-		if (isset($this->_mResults[$id])) {
-			return $this->_mResults[$id];
-		}
-		
-		$ret = null;
-		return $ret;
-	}
-	
-	function &getObjects($criteria = null, $id_as_key = false)
-	{
-		if ($id_as_key) {
-			return $this->_mResults;
-		}
-		else {
-			$ret = array();
-		
-			foreach (array_keys($this->_mResults) as $key) {
-				$ret[] =& $this->_mResults[$key];
-			}
-			
-			return $ret;
-		}
-	}
-	
-	function insert(&$obj)
-	{
-		return false;
-	}
-
-	function delete(&$obj)
-	{
-		return false;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/commentstatus.php
diff -u xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.3.2.1 xoops2jp/html/modules/base/class/commentstatus.php:removed
--- xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.3.2.1	Thu Oct  5 19:18:14 2006
+++ xoops2jp/html/modules/base/class/commentstatus.php	Tue Nov  7 17:04:31 2006
@@ -1,82 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-
-class BaseCommentstatusObject extends XoopsSimpleObject
-{
-	function BaseCommentstatusObject()
-	{
-		$this->initVar('id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 255);
-	}
-}
-
-class BaseCommentstatusHandler extends XoopsObjectHandler
-{
-	var $_mResults = array();
-	
-	function BaseCommentstatusHandler(&$db)
-	{
-		$root =& XCube_Root::getSingleton();
-		$language = $root->mContext->getXoopsConfig('language');
-		$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
-
-		$this->_mResults[XOOPS_COMMENT_PENDING] =& $this->create();
-		$this->_mResults[XOOPS_COMMENT_PENDING]->setVar('id', XOOPS_COMMENT_PENDING);
-		$this->_mResults[XOOPS_COMMENT_PENDING]->setVar('name', _CM_PENDING);
-		
-		$this->_mResults[XOOPS_COMMENT_ACTIVE] =& $this->create();
-		$this->_mResults[XOOPS_COMMENT_ACTIVE]->setVar('id', XOOPS_COMMENT_ACTIVE);
-		$this->_mResults[XOOPS_COMMENT_ACTIVE]->setVar('name', _CM_ACTIVE);
-
-		$this->_mResults[XOOPS_COMMENT_HIDDEN] =& $this->create();
-		$this->_mResults[XOOPS_COMMENT_HIDDEN]->setVar('id', XOOPS_COMMENT_HIDDEN);
-		$this->_mResults[XOOPS_COMMENT_HIDDEN]->setVar('name', _CM_HIDDEN);
-	}
-	
-	function &create()
-	{
-		$ret =& new BaseCommentstatusObject();
-		return $ret;
-	}
-	
-	function get($id)
-	{
-		if (isset($this->_mResults[$id])) {
-			return $this->_mResults[$id];
-		}
-		
-		$ret = null;
-		return $ret;
-	}
-	
-	function &getObjects($criteria = null, $id_as_key = false)
-	{
-		if ($id_as_key) {
-			return $this->_mResults;
-		}
-		else {
-			$ret = array();
-		
-			foreach (array_keys($this->_mResults) as $key) {
-				$ret[] =& $this->_mResults[$key];
-			}
-			
-			return $ret;
-		}
-	}
-	
-	function insert(&$obj)
-	{
-		return false;
-	}
-
-	function delete(&$obj)
-	{
-		return false;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.4 xoops2jp/html/modules/base/class/ActionFrame.class.php:removed
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.12.2.4	Tue Oct 10 15:12:38 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Tue Nov  7 17:04:31 2006
@@ -1,221 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-define ("LEGACY_FRAME_PERFORM_SUCCESS", 1);
-define ("LEGACY_FRAME_PERFORM_FAIL", 2);
-define ("LEGACY_FRAME_INIT_SUCCESS", 3);
-
-define ("LEGACY_FRAME_VIEW_NONE", 1);
-define ("LEGACY_FRAME_VIEW_SUCCESS", 2);
-define ("LEGACY_FRAME_VIEW_ERROR", 3);
-define ("LEGACY_FRAME_VIEW_INDEX", 4);
-define ("LEGACY_FRAME_VIEW_INPUT", 5);
-define ("LEGACY_FRAME_VIEW_PREVIEW", 6);
-define ("LEGACY_FRAME_VIEW_CANCEL", 7);
-
-//
-// Constatns for the mode of the frame.
-//
-define ("LEGACY_FRAME_MODE_MISC", "Misc");
-define ("LEGACY_FRAME_MODE_NOTIFY", "Notify");
-define ("LEGACY_FRAME_MODE_IMAGE", "Image");
-define ("LEGACY_FRAME_MODE_SEARCH", "Search");
-
-class Legacy_ActionFrame
-{
-	var $mActionName = null;
-	var $mAction = null;
-	var $mAdminFlag = null;
-
-	/**
-	 * Mode. The rule refers this property to load a file and create an
-	 * instance in execute().
-	 * 
-	 * @var string
-	 */	
-	var $mMode = null;
-
-	function Legacy_ActionFrame($admin)
-	{
-		$this->mAdminFlag = $admin;
-	}
-
-	function setActionName($name)
-	{
-		$this->mActionName = $name;
-		
-		//
-		// Temp FIXME!
-		//
-		$root =& XCube_Root::getSingleton();
-		$root->mContext->setAttribute('actionName', $name);
-		$root->mContext->mModule->setAttribute('actionName', $name);
-	}
-	
-	/**
-	 * Set mode.
-	 * 
-	 * @param string $mode   Use constants (LEGACY_FRAME_MODE_MISC and more...)
-	 */
-	function setMode($mode)
-	{
-		$this->mMode = $mode;
-	}
-
-	function execute(&$controller)
-	{
-		if (strlen($this->mActionName) > 0 && !preg_match("/^\w+$/", $this->mActionName)) {
-			die();
-		}
-
-		//
-		// Actions of the public side in this module are hook type. So it's
-		// necessary to load catalog here.
-		//		
-		if (!$this->mAdminFlag) {
-			$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
-		}
-		
-		//
-		// Add mode.
-		//
-		$this->setActionName($this->mMode . $this->mActionName);
-	
-		//
-		// Create action object by mActionName
-		//
-		$className = "Legacy_" . ucfirst($this->mActionName) . "Action";
-		$fileName = ucfirst($this->mActionName) . "Action";
-		if ($this->mAdminFlag) {
-			$fileName = XOOPS_MODULE_PATH . "/base/admin/actions/${fileName}.class.php";
-		}
-		else {
-			$fileName = XOOPS_MODULE_PATH . "/base/actions/${fileName}.class.php";
-		}
-	
-		if (!file_exists($fileName)) {
-			die();
-		}
-	
-		require_once $fileName;
-	
-		if (class_exists($className)) {
-			$this->mAction =& new $className($this->mAdminFlag);
-		}
-	
-		if (!is_object($this->mAction)) {
-			die();
-		}
-		
-		$this->mAction->prepare($controller, $controller->mRoot->mContext->mXoopsUser);
-	
-		if (!$this->mAction->hasPermission($controller, $controller->mRoot->mContext->mXoopsUser)) {
-			if ($this->mAdminFlag) {
-				$controller->executeForward(XOOPS_URL . "/admin.php");
-			}
-			else {
-				$controller->executeForward(XOOPS_URL);
-			}
-		}
-	
-		if (xoops_getenv("REQUEST_METHOD") == "POST") {
-			$viewStatus = $this->mAction->execute($controller, $controller->mRoot->mContext->mXoopsUser);
-		}
-		else {
-			$viewStatus = $this->mAction->getDefaultView($controller, $controller->mRoot->mContext->mXoopsUser);
-		}
-	
-		switch($viewStatus) {
-			case LEGACY_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-		
-			case LEGACY_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-		
-			case LEGACY_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-		
-			case LEGACY_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-
-			case LEGACY_FRAME_VIEW_PREVIEW:
-				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-
-			case LEGACY_FRAME_VIEW_CANCEL:
-				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
-				break;
-		}
-	}
-}
-
-class Legacy_Action
-{
-	/**
-	 * @access private
-	 */
-	var $_mAdminFlag = false;
-	
-	function Legacy_Action($adminFlag = false)
-	{
-		$this->_mAdminFlag = $adminFlag;
-	}
-
-	function hasPermission(&$controller, &$xoopsUser)
-	{
-		if ($this->_mAdminFlag) {
-			return $controller->mRoot->mContext->mUser->isInRole('Module.base.Admin');
-		}
-		else {
-			//
-			// TODO Really?
-			//
-			return true;
-		}
-	}
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		return LEGACY_FRAME_VIEW_NONE;
-	}
-
-	function execute(&$controller, &$xoopsUser)
-	{
-		return LEGACY_FRAME_VIEW_NONE;
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-	}
-
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-	}
-
-	function executeViewPreview(&$controller, &$xoopsUser, &$render)
-	{
-	}
-
-	function executeViewCancel(&$controller, &$xoopsUser, &$render)
-	{
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/non_installation_module.php
diff -u xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.3 xoops2jp/html/modules/base/class/non_installation_module.php:removed
--- xoops2jp/html/modules/base/class/non_installation_module.php:1.1.2.3	Tue Aug  1 19:48:00 2006
+++ xoops2jp/html/modules/base/class/non_installation_module.php	Tue Nov  7 17:04:31 2006
@@ -1,82 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * This handler handles XoopsModule objects without DB. So it doesn't implement
- * some methods for difficult query. Only override methods are usable.
- */
-class BaseNon_installation_moduleHandler extends XoopsObjectHandler
-{
-	/**
-	 * object cache.
-	 * 
-	 * @var Array
-	 */
-	var $_mXoopsModules = array();
-
-	/**
-	 * readonly property
-	 */
-	var $_mExclusions = array(".", "..", "CVS");
-	
-	function BaseNon_installation_moduleHandler(&$db)
-	{
-		parent::XoopsObjectHandler($db);
-		$this->_setupObjects();
-	}
-
-	/**
-	 * Once, load module objects to a member property from XOOPS_MODULE_PATH.
-	 */
-	function _setupObjects()
-	{
-		if (count($this->_mXoopsModules) == 0) {
-			if ($handler = opendir(XOOPS_MODULE_PATH))	{
-				while (($dir = readdir($handler)) !== false) {
-					if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
-						$module =& $this->get($dir);
-						if ($module !== false ) {
-							$this->_mXoopsModules[] =& $module;
-							unset($module);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Return module object by $dirname that is specified module directory.
-	 * If specified module has been installed or doesn't keep xoops_version, not return it.
-	 * @param $dirname string
-	 * @param XoopsModule or false
-	 */
-	function &get($dirname)
-	{
-		$ret = false;
-		
-		if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/xoops_version.php")) {
-			return $ret;
-		}
-
-		$moduleHandler =& xoops_gethandler('module');
-
-		$check =& $moduleHandler->getByDirname($dirname);
-		if (is_object($check)) {
-			return $ret;
-		}
-
-		$module =& $moduleHandler->create();
-		$module->loadInfoAsVar($dirname);
-		
-		return $module;
-	}
-
-	function &getObjects($criteria=null)
-	{
-		return $this->_mXoopsModules;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/Legacy_Utils.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_Utils.class.php:1.1.2.2 xoops2jp/html/modules/base/class/Legacy_Utils.class.php:removed
--- xoops2jp/html/modules/base/class/Legacy_Utils.class.php:1.1.2.2	Sat Oct 14 02:51:41 2006
+++ xoops2jp/html/modules/base/class/Legacy_Utils.class.php	Tue Nov  7 17:04:31 2006
@@ -1,115 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: Legacy_Utils.class.php,v 1.1.2.2 2006/10/13 17:51:41 minahito Exp $
- */
-
-/**
- * The static member functions class for Legacy.
- */
-class Legacy_Utils
-{
-	/**
-	 * Checks whether must modules have been installed.
-	 * @static
-	 * @return mixed Returns hashmap including the list of uninstalled,
-	 * disabled and recommended modules, basically. But, if there is no problem,
-	 * returns true.
-	 */
-	function checkSystemModules()
-	{
-		$root=&XCube_Root::getSingleton();
-		$systemModules = array_map('trim', explode(',', $root->getSiteConfig('Cube', 'SystemModules')));
-		$recommendedModules = array_map('trim', explode(',', $root->getSiteConfig('Cube',' RecommendedModules')));
-		$moduleHandler =& xoops_gethandler('module');
-		$uninstalledModules = array();
-		$disabledModules = array();
-		foreach ($systemModules as $systemModule) {
-			if (!empty($systemModule)) {
-				if (!($moduleObject =& $moduleHandler->getByDirname($systemModule))) {
-					$uninstalledModules[] = $systemModule;
-				}
-				elseif (!$moduleObject->get('isactive')) {
-					$disabledModules[] = $systemModule;
-				}
-			}
-		}
-		if (count($uninstalledModules) == 0 && count($disabledModules) == 0) {
-			return true;
-		}
-		else {
-			return array('uninstalled' =>$uninstalledModules, 'disabled'=>$disabledModules, 'recommended'=>$recommendedModules);
-		}
-	}
-	
-	/**
-	 * Creates a instance of the module with the generating convention. And,
-	 * returns it.
-	 * @param XoopsModule $module
-	 * @return Legacy_Module
-	 */
-	function &createModule($module)
-	{
-		$instance = null;
-		$dirname = $module->get('dirname');
-		
-		//
-		// IMPORTANT CONVENTION
-		//
-		$className = ucfirst($dirname) . "_Module";
-		if (!class_exists($className)) {
-			$filePath = XOOPS_ROOT_PATH . "/modules/${dirname}/class/Module.class.php";
-			if (file_exists($filePath)) {
-				require_once $filePath;
-			}
-		}
-		
-		if (class_exists($className)) {
-			$instance =& new $className($module);
-		}
-		else {
-			$instance =& new Legacy_ModuleAdapter($module);
-		}
-		
-		return $instance;
-	}
-	
-	/**
-	 * Creates a instance of the block procedure with the generating convention.
-	 * And, returns it.
-	 * @static
-	 * @return Legacy_BlockProcedure
-	 */
-	function createBlockProcedure(&$block)
-	{
-		//
-		// IMPORTANT CONVENTION
-		//
-		$retBlock = null;
-		$func = $block->get('show_func');
-		if (substr($func, 0, 4) == 'cl::') {
-			$className = ucfirst($block->get('dirname')) . '_' . substr($func, 4);
-			if (!class_exists($className)) {
-				$filePath = XOOPS_ROOT_PATH . '/modules/' . $block->get('dirname') . '/blocks/' . $block->get('func_file');
-				if (!file_exists($filePath)) {
-					continue;
-				}
-				
-				require_once $filePath;
-				
-				if (!class_exists($className)) {
-					continue;
-				}
-			}
-				
-			$retBlock =& new $className($block);
-		}
-		else {
-			$retBlock =& new Legacy_BlockProcedureAdapter($block);
-		}
-		
-		return $retBlock;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/class/imagebody.php
diff -u xoops2jp/html/modules/base/class/imagebody.php:1.1.2.3 xoops2jp/html/modules/base/class/imagebody.php:removed
--- xoops2jp/html/modules/base/class/imagebody.php:1.1.2.3	Fri Aug  4 19:54:45 2006
+++ xoops2jp/html/modules/base/class/imagebody.php	Tue Nov  7 17:04:31 2006
@@ -1,21 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseImagebodyObject extends XoopsSimpleObject
-{
-	function BaseImagebodyObject()
-	{
-		$this->initVar('image_id', XOBJ_DTYPE_INT, '', false);
-		$this->initVar('image_body', XOBJ_DTYPE_TEXT, '', true);
-	}
-}
-
-class BaseImagebodyHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "imagebody";
-	var $mPrimary = "image_id";
-	var $mClass = "BaseImagebodyObject";
-}
-
-?>
Index: xoops2jp/html/modules/base/class/theme.php
diff -u xoops2jp/html/modules/base/class/theme.php:1.1.2.3.2.1 xoops2jp/html/modules/base/class/theme.php:removed
--- xoops2jp/html/modules/base/class/theme.php:1.1.2.3.2.1	Thu Sep 28 14:01:41 2006
+++ xoops2jp/html/modules/base/class/theme.php	Tue Nov  7 17:04:31 2006
@@ -1,101 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
-
-class BaseThemeObject extends XoopsSimpleObject
-{
-	function BaseThemeObject()
-	{
-		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('dirname', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('screenshot', XOBJ_DTYPE_STRING, '', false, 255);
-		$this->initVar('description', XOBJ_DTYPE_STRING, '', false, 255);
-		$this->initVar('format', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('render_system', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('version', XOBJ_DTYPE_STRING, '', true, 32);
-		$this->initVar('author', XOBJ_DTYPE_STRING, '', true, 64);
-		$this->initVar('url', XOBJ_DTYPE_STRING, '', true, 255);
-	}
-}
-
-class BaseThemeHandler extends XoopsObjectHandler
-{
-	var $_mResults = array();
-	
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mGetInstalledThemes = null;
-	
-	function BaseThemeHandler(&$db)
-	{
-		$this->mGetInstalledThemes =& new XCube_Delegate();
-		$this->mGetInstalledThemes->register('BaseThemeHandler.GetInstalledThemes');
-	}
-	
-	function &create()
-	{
-		$ret =& new BaseThemeObject();
-		return $ret;
-	}
-	
-	function &get($name)
-	{
-		$ret = null;
-		$this->_makeCache();
-		
-		foreach (array_keys($this->_mResults) as $key) {
-			if ($this->_mResults[$key]->get('dirname') == $name) {
-				return $this->_mResults[$key];
-			}
-		}
-		
-		return $ret;
-	}
-	
-	function &getObjects($criteria = null, $id_as_key = false)
-	{
-		$this->_makeCache();
-		return $this->_mResults;
-	}
-	
-	/**
-	 * Create cache at $this->mResult by Delegate, if cache is empty.
-	 */
-	function _makeCache()
-	{
-		if (count($this->_mResults) == 0) {
-			$t_themeArr = array();
-			$this->mGetInstalledThemes->call(new XCube_Ref($t_themeArr));
-			
-			foreach ($t_themeArr as $theme) {
-				$obj =& $this->create();
-				$obj->set('name', $theme->mName);
-				$obj->set('dirname', $theme->mDirname);
-				$obj->set('screenshot', $theme->mScreenShot);
-				$obj->set('description', $theme->mDescription);
-				$obj->set('format', $theme->mFormat);
-				$obj->set('render_system', $theme->mRenderSystemName);
-				$obj->set('version', $theme->mVersion);
-				$obj->set('author', $theme->mAuthor);
-				$obj->set('url', $theme->mUrl);
-				$this->_mResults[] =& $obj;
-				unset($obj);
-			}
-		}
-	}
-	
-	function insert(&$obj, $force = false)
-	{
-		return false;
-	}
-
-	function delete(&$obj, $force = false)
-	{
-		return false;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/base/class/AbstractEditAction.class.php:1.1.2.5 xoops2jp/html/modules/base/class/AbstractEditAction.class.php:removed
--- xoops2jp/html/modules/base/class/AbstractEditAction.class.php:1.1.2.5	Wed Aug  2 18:46:28 2006
+++ xoops2jp/html/modules/base/class/AbstractEditAction.class.php	Tue Nov  7 17:04:31 2006
@@ -1,93 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: AbstractEditAction.class.php,v 1.1.2.5 2006/08/02 09:46:28 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Legacy_AbstractEditAction extends Legacy_Action
-{
-	var $mObject = null;
-	var $mObjectHandler = null;
-	var $mActionForm = null;
-
-	function _getId()
-	{
-	}
-
-	function &_getHandler()
-	{
-	}
-
-	function _setupActionForm()
-	{
-	}
-
-	function _setupObject()
-	{
-		$id = $this->_getId();
-		
-		$this->mObjectHandler =& $this->_getHandler();
-		
-		$this->mObject =& $this->mObjectHandler->get($id);
-	
-		if ($this->mObject == null && $this->isEnableCreate()) {
-			$this->mObject =& $this->mObjectHandler->create();
-		}
-	}
-
-	function isEnableCreate()
-	{
-		return true;
-	}
-
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$this->_setupObject();
-		$this->_setupActionForm();
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		if ($this->mObject == null) {
-			return LEGACY_FRAME_VIEW_ERROR;
-		}
-	
-		$this->mActionForm->load($this->mObject);
-	
-		return LEGACY_FRAME_VIEW_INPUT;
-	}
-
-	function execute(&$controller, &$xoopsUser)
-	{
-		if ($this->mObject == null) {
-			return LEGACY_FRAME_VIEW_ERROR;
-		}
-	
-		if (xoops_getrequest('_form_control_cancel') != null) {
-			return LEGACY_FRAME_VIEW_CANCEL;
-		}
-
-		$this->mActionForm->load($this->mObject);
-		
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-	
-		if($this->mActionForm->hasError()) {
-			return LEGACY_FRAME_VIEW_INPUT;
-		}
-	
-		$this->mActionForm->update($this->mObject);
-		
-		return $this->_doExecute($this->mObject) ? LEGACY_FRAME_VIEW_SUCCESS
-		                                         : LEGACY_FRAME_VIEW_ERROR;
-	}
-
-	function _doExecute()
-	{
-		return $this->mObjectHandler->insert($this->mObject);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6.2.1 xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:removed
--- xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.6.2.1	Thu Oct 12 20:03:16 2006
+++ xoops2jp/html/modules/base/class/AbstractFilterForm.class.php	Tue Nov  7 17:04:31 2006
@@ -1,76 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Legacy_AbstractFilterForm
-{
-	var $mSort = 0;
-	var $mSortKeys = array();
-	var $_mCriteria = null;
-	var $mNavi = null;
-	
-	var $_mHandler = null;
-	
-	function Legacy_AbstractFilterForm(&$navi, &$handler)
-	{
-		$this->mNavi =& $navi;
-		$this->_mHandler =& $handler;
-		
-		$this->_mCriteria =& new CriteriaCompo();
-		
-		$this->mNavi->mGetTotalItems->add(array(&$this, 'getTotalItems'));
-	}
-	
-	function getDefaultSortKey()
-	{
-	}
-	
-	function getTotalItems(&$total)
-	{
-		$total = $this->_mHandler->getCount($this->getCriteria());
-	}
-	
-	function fetchSort()
-	{
-		$root =& XCube_Root::getSingleton();
-		$this->mSort = intval($root->mContext->mRequest->getRequest('sort'));
-		
-		if (!isset($this->mSortKeys[abs($this->mSort)])) {
-			$this->mSort = $this->getDefaultSortKey();
-		}
-		
-		$this->mNavi->mSort['sort'] = $this->mSort;
-	}
-
-	function fetch()
-	{
-		$this->mNavi->fetch();
-		$this->fetchSort();
-	}
-	
-	function getSort()
-	{
-		$sortkey = abs($this->mNavi->mSort['sort']);
-		return isset($this->mSortKeys[$sortkey]) ? $this->mSortKeys[$sortkey] : null;
-	}
-
-	function getOrder()
-	{
-		return ($this->mSort < 0) ? "DESC" : "ASC";
-	}
-
-	function getCriteria($start = null, $limit = null)
-	{
-		$t_start = ($start === null) ? $this->mNavi->getStart() : intval($start);
-		$t_limit = ($limit === null) ? $this->mNavi->getPerpage() : intval($limit);
-		
-		$criteria = $this->_mCriteria;
-		
-		$criteria->setStart($t_start);
-		$criteria->setLimit($t_limit);
-		
-		return $criteria;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/AbstractDeleteAction.class.php
diff -u xoops2jp/html/modules/base/class/AbstractDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/base/class/AbstractDeleteAction.class.php:removed
--- xoops2jp/html/modules/base/class/AbstractDeleteAction.class.php:1.1.2.2	Tue Mar 28 22:29:21 2006
+++ xoops2jp/html/modules/base/class/AbstractDeleteAction.class.php	Tue Nov  7 17:04:31 2006
@@ -1,20 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractEditAction.class.php";
-
-class Legacy_AbstractDeleteAction extends Legacy_AbstractEditAction
-{
-	function isEnableCreate()
-	{
-		return false;
-	}
-
-	function _doExecute()
-	{
-		return $this->mObjectHandler->delete($this->mObject);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/Legacy_Validator.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_Validator.class.php:1.1.2.3.2.2 xoops2jp/html/modules/base/class/Legacy_Validator.class.php:removed
--- xoops2jp/html/modules/base/class/Legacy_Validator.class.php:1.1.2.3.2.2	Fri Sep 29 17:14:01 2006
+++ xoops2jp/html/modules/base/class/Legacy_Validator.class.php	Tue Nov  7 17:04:31 2006
@@ -1,31 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_Validator.class.php";
-
-class XCube_ObjectExistValidator extends XCube_Validator
-{
-	function isValid(&$form, $vars)
-	{
-		if ($form->isNull()) {
-			return true;
-		}
-		else {
-			$handleName = $vars['handler'];
-			$moduleName = isset($vars['module']) ? $vars['module'] : null;
-			
-			if ($moduleName == null) {
-				$handler =& xoops_gethandler($handleName);
-			}
-			else {
-				$handler =& xoops_getmodulehandler($handleName, $moduleName);
-			}
-			$obj =& $handler->get($form->getValue());
-			
-			return is_object($obj);
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/class/imagecategory.php
diff -u xoops2jp/html/modules/base/class/imagecategory.php:1.1.2.4 xoops2jp/html/modules/base/class/imagecategory.php:removed
--- xoops2jp/html/modules/base/class/imagecategory.php:1.1.2.4	Tue May 30 12:55:26 2006
+++ xoops2jp/html/modules/base/class/imagecategory.php	Tue Nov  7 17:04:31 2006
@@ -1,248 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseImagecategoryObject extends XoopsSimpleObject
-{
-	var $mImage = array();
-	var $_mImageLoadedFlag = false;
-
-	/**
-	 * Array of group objects which are allowed to read files of this category.
-	 */	
-	var $mReadGroups = array();
-	var $_mReadGroupsLoadedFlag = false;
-
-	/**
-	 * Array of group objects which are allowed to upload a file to this category.
-	 */	
-	var $mUploadGroups = array();
-	var $_mUploadGroupsLoadedFlag = false;
-	
-
-	function BaseImagecategoryObject()
-	{
-		$this->initVar('imgcat_id', XOBJ_DTYPE_INT, '', false);
-		$this->initVar('imgcat_name', XOBJ_DTYPE_STRING, '', true, 100);
-		$this->initVar('imgcat_maxsize', XOBJ_DTYPE_INT, '50000', true);
-		$this->initVar('imgcat_maxwidth', XOBJ_DTYPE_INT, '120', true);
-		$this->initVar('imgcat_maxheight', XOBJ_DTYPE_INT, '120', true);
-		$this->initVar('imgcat_display', XOBJ_DTYPE_BOOL, '1', true);
-		$this->initVar('imgcat_weight', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('imgcat_type', XOBJ_DTYPE_STRING, 'C', true, 1);
-		$this->initVar('imgcat_storetype', XOBJ_DTYPE_STRING, 'file', true, 5);
-	}
-
-	function loadImage()
-	{
-		if ($this->_mImageLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('image', 'base');
-			$this->mImage =& $handler->getObjects(new Criteria('imagecat_id', $this->get('imagecat_id')));
-			$this->_mImageLoadedFlag = true;
-		}
-	}
-
-	function &createImage()
-	{
-		$handler =& xoops_getmodulehandler('image', 'base');
-		$obj =& $handler->create();
-		$obj->set('imagecat_id', $this->get('imagecat_id'));
-		return $obj;
-	}
-	
-	function getImageCount()
-	{
-		$handler =& xoops_getmodulehandler('image', 'base');
-		return $handler->getCount(new Criteria('imgcat_id', $this->get('imgcat_id')));
-	}
-	
-	function loadReadGroups()
-	{
-		if ($this->_mReadGroupsLoadedFlag) {
-			return;
-		}
-		
-		$handler =& xoops_gethandler('groupperm');
-		$gidArr = $handler->getGroupIds('imgcat_read', $this->get('imgcat_id'));
-		
-		$handler =& xoops_gethandler('group');
-		foreach ($gidArr as $gid) {
-			$object =& $handler->get($gid);
-			
-			if (is_object($object)) {
-				$this->mReadGroups[] =& $object;
-			}
-			
-			unset($object);
-		}
-		
-		$this->_mReadGroupsLoadedFlag = true;
-	}
-	
-	function isLoadedReadGroups()
-	{
-		return $this->_mReadGroupsLoadedFlag;
-	}
-
-	/**
-	 * If $groups has the permission of reading this object, return true.
-	 */	
-	function hasReadPerm($groups)
-	{
-		$this->loadReadGroups();
-		foreach (array_keys($this->mReadGroups) as $key) {
-			foreach ($groups as $group) {
-				if ($this->mReadGroups[$key]->get('groupid') == $group) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-
-	function loadUploadGroups()
-	{
-		if ($this->_mUploadGroupsLoadedFlag) {
-			return;
-		}
-		
-		$handler =& xoops_gethandler('groupperm');
-		$gidArr = $handler->getGroupIds('imgcat_write', $this->get('imgcat_id'));
-		
-		$handler =& xoops_gethandler('group');
-		foreach ($gidArr as $gid) {
-			$object =& $handler->get($gid);
-			
-			if (is_object($object)) {
-				$this->mUploadGroups[] =& $object;
-			}
-			
-			unset($object);
-		}
-		
-		$this->_mUploadGroupsLoadedFlag = true;
-	}
-	
-	function isLoadedUploadGroups()
-	{
-		return $this->_mUploadGroupsLoadedFlag;
-	}
-
-	function hasUploadPerm($groups)
-	{
-		$this->loadUploadGroups();
-		foreach (array_keys($this->mUploadGroups) as $key) {
-			foreach ($groups as $group) {
-				if ($this->mUploadGroups[$key]->get('groupid') == $group) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-}
-
-class BaseImagecategoryHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "imagecategory";
-	var $mPrimary = "imgcat_id";
-	var $mClass = "BaseImagecategoryObject";
-
-	function insert(&$obj, $force = false)
-	{
-		$returnFlag = parent::insert($obj, $force);
-		
-		$handler =& xoops_gethandler('groupperm');
-		
-		//
-		// If the object has groups which are allowed to read.
-		//
-		if ($obj->isLoadedReadGroups()) {
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_itemid', $obj->get('imgcat_id')));
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$criteria->add(new Criteria('gperm_name', 'imgcat_read'));
-			$handler->deleteAll($criteria);
-			
-			foreach ($obj->mReadGroups as $group) {
-				$perm =& $handler->create();
-				$perm->set('gperm_groupid', $group->get('groupid'));
-				$perm->set('gperm_itemid', $obj->get('imgcat_id'));
-				$perm->set('gperm_modid', 1);
-				$perm->set('gperm_name', 'imgcat_read');
-				
-				$returnFlag &= $handler->insert($perm, $force);
-			}
-		}
-
-		//
-		// If the object has groups which are allowed to upload.
-		//
-		if ($obj->isLoadedUploadGroups()) {
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_itemid', $obj->get('imgcat_id')));
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$criteria->add(new Criteria('gperm_name', 'imgcat_write'));
-			$handler->deleteAll($criteria);
-			
-			foreach ($obj->mUploadGroups as $group) {
-				$perm =& $handler->create();
-				$perm->set('gperm_groupid', $group->get('groupid'));
-				$perm->set('gperm_itemid', $obj->get('imgcat_id'));
-				$perm->set('gperm_modid', 1);
-				$perm->set('gperm_name', 'imgcat_write');
-				
-				$returnFlag &= $handler->insert($perm, $force);
-			}
-		}
-		
-		return $returnFlag;
-	}
-	
-	function &getObjectsWithReadPerm($groups = array(), $display = null)
-	{
-		$criteria = new CriteriaCompo();
-		if ($display != null) {
-			$criteria->add(new Criteria('imgcat_display', $display));
-		}
-		$criteria->setSort('imgcat_weight');
-		$objs =& $this->getObjects($criteria);
-		unset($criteria);
-
-		$handler =& xoops_gethandler('groupperm');
-		$ret = array();
-		foreach (array_keys($objs) as $key) {
-			if ($objs[$key]->hasReadPerm($groups)) {
-				$ret[] =& $objs[$key];
-			}
-		}
-		
-		return $ret;
-	}
-
-	function delete(&$obj, $force = false)
-	{
-		$handler =& xoops_getmodulehandler('image', 'base');
-		$handler->deleteAll(new Criteria('imagecat_id', $obj->get('imagecat_id')));
-		unset($handler);
-	
-		$handler =& xoops_gethandler('groupperm');
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('gperm_itemid', $obj->get('imgcat_id')));
-		$criteria->add(new Criteria('gperm_modid', 1));
-		
-		$nameCriteria =& new CriteriaCompo();
-		$nameCriteria->add(new Criteria('gperm_name', 'imgcat_read'));
-		$nameCriteria->add(new Criteria('gperm_name', 'imgcat_write'), 'OR');
-		
-		$criteria->add($nameCriteria);
-		
-		$handler->deleteAll($criteria);
-
-		return parent::delete($obj, $force);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u xoops2jp/html/modules/base/class/newblocks.php:1.1.2.5 xoops2jp/html/modules/base/class/newblocks.php:removed
--- xoops2jp/html/modules/base/class/newblocks.php:1.1.2.5	Tue Apr 11 11:05:59 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Tue Nov  7 17:04:31 2006
@@ -1,128 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseNewblocksObject extends XoopsSimpleObject
-{
-	var $mModule = null;
-	
-	/**
-	 * Array of group objects who can access this object.
-	 * It need lazy loading to access.
-	 */
-	var $mGroup = array();
-	
-	var $mBmodule = array();
-	
-	var $mColumn = null;
-	
-	var $mCachetime = null;
-
-	function BaseNewblocksObject()
-	{
-		$this->initVar('bid', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('mid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('func_num', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('options', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 150);
-		$this->initVar('title', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('content', XOBJ_DTYPE_TEXT, '', true);
-		$this->initVar('side', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('weight', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('visible', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('block_type', XOBJ_DTYPE_STRING, '', true, 1);
-		$this->initVar('c_type', XOBJ_DTYPE_STRING, '', true, 1);
-		$this->initVar('isactive', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('dirname', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('func_file', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('show_func', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('edit_func', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('template', XOBJ_DTYPE_STRING, '', true, 50);
-		$this->initVar('bcachetime', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('last_modified', XOBJ_DTYPE_INT, '0', true);
-	}
-	
-	function loadModule()
-	{
-		$handler =& xoops_gethandler('module');
-		$this->mModule =& $handler->get($this->get('mid'));
-	}
-
-	/**
-	 * Load group objects who can access this object. And, set the objects to mGroup.
-	 * 
-	 * TODO Need lock double loading.
-	 */	
-	function loadGroup()
-	{
-		$handler =& xoops_gethandler('groupperm');
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('gperm_modid', 1));
-		$criteria->add(new Criteria('gperm_itemid', $this->get('bid')));
-		$criteria->add(new Criteria('gperm_name', 'block_read'));
-		
-		$gpermArr =&  $handler->getObjects($criteria);
-		
-		$handler =& xoops_gethandler('group');
-		foreach ($gpermArr as $gperm) {
-			$this->mGroup[] =& $handler->get($gperm->get('gperm_groupid'));
-		}
-	}
-	
-	function loadBmodule()
-	{
-		$handler =& xoops_getmodulehandler('block_module_link', 'base');
-		$criteria =& new Criteria('block_id', $this->get('bid'));
-		
-		$this->mBmodule =& $handler->getObjects($criteria);
-	}
-	
-	function loadColumn()
-	{
-		$handler =& xoops_getmodulehandler('columnside', 'base');
-		$this->mColumn =& $handler->get($this->get('side'));
-	}
-	
-	function loadCachetime()
-	{
-		$handler =& xoops_gethandler('cachetime');
-		$this->mCachetime =& $handler->get($this->get('bcachetime'));
-	}
-}
-
-class BaseNewblocksHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "newblocks";
-	var $mPrimary = "bid";
-	var $mClass = "BaseNewblocksObject";
-	
-	function delete(&$obj, $force = false)
-	{
-		if (parent::delete($obj, $force)) {
-			//
-			// Delete related data from block_module_link.
-			//
-			$handler =& xoops_getmodulehandler('block_module_link', 'base');
-			$handler->deleteAll(new Criteria('block_id'), $obj->get('bid'));
-			
-			//
-			// Delete related permissions from groupperm.
-			//
-			$handler =& xoops_gethandler('groupperm');
-
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$criteria->add(new Criteria('gperm_itemid', $obj->get('bid')));
-			$criteria->add(new Criteria('gperm_name', 'block_read'));
-			
-			$handler->deleteAll($criteria);
-			
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/blockctype.php
diff -u xoops2jp/html/modules/base/class/blockctype.php:1.1.2.2 xoops2jp/html/modules/base/class/blockctype.php:removed
--- xoops2jp/html/modules/base/class/blockctype.php:1.1.2.2	Mon Apr 10 21:42:14 2006
+++ xoops2jp/html/modules/base/class/blockctype.php	Tue Nov  7 17:04:31 2006
@@ -1,77 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseBlockctypeObject extends XoopsSimpleObject
-{
-	function BaseBlockctypeObject()
-	{
-		$this->initVar('type', XOBJ_DTYPE_STRING, '', true);
-		$this->initVar('label', XOBJ_DTYPE_STRING, '', true, 255);
-	}
-}
-
-class BaseBlockctypeHandler extends XoopsObjectHandler
-{
-	var $_mResults = array();
-	
-	function BaseBlockctypeHandler(&$db)
-	{
-		$t_arr = array (
-				'H' => _AD_BASE_LANG_CTYPE_HTML,
-				'P' => _AD_BASE_LANG_CTYPE_PHP,
-				'S' => _AD_BASE_LANG_CTYPE_WITH_SMILIES,
-				'T' => _AD_BASE_LANG_CTYPE_WITHOUT_SMILIES
-			);
-			
-		foreach ($t_arr as $id => $name) {
-			$this->_mResults[$id] =& $this->create();
-			$this->_mResults[$id]->setVar('type', $id);
-			$this->_mResults[$id]->setVar('label', $name);
-		}
-	}
-	
-	function &create()
-	{
-		$ret =& new BaseBlockctypeObject();
-		return $ret;
-	}
-	
-	function get($id)
-	{
-		if (isset($this->_mResults[$id])) {
-			return $this->_mResults[$id];
-		}
-		
-		$ret = null;
-		return $ret;
-	}
-	
-	function &getObjects($criteria = null, $id_as_key = false)
-	{
-		if ($id_as_key) {
-			return $this->_mResults;
-		}
-		else {
-			$ret = array();
-		
-			foreach (array_keys($this->_mResults) as $key) {
-				$ret[] =& $this->_mResults[$key];
-			}
-			
-			return $ret;
-		}
-	}
-	
-	function insert(&$obj)
-	{
-		return false;
-	}
-
-	function delete(&$obj)
-	{
-		return false;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/DebuggerManager.class.php
diff -u xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.2.2.1 xoops2jp/html/modules/base/class/DebuggerManager.class.php:removed
--- xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.2.2.1	Thu Oct  5 18:07:31 2006
+++ xoops2jp/html/modules/base/class/DebuggerManager.class.php	Tue Nov  7 17:04:31 2006
@@ -1,161 +0,0 @@
-<?php
-// $Id: DebuggerManager.class.php,v 1.1.2.2.2.1 2006/10/05 09:07:31 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-define("XOOPS_DEBUG_OFF",0);
-define("XOOPS_DEBUG_PHP",1);
-define("XOOPS_DEBUG_MYSQL",2);
-define("XOOPS_DEBUG_SMARTY",3);
-
-class Legacy_DebuggerManager
-{
-	function getInstance($debug_mode)
-	{
-        static $instance = array();
-
-        if (empty($instance[$debug_mode])) {
-            $instance[$debug_mode] =& Legacy_DebuggerManager::_createInstance($debug_mode);
-        }
-        
-        return $instance[$debug_mode];
-	}
-	
-	/**
-	Create XoopsDebugger instance.
-	You must not communicate with this method directly.
-	*/
-	function &_createInstance($debug_mode)
-	{
-		$instance = null;
-		switch($debug_mode) {
-			case XOOPS_DEBUG_PHP:
-				$instance =& new Legacy_PHPDebugger();
-				break;
-
-			case XOOPS_DEBUG_MYSQL:
-				$instance =& new Legacy_MysqlDebugger();
-				break;
-
-			case XOOPS_DEBUG_SMARTY:
-				$instance =& new Legacy_SmartyDebugger();
-				break;
-			
-			case XOOPS_DEBUG_OFF:
-			default:
-				// @todo I can not realize abstract class to instance.
-				$instance =& new Legacy_AbstractDebugger();
-				break;
-		}
-		
-		return $instance;
-	}
-}
-
-class Legacy_AbstractDebugger
-{
-	function Legacy_AbstractDebugger()
-	{
-	}
-
-	function prepare()
-	{
-	}
-	
-	function isDebugRenderSystem()
-	{
-		return false;
-	}
-
-	/**
-	 * @return string Log as html code.
-	 */	
-	function renderLog()
-	{
-	}
-	
-	function displayLog()
-	{
-	}
-}
-
-/**
-This class works for "PHP debugging mode".
-*/
-class Legacy_PHPDebugger extends Legacy_AbstractDebugger
-{
-	function prepare()
-	{
-		error_reporting(E_ALL);
-	}
-}
-
-/**
-This class works for "Mysql debugging mode".
-*/
-class Legacy_MysqlDebugger extends Legacy_AbstractDebugger
-{
-	function renderLog()
-	{
-		$xoopsLogger =& XoopsLogger::instance();
-		return $xoopsLogger->dumpAll();
-	}
-	
-	function displayLog()
-	{
-        echo '<script type="text/javascript">
-        <!--//
-        debug_window = openWithSelfMain("", "xoops_debug", 680, 600, true);
-        ';
-        $content = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.htmlspecialchars($GLOBALS['xoopsConfig']['sitename']).'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($GLOBALS['xoopsConfig']['theme_set']).'" /></head><body>'.$this->renderLog().'<div style="text-align:center;"><input class="formButton" value="'._CLOSE.'" type="button" onclick="javascript:window.close();" /></div></body></html>';
-        $lines = preg_split("/(\r\n|\r|\n)( *)/", $content);
-        foreach ($lines as $line) {
-            echo 'debug_window.document.writeln("'.str_replace('"', '\"', $line).'");';
-        }
-        echo '
-        debug_window.document.close();
-        //-->
-        </script>';
-	}
-}
-
-
-/**
-This class works for "Smarty debugging mode".
-*/
-class Legacy_SmartyDebugger extends Legacy_AbstractDebugger
-{
-	function isDebugRenderSystem()
-	{
-		$root =& XCube_Root::getSingleton();
-		$user =& $root->mContext->mXoopsUser;
-		
-		return is_object($user) ? $user->isAdmin(0) : false;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/class/comment.php
diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.10 xoops2jp/html/modules/base/class/comment.php:removed
--- xoops2jp/html/modules/base/class/comment.php:1.1.2.10	Mon Aug  7 20:29:43 2006
+++ xoops2jp/html/modules/base/class/comment.php	Tue Nov  7 17:04:31 2006
@@ -1,145 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseCommentObject extends XoopsSimpleObject
-{
-	var $mUser = null;
-	var $mModule = null;
-	var $mStatus = null;
-	
-	function BaseCommentObject()
-	{
-		$this->initVar('com_id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('com_pid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_rootid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_modid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_itemid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_icon', XOBJ_DTYPE_STRING, '', true, 25);
-		$this->initVar('com_created', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_modified', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_uid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('com_ip', XOBJ_DTYPE_STRING, '', true, 15);
-		$this->initVar('com_title', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('com_text', XOBJ_DTYPE_TEXT, '', true);
-		$this->initVar('com_sig', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('com_status', XOBJ_DTYPE_INT, '1', true);
-		$this->initVar('com_exparams', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('dohtml', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('dosmiley', XOBJ_DTYPE_BOOL, '1', true);
-		$this->initVar('doxcode', XOBJ_DTYPE_BOOL, '1', true);
-		$this->initVar('doimage', XOBJ_DTYPE_BOOL, '1', true);
-		$this->initVar('dobr', XOBJ_DTYPE_BOOL, '1', true);
-	}
-	
-	/**
-	 * Load a user object who wrote this comment to $mUser. 
-	 */
-	function loadUser()
-	{
-		$handler =& xoops_gethandler('member');
-		$this->mUser =& $handler->getUser($this->get('com_uid'));
-	}
-	
-	/**
-	 * Load a module object to $mModule. 
-	 */
-	function loadModule()
-	{
-		$handler =& xoops_gethandler('module');
-		$this->mModule =& $handler->get($this->get('com_modid'));
-	}
-	
-	function loadStatus()
-	{
-		$handler =& xoops_getmodulehandler('commentstatus', 'base');
-		$this->mStatus =& $handler->get($this->get('com_status'));
-	}
-	
-	function getVar($key)
-	{
-		if ($key == 'com_text') {
-			$ts =& MyTextSanitizer::getInstance();
-			return $ts->displayTarea($this->get($key), $this->get('dohtml'), $this->get('dosmiley'), $this->get('doxcode'), $this->get('doimage'), $this->get('dobr'));
-		}
-		else {
-			return parent::getVar($key);
-		}
-	}
-}
-
-class BaseCommentHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "xoopscomments";
-	var $mPrimary = "com_id";
-	var $mClass = "BaseCommentObject";
-
-	/**
-	 * @var XCube_Delegate
-	 */	
-	var $mUpdateSuccess;
-	
-	/**
-	 * @var XCube_Delegate
-	 */	
-	var $mDeleteSuccess;
-	
-	function BaseCommentHandler(&$db)
-	{
-		parent::XoopsObjectGenericHandler($db);
-		
-		$this->mUpdateSuccess =& new XCube_Delegate();
-		$this->mDeleteSuccess =& new XCube_Delegate();
-	}
-	
-	function insert(&$comment, $force = false)
-	{
-		if (parent::insert($comment, $force)) {
-			$this->mUpdateSuccess->call($comment);
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-	
-	/**
-	 * Delete $comment and childlen of $comment.
-	 */
-	function delete(&$comment, $force = false)
-	{
-		$criteria =& new Criteria('com_pid', $comment->get('com_id'));
-		$this->deleteAll($criteria);
-		
-		if (parent::delete($comment, $force)) {
-			$this->mDeleteSuccess->call($comment);
-			return true;
-		}
-		else{
-			return false;
-		}
-	}
-
-	/**
-	 * 
-	 * Return array of module id that comments are written.
-	 * 
-	 * @return array
-	 */	
-	function getModuleIds()
-	{
-		$ret = array();
-
-		$sql = "SELECT DISTINCT com_modid FROM " . $this->mTable;
-		$res = $this->db->query($sql);
-		if ($res) {
-			while ($row = $this->db->fetchArray($res)) {
-				$ret[] = $row['com_modid'];
-			}
-		}
-		
-		return $ret;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/group_permission.php
diff -u xoops2jp/html/modules/base/class/group_permission.php:1.1.2.1 xoops2jp/html/modules/base/class/group_permission.php:removed
--- xoops2jp/html/modules/base/class/group_permission.php:1.1.2.1	Tue Oct  3 19:02:51 2006
+++ xoops2jp/html/modules/base/class/group_permission.php	Tue Nov  7 17:04:31 2006
@@ -1,56 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class BaseGroup_permissionObject extends XoopsSimpleObject
-{
-	function BaseGroup_permissionObject()
-	{
-		$this->initVar('gperm_id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('gperm_groupid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('gperm_itemid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('gperm_modid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('gperm_name', XOBJ_DTYPE_STRING, '', true, 50);
-	}
-}
-
-class BaseGroup_permissionHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "group_permission";
-	var $mPrimary = "gperm_id";
-	var $mClass = "BaseGroup_permissionObject";
-	
-	/**
-	 * Gets array of roles by array of group ID.
-	 * @param int $mid
-	 * @param array $groups
-	 * @return array
-	 */
-	function getRolesByModule($mid, $groups)
-	{
-		$retRoles = array();
-		
-		$sql = "SELECT gperm_name FROM " . $this->db->prefix($this->mTable) . " WHERE gperm_modid=" . intval($mid) . " AND gperm_itemid=0 AND ";
-		$groupSql = array();
-		
-		foreach ($groups as $gid) {
-			$groupSql[] = "gperm_groupid=" . intval($gid);
-		}
-		
-		$sql .= "(" . implode(' OR ', $groupSql) . ")";
-		
-		$result = $this->db->query($sql);
-		
-		if (!$result) {
-			return $retRoles;
-		}
-		
-		while ($row = $this->db->fetchArray($result)) {
-			$retRoles[] = $row['gperm_name'];
-		}
-		
-		return $retRoles;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/AbstractListAction.class.php
diff -u xoops2jp/html/modules/base/class/AbstractListAction.class.php:1.1.2.2.2.2 xoops2jp/html/modules/base/class/AbstractListAction.class.php:removed
--- xoops2jp/html/modules/base/class/AbstractListAction.class.php:1.1.2.2.2.2	Fri Oct 13 14:09:14 2006
+++ xoops2jp/html/modules/base/class/AbstractListAction.class.php	Tue Nov  7 17:04:31 2006
@@ -1,43 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_PageNavigator.class.php";
-
-class Legacy_AbstractListAction extends Legacy_Action
-{
-	var $mObjects = array();
-	
-	var $mFilter = null;
-
-	function &_getHandler()
-	{
-	}
-
-	function &_getFilterForm()
-	{
-	}
-
-	function _getBaseUrl()
-	{
-	}
-	
-	function &_getPageNavi()
-	{
-		$navi =& new XCube_PageNavigator($this->_getBaseUrl(), XCUBE_PAGENAVI_START);
-		return $navi;
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mFilter =& $this->_getFilterForm();
-		$this->mFilter->fetch();
-		
-		$handler =& $this->_getHandler();
-		$this->mObjects =& $handler->getObjects($this->mFilter->getCriteria());
-		
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/class/index.html
diff -u xoops2jp/html/modules/base/class/index.html:1.1.2.1 xoops2jp/html/modules/base/class/index.html:removed
--- xoops2jp/html/modules/base/class/index.html:1.1.2.1	Mon Mar 27 11:41:51 2006
+++ xoops2jp/html/modules/base/class/index.html	Tue Nov  7 17:04:31 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:32 +0900
Subject: [xoops-cvslog 5666] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20061107080432.565922AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/imagecategory_new.xml
diff -u xoops2jp/html/modules/base/admin/.xml/imagecategory_new.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/imagecategory_new.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/imagecategory_new.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/imagecategory_new.xml	Tue Nov  7 17:04:32 2006
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImagecategoryAdminNewForm" type="Legacy_ImagecategoryAdminEditForm">
-		<form-property name="imgcat_storetype" type="String" />
-  </form-bean>
-	<form-validation>
-    <field property="imgcat_storetype" depends="required,mask">
-      <arg0 key="const._AD_BASE_LANG_IMGCAT_STORETYPE" />
-      <msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-      <arg1 name="maxlength" key="${var:maxlength}" />
-      <msg name="mask" key="const._AD_BASE_ERROR_MASK" />
-      <var name="mask" value="(file|db)" />
-    </field>
-  </form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:1.1.2.4 xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml:1.1.2.4	Thu Sep 21 15:01:19 2006
+++ xoops2jp/html/modules/base/admin/.xml/imagecategory_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImagecategoryAdminEditForm" type="XCube_ActionForm">
-		<form-property name="imgcat_id" type="Int" />
-		<form-property name="imgcat_name" type="String" />
-		<form-property name="imgcat_maxsize" type="Int" />
-		<form-property name="imgcat_maxwidth" type="Int" />
-		<form-property name="imgcat_maxheight" type="Int" />
-		<form-property name="imgcat_display" type="Bool" />
-		<form-property name="imgcat_weight" type="Int" />
-
-    <form-property name="readgroups" type="Int[]" />
-    <form-property name="uploadgroups" type="Int[]" />
-  </form-bean>
-	<form-validation>
-		<field property="imgcat_id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="imgcat_name" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_NAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field>
-		<field property="imgcat_maxsize" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_MAXSIZE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="imgcat_maxwidth" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_MAXWIDTH" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="imgcat_maxheight" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_MAXHEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="imgcat_weight" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-    <field property="readgroups" depends="objectExist">
-      <arg0 key="const._AD_BASE_LANG_IMGCAT_READ_GROUPS" />
-      <msg name="objectExist" key="const._AD_BASE_ERROR_IMGCAT_READGROUPS" />
-      <var name="handler" value="group" />
-    </field>
-    <field property="uploadgroups" depends="objectExist">
-      <arg0 key="const._AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS" />
-      <msg name="objectExist" key="const._AD_BASE_ERROR_IMGCAT_UPLOADGROUPS" />
-      <var name="handler" value="group" />
-    </field>
-  </form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml
diff -u xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="NewblocksAdminDeleteForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="NewblocksAdminEditForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-		<form-property name="mid" type="Int" />
-		<form-property name="func_num" type="Int" />
-		<form-property name="options" type="String" />
-		<form-property name="name" type="String" />
-		<form-property name="title" type="String" />
-		<form-property name="content" type="Text" />
-		<form-property name="side" type="Bool" />
-		<form-property name="weight" type="Int" />
-		<form-property name="visible" type="Bool" />
-		<form-property name="block_type" type="String" />
-		<form-property name="c_type" type="String" />
-		<form-property name="isactive" type="Bool" />
-		<form-property name="dirname" type="String" />
-		<form-property name="func_file" type="String" />
-		<form-property name="show_func" type="String" />
-		<form-property name="edit_func" type="String" />
-		<form-property name="template" type="String" />
-		<form-property name="bcachetime" type="Int" />
-		<form-property name="last_modified" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="mid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_MID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="func_num" depends="required">
-			<arg0 key="const._AD_BASE_LANG_FUNC_NUM" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="options" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_OPTIONS" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="name" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_NAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="150" />
-		</field>
-		<field property="title" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_TITLE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="content" depends="required">
-			<arg0 key="const._AD_BASE_LANG_CONTENT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="weight" depends="required">
-			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="block_type" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_BLOCK_TYPE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="1" />
-		</field>
-		<field property="c_type" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_C_TYPE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="1" />
-		</field>
-		<field property="dirname" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_DIRNAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="func_file" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_FUNC_FILE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="show_func" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_SHOW_FUNC" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="edit_func" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_EDIT_FUNC" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="template" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_TEMPLATE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="bcachetime" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="last_modified" depends="required">
-			<arg0 key="const._AD_BASE_LANG_LAST_MODIFIED" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/index.html
diff -u xoops2jp/html/modules/base/admin/.xml/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/index.html:removed
--- xoops2jp/html/modules/base/admin/.xml/index.html:1.1.2.1	Mon Mar 27 11:41:48 2006
+++ xoops2jp/html/modules/base/admin/.xml/index.html	Tue Nov  7 17:04:32 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="CustomBlockEditForm" type="Legacy_BlockEditForm">
-		<form-property name="content" type="Text" />
-		<form-property name="ctype" type="String" />
-	</form-bean>
-	<form-validation>
-		<field property="content" depends="required">
-			<arg0 key="const._AD_BASE_LANG_CONTENT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="ctype" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_BLOCK_TYPE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="1" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/install_wizard.xml
diff -u xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/install_wizard.xml:1.1.2.2	Sat Feb  4 01:00:10 2006
+++ xoops2jp/html/modules/base/admin/.xml/install_wizard.xml	Tue Nov  7 17:04:32 2006
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="InstallWizardForm" type="XCube_ActionForm">
-		<form-property name="dirname" type="String" />
-		<form-property name="agree" type="Bool" />
-	</form-bean>
-	<form-validation>
-		<field property="agree" depends="min">
-			<msg name="min" key="const._AD_BASE_ERROR_PLEASE_AGREE" />
-			<var name="min" value="1" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.5 xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml:1.1.2.5	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/xoopscomments_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="CommentAdminEditForm" type="XCube_ActionForm">
-		<form-property name="com_id" type="Int" />
-		<form-property name="com_icon" type="String" />
-		<form-property name="com_title" type="String" />
-		<form-property name="com_text" type="Text" />
-		<form-property name="com_sig" type="Bool" />
-		<form-property name="com_status" type="Int" />
-		<form-property name="dohtml" type="Bool" />
-		<form-property name="dosmiley" type="Bool" />
-		<form-property name="doxcode" type="Bool" />
-		<form-property name="doimage" type="Bool" />
-		<form-property name="dobr" type="Bool" />
-	</form-bean>
-	<form-validation>
-		<field property="com_id" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_icon" depends="maxlength">
-			<arg0 key="const._MD_BASE_LANG_COM_ICON" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="25" />
-		</field>
-		<field property="com_title" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_COM_TITLE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="com_text" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_TEXT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="com_status" depends="required,intRange">
-			<arg0 key="const._AD_BASE_LANG_COM_STATUS" />
-			<var name="min" value="1" />
-			<var name="max" value="3" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="required" key="const._AD_BASE_ERROR_INTRANGE" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/block_list.xml
diff -u xoops2jp/html/modules/base/admin/.xml/block_list.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/block_list.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/block_list.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_list.xml	Tue Nov  7 17:04:32 2006
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="BlockListForm" type="XCube_ActionForm">
-		<form-property name="weight" type="Int[]" />
-		<form-property name="side" type="Int[]" />
-		<form-property name="bcachetime" type="Int[]" />
-	</form-bean>
-	<form-validation>
-		<field property="weight" depends="required,intRange">
-			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="intRange" key="const._AD_BASE_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="255" />
-		</field>
-		<field property="side" depends="required,objectExist">
-			<arg0 key="const._AD_BASE_LANG_SIDE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="columnside" />
-			<var name="module" value="base" />
-		</field>
-		<field property="bcachetime" depends="required,objectExist">
-			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="cachetime" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/image_delete.xml
diff -u xoops2jp/html/modules/base/admin/.xml/image_delete.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/image_delete.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/image_delete.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/image_delete.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImageAdminDeleteForm" type="XCube_ActionForm">
-		<form-property name="image_id" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="image_id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMAGE_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/block_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.4 xoops2jp/html/modules/base/admin/.xml/block_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.4	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="BlockEditForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-		<form-property name="options" type="String[]" />
-		<form-property name="title" type="String" />
-		<form-property name="side" type="Int" />
-		<form-property name="weight" type="Int" />
-		<form-property name="bcachetime" type="Int" />
-		<form-property name="bmodule" type="Int[]" />
-		<form-property name="groupid" type="Int[]" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="title" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_TITLE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="side" depends="required,objectExist">
-			<arg0 key="const._AD_BASE_LANG_SIDE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="columnside" />
-			<var name="module" value="base" />
-		</field>
-		<field property="weight" depends="required,intRange">
-			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="intRange" key="const._AD_BASE_ERROR_INTRANGE" />
-			<var name="min" value="0" />
-			<var name="max" value="255" />
-		</field>
-		<field property="bcachetime" depends="required,objectExist">
-			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="cachetime" />
-			<var name="module" value="base" />
-		</field>
-		<field property="groupid" depends="objectExist">
-			<arg0 key="const._AD_BASE_LANG_GROUPID" />
-			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
-			<var name="handler" value="group" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/imagecategory_delete.xml
diff -u xoops2jp/html/modules/base/admin/.xml/imagecategory_delete.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/imagecategory_delete.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/imagecategory_delete.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/imagecategory_delete.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImagecategoryAdminDeleteForm" type="XCube_ActionForm">
-		<form-property name="imgcat_id" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="imgcat_id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMGCAT_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/xoopscomments_delete.xml
diff -u xoops2jp/html/modules/base/admin/.xml/xoopscomments_delete.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/xoopscomments_delete.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/xoopscomments_delete.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/xoopscomments_delete.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="CommentAdminDeleteForm" type="XCube_ActionForm">
-		<form-property name="com_id" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="com_id" depends="required">
-			<arg0 key="const._MD_BASE_LANG_COM_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/smiles_delete.xml
diff -u xoops2jp/html/modules/base/admin/.xml/smiles_delete.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/smiles_delete.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/smiles_delete.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/smiles_delete.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="SmilesAdminDeleteForm" type="XCube_ActionForm">
-		<form-property name="id" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/image_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/image_edit.xml:1.1.2.4 xoops2jp/html/modules/base/admin/.xml/image_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/image_edit.xml:1.1.2.4	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/image_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ImageAdminEditForm" type="Legacy_ImageUploadForm">
-		<form-property name="image_id" type="Int" />
-		<form-property name="image_display" type="Bool" />
-		<form-property name="image_weight" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="image_id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMAGE_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="image_weight" depends="required">
-			<arg0 key="const._AD_BASE_LANG_IMAGE_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/module_install.xml
diff -u xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/module_install.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/module_install.xml:1.1.2.2	Tue Aug  1 19:26:38 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_install.xml	Tue Nov  7 17:04:32 2006
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ModuleInstallForm" type="XCube_ActionForm">
-		<form-property name="dirname" type="String" />
-		<form-property name="force" type="Bool" />
-	</form-bean>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml
diff -u xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml	Tue Nov  7 17:04:32 2006
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="BlockUninstallForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="BlockInstallEditForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-		<form-property name="options" type="String[]" />
-		<form-property name="name" type="String" />
-		<form-property name="title" type="String" />
-		<form-property name="side" type="Int" />
-		<form-property name="weight" type="Int" />
-		<form-property name="bcachetime" type="Int" />
-		<form-property name="bmodule" type="Int[]" />
-		<form-property name="groupid" type="Int[]" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="name" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_NAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="150" />
-		</field>
-		<field property="title" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_TITLE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="255" />
-		</field>
-		<field property="side" depends="required">
-			<arg0 key="const._AD_BASE_LANG_SIDE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="weight" depends="required">
-			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="bcachetime" depends="required">
-			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/smiles_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/smiles_edit.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/smiles_edit.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/smiles_edit.xml:1.1.2.2	Fri Aug 18 20:30:00 2006
+++ xoops2jp/html/modules/base/admin/.xml/smiles_edit.xml	Tue Nov  7 17:04:32 2006
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="SmilesAdminEditForm" type="XCube_ActionForm">
-		<form-property name="id" type="Int" />
-		<form-property name="code" type="String" />
-		<form-property name="smile_url" type="ImageFile" />
-		<form-property name="emotion" type="String" />
-		<form-property name="display" type="Bool" />
-	</form-bean>
-	<form-validation>
-		<field property="id" depends="required">
-			<arg0 key="const._AD_BASE_LANG_ID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field>
-		<field property="code" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_CODE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="50" />
-		</field>
-		<field property="smile_url" depends="extension">
-			<msg name="extension" key="const._AD_BASE_ERROR_EXTENSION" />
-			<var name="extension" value="jpg,gif,png" />
-		</field>
-		<field property="emotion" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_EMOTION" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="75" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml
diff -u xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.3 xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml:1.1.2.3	Tue Aug  1 19:26:38 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_uninstall.xml	Tue Nov  7 17:04:32 2006
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ModuleUninstallForm" type="XCube_ActionForm">
-		<form-property name="dirname" type="String" />
-		<form-property name="force" type="Bool" />
-	</form-bean>
-</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/module_update.xml
diff -u xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.2 xoops2jp/html/modules/base/admin/.xml/module_update.xml:removed
--- xoops2jp/html/modules/base/admin/.xml/module_update.xml:1.1.2.2	Tue Aug  1 19:26:38 2006
+++ xoops2jp/html/modules/base/admin/.xml/module_update.xml	Tue Nov  7 17:04:32 2006
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="ModuleUpdateForm" type="XCube_ActionForm">
-		<form-property name="dirname" type="String" />
-		<form-property name="force" type="Bool" />
-	</form-bean>
-</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:32 +0900
Subject: [xoops-cvslog 5667] CVS update:
	xoops2jp/html/modules/base/admin/theme/icons
Message-ID: <20061107080432.AE1802AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/icons/user.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/important.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/send.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/add.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/up.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/install.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/error.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/download.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/edit.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/group.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/active.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/permission.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/info.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/idea.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/property.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/search.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/update.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/uninstall.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/clone.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/delete.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/down.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/members.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/view.gif
Index: xoops2jp/html/modules/base/admin/theme/icons/index.html
diff -u xoops2jp/html/modules/base/admin/theme/icons/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/theme/icons/index.html:removed
--- xoops2jp/html/modules/base/admin/theme/icons/index.html:1.1.2.1	Mon Mar 27 11:41:53 2006
+++ xoops2jp/html/modules/base/admin/theme/icons/index.html	Tue Nov  7 17:04:32 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:32 +0900
Subject: [xoops-cvslog 5668] CVS update: xoops2jp/html/modules/base/admin/theme
Message-ID: <20061107080432.DEAB32AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.12 xoops2jp/html/modules/base/admin/theme/admin_theme.html:removed
--- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.12	Mon Sep 25 10:27:04 2006
+++ xoops2jp/html/modules/base/admin/theme/admin_theme.html	Tue Nov  7 17:04:32 2006
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
-<meta http-equiv="content-script-type" content="text/javascript" />
-<meta http-equiv="content-style-type" content="text/css" />
-<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}></title>
-<script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
-<{stylesheet file=style.css}>
-<{stylesheet file=module.css}>
-
-<script type="text/javascript">
-<!-- <![CDATA[
-var cid = <{if $smarty.get.fct == preferences && $smarty.get.mod > 0}><{$smarty.get.mod}><{else}><{$currentModule->getVar('mid')}><{/if}>;
-function ccToggle(id)
-{
-	el = xoopsGetElementById('c'+id).style;
-	if (el.display == 'block') {
-		el.display = 'none';
-		xoopsGetElementById('t'+id).className = 'head';
-		xoopsGetElementById('i'+id).src = '<{"design/navy.gif"|theme}>';
-	} else {
-		el.display = 'block';
-		xoopsGetElementById('t'+id).className = 'head2';
-		xoopsGetElementById('i'+id).src = '<{"design/orange.gif"|theme}>';
-	}
-}
-// ]]> -->
-</script>
-</head>
-<body onload="ccToggle(cid);">
-<div id="container">
-
-<table cellspacing="0" id="header">
-<tr>
-<td class="logo">
-  <a href="<{$xoops_url}>/admin.php"><img src="<{"design/logo.gif"|theme}>" alt="Admin Home" /></a>
-</td>
-<td class="searchbar">
-  <{*  <{$xoops_lblocks.action_search.content}> *}>
-  <form action="<{$xoops_url}>/modules/base/admin/index.php?action=actSearch" method="post" class="searchBox">
-  <input type="text" size="40" name="keywords" />
-  <input type="submit" value="Search" />
-  </form>
-</td>
-</tr>
-<tr>
-<td class="topnav" colspan="2">
-<img src="<{"design/menulist.gif"|theme}>" alt="" /> <a href="<{$xoops_url}>/admin.php"><{$smarty.const._CPHOME}></a>
-<img src="<{"design/menulist.gif"|theme}>" alt="" /> <a href="<{$xoops_url}>/"><{$smarty.const._YOURHOME}></a>
-<img src="<{"design/menulist.gif"|theme}>" alt="" /> <a href="<{$xoops_url}>/user.php?op=logout"><{$smarty.const._LOGOUT}></a>
-</td>
-</tr>
-</table>
-
-<table cellspacing="0">
-<tr>
-<td id="leftcolumn">
-  <{$xoops_lblocks.sidemenu.content}>
-
-  <{foreach name=lblock item=block from=$xoops_lblocks}>
-  <{if $block.name != 'action_search' && $block.name != 'sidemenu'}>
-  <{$block.content}>
-  <{/if}>
-  <{/foreach}>
-</td>
-<td id="centercolumn">
-
-<{* option 
-  <div id="menunavi">
-  <h2><{$currentModule->getVar('name')}></h2>
-  <{if $currentModule->adminmenu}>
-    <ul class="submenunavi">
-      <{foreach item=menu from=$currentModule->adminmenu}>
-        <{if $menu.absolute}>
-          <li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
-        <{else}>
-          <li><a href="<{$xoops_url}>/modules/<{$currentModule->getShow('dirname')}>/<{$menu.link}>"><{$menu.title|escape}></a></li>
-        <{/if}>
-      <{/foreach}>
-    </ul>
-  <{/if}>
-  </div>
- /option *}>
-
-  <div id="contentBody"><{$xoops_contents}></div>
-  <div class="return_top"><a href="#container"><{$smarty.const._RETURN_TOP}></a></div>
-  
-</td>
-</tr>
-</table>
-
-<div id="footer">Powered by&nbsp;<{$smarty.const.XOOPS_VERSION}>&copy; 2001-2006 <a href="http://www.xoopscube.org/" target="_blank">The XOOPS Cube Project</a></div>
-
-</div>
-</body>
-</html>
-<{$stdout_buffer}>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/theme/index.html
diff -u xoops2jp/html/modules/base/admin/theme/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/theme/index.html:removed
--- xoops2jp/html/modules/base/admin/theme/index.html:1.1.2.1	Mon Mar 27 11:41:49 2006
+++ xoops2jp/html/modules/base/admin/theme/index.html	Tue Nov  7 17:04:32 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:33 +0900
Subject: [xoops-cvslog 5669] CVS update: xoops2jp/html/modules/base/service
Message-ID: <20061107080433.1F1F42AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/service/LegacySearchService.class.php
diff -u xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.8.2.4 xoops2jp/html/modules/base/service/LegacySearchService.class.php:removed
--- xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.8.2.4	Sat Oct 14 02:52:39 2006
+++ xoops2jp/html/modules/base/service/LegacySearchService.class.php	Tue Nov  7 17:04:33 2006
@@ -1,252 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class Legacy_SearchModule extends XCube_Object
-{
-	function getPropertyDefinition()
-	{
-		$ret = array(
-			S_PUBLIC_VAR("int mid"),
-			S_PUBLIC_VAR("string name")
-		);
-		
-		return $ret;
-	}
-}
-
-class Legacy_SearchModuleArray extends XCube_ObjectArray
-{
-	function getClassName()
-	{
-		return "Legacy_SearchModule";
-	}
-}
-
-
-class Legacy_SearchItem extends XCube_Object
-{
-	function getPropertyDefinition()
-	{
-		$ret = array(
-			S_PUBLIC_VAR("string image"),
-			S_PUBLIC_VAR("string link"),
-			S_PUBLIC_VAR("string title"),
-			S_PUBLIC_VAR("int uid"),
-			S_PUBLIC_VAR("int time")
-		);
-		
-		return $ret;
-	}
-}
-
-class Legacy_SearchItemArray extends XCube_ObjectArray
-{
-	function getClassName()
-	{
-		return "Legacy_SearchItem";
-	}
-}
-
-class Legacy_SearchModuleResult extends XCube_Object
-{
-	function getPropertyDefinition()
-	{
-		$ret = array(
-			S_PUBLIC_VAR("int mid"),
-			S_PUBLIC_VAR("string name"),
-			S_PUBLIC_VAR("int has_more"),
-			S_PUBLIC_VAR("Legacy_SearchItemArray results"),
-			S_PUBLIC_VAR("string showall_link")
-		);
-		
-		return $ret;
-	}
-}
-
-class Legacy_SearchModuleResultArray extends XCube_ObjectArray
-{
-	function getClassName()
-	{
-		return "Legacy_SearchModuleResult";
-	}
-}
-
-class Legacy_ArrayOfInt extends XCube_ObjectArray
-{
-	function getClassName()
-	{
-		return "int";
-	}
-}
-
-class Legacy_ArrayOfString extends XCube_ObjectArray
-{
-	function getClassName()
-	{
-		return "string";
-	}
-}
-
-/**
- * Sample class
- */
-class Legacy_SearchService extends XCube_Service
-{
-	var $mServiceName = "Legacy_SearchService";
-	var $mNameSpace = "Legacy";
-	var $mClassName = "Legacy_SearchService";
-	
-	function prepare()
-	{
-		$this->addType('Legacy_SearchModule');
-		$this->addType('Legacy_SearchModuleArray');
-		$this->addType('Legacy_SearchItem');
-		$this->addType('Legacy_SearchItemArray');
-		$this->addType('Legacy_SearchModuleResult');
-		$this->addType('Legacy_SearchModuleResultArray');
-		$this->addType('Legacy_ArrayOfInt');
-		$this->addType('Legacy_ArrayOfString');
-	
-		$this->addFunction(S_PUBLIC_FUNC('Legacy_SearchItemArray searchItems(int mid, Legacy_ArrayOfString queries, string andor, int maxhit, int start)'));
-		$this->addFunction(S_PUBLIC_FUNC('Legacy_SearchItemArray searchItemsOfUser(int mid, int uid, int maxhit, int start)'));
-		$this->addFunction(S_PUBLIC_FUNC('Legacy_SearchModuleArray getActiveModules()'));
-	}
-	
-	function getActiveModules()
-	{
-		//
-		// At first, get active module IDs.
-		//
-		$handler =& xoops_gethandler('module');
-		
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('isactive', 1));
-		$criteria->add(new Criteria('hassearch', 1));
-		$moduleArr =& $handler->getObjects($criteria);
-
-
-		$handler =& xoops_gethandler('groupperm');
-		$groupArr = Legacy_SearchUtils::getUserGroups();
-
-		$ret = array();
-		foreach ($moduleArr as $module) {
-			if ($handler->checkRight('module_read', $module->get('mid'), $groupArr)) {
-				$ret[] = array(
-					'mid' => $module->get('mid'),
-					'name' => $module->get('name')
-				);
-			}
-		}
-		
-		return $ret;
-	}
-	
-	function searchItems()
-	{
-		//
-		// TODO Need validation
-		//
-		$root =& XCube_Root::getSingleton();
-		$request =& $root->mContext->mRequest;
-		
-		$mid = intval($request->getRequest('mid'));
-		$queries = $request->getRequest('queries');
-		$andor = $request->getRequest('andor');
-		$maxhit = intval($request->getRequest('maxhit'));
-		$start = intval($request->getRequest('start'));
-		
-		$ret = $this->_searchItems($mid, $queries, $andor, $maxhit, $start, 0);
-		
-		return $ret;
-	}
-	
-	function searchItemsOfUser()
-	{
-		//
-		// TODO Need validation
-		//
-		$root =& XCube_Root::getSingleton();
-		$request =& $root->mContext->mRequest;
-		
-		$mid = intval($request->getRequest('mid'));
-		$maxhit = intval($request->getRequest('maxhit'));
-		$start = intval($request->getRequest('start'));
-		$uid = intval($request->getRequest('uid'));
-		
-		$ret = $this->_searchItems($mid, null, 'and', $maxhit, $start, $uid);
-		
-		return $ret;
-	}
-	
-	/**
-	 * @access private
-	 */
-	function _searchItems($mid, $queries, $andor, $max_hit, $start, $uid)
-	{
-		$modleArr = $this->getActiveModules();
-		
-		$flag = false;
-		foreach ($modleArr as $module) {
-			if ($mid == $module['mid']) {
-				$flag = true;
-				break;
-			}
-		}
-		
-		if (!$flag) {
-			return $ret;
-		}
-		
-		$root =& XCube_Root::getSingleton();
-		$timezone = $root->mContext->getXoopsConfig('server_TZ') * 3600;
-
-		$handler =& xoops_gethandler('module');
-		$xoopsModule =& $handler->get($mid);
-		if (!is_object($xoopsModule)) {
-			return $ret;
-		}
-		
-		if (!$xoopsModule->get('isactive') || !$xoopsModule->get('hassearch')) {
-			return $ret;
-		}
-
-		$module =& Legacy_Utils::createModule($xoopsModule);
-		$results = $module->doLegacyGlobalSearch($queries, $andor, $max_hit, $start, $uid);
-				
-		if (is_array($results) && count($results) > 0) {
-			foreach (array_keys($results) as $key) {
-				//
-				// TODO If this service will come to web service, we should
-				// change format from unixtime to string by timeoffset.
-				//
-				if ($results[$key]['time'] != 0) {
-					$results[$key]['time'] = $results[$key]['time'] - $timezone;
-				}
-			}
-		}
-		
-		return $results;
-	}
-}
-
-class Legacy_SearchUtils
-{
-	function getUserGroups()
-	{
-		$root =& XCube_Root::getSingleton();
-		$user =& $root->mController->mRoot->mContext->mXoopsUser;
-		$groups = array();
-		
-		if (!is_object($user)) {
-			$groups = XOOPS_GROUP_ANONYMOUS;
-		}
-		else {
-			$groups = $user->getGroups();
-		}
-		
-		return $groups;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/service/index.html
diff -u xoops2jp/html/modules/base/service/index.html:1.1.2.1 xoops2jp/html/modules/base/service/index.html:removed
--- xoops2jp/html/modules/base/service/index.html:1.1.2.1	Mon Mar 27 11:41:48 2006
+++ xoops2jp/html/modules/base/service/index.html	Tue Nov  7 17:04:33 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:33 +0900
Subject: [xoops-cvslog 5670] CVS update: xoops2jp/html/modules/base/images
Message-ID: <20061107080433.C45A12AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/images/index.html
diff -u xoops2jp/html/modules/base/images/index.html:1.1.2.1 xoops2jp/html/modules/base/images/index.html:removed
--- xoops2jp/html/modules/base/images/index.html:1.1.2.1	Mon Mar 27 11:41:48 2006
+++ xoops2jp/html/modules/base/images/index.html	Tue Nov  7 17:04:33 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/images/base.gif

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:34 +0900
Subject: [xoops-cvslog 5671] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20061107080434.0BD9E2AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php
diff -u xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:removed
--- xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php:1.1.2.4	Thu Aug 24 13:57:56 2006
+++ xoops2jp/html/modules/base/admin/class/Legacy_SQLScanner.class.php	Tue Nov  7 17:04:33 2006
@@ -1,79 +0,0 @@
-<?php
-
-require_once dirname(__FILE__) . "/EasyLex_SQLScanner.class.php";
-
-class Legacy_SQLScanner extends EasyLex_SQLScanner
-{
-	var $mDB_PREFIX = "";
-	
-	function setDB_PREFIX($prefix)
-	{
-		$this->mDB_PREFIX = $prefix;
-	}
-
-	/**
-	 * Override.
-	 */	
-	function &getOperations()
-	{
-		$t_lines = array();
-		$t_tokens = array();
-		$depth = 0;
-		
-		foreach (array_keys($this->mTokens) as $key) {
-			if ($this->mTokens[$key]->mType == EASYLEX_SQL_OPEN_PARENTHESIS) {
-				$depth++;
-			}
-			elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_CLOSE_PARENTHESIS) {
-				$depth--;
-			}
-			
-			$t_tokens[] =& $this->mTokens[$key];
-			
-			if (count($t_tokens) > 1 && $depth == 0) {
-				if ($this->mTokens[$key]->mType == EASYLEX_SQL_SEMICOLON) {
-					$t_lines[] =& $t_tokens;
-					unset($t_tokens);
-					$t_tokens = array();
-				}
-				elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_LETTER && (strtoupper($this->mTokens[$key]->mValue) =='CREATE' || strtoupper($this->mTokens[$key]->mValue) =='ALTER' || strtoupper($this->mTokens[$key]->mValue) =='INSERT')) {
-					array_pop($t_tokens);
-					$t_lines[] =& $t_tokens;
-					unset($t_tokens);
-					$t_tokens = array();
-					$t_tokens[] =& $this->mTokens[$key];
-				}
-			}
-		}
-		
-		if (count($t_tokens) > 0) {
-			$t_lines[] =& $t_tokens;
-			unset($t_tokens);
-		}
-		
-		foreach ($t_lines as $op) {
-			if (count($op) >= 3) {
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'CREATE' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'ALTER' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'INSERT' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'INTO' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-			}
-		}
-		
-		return $t_lines;
-	}
-}
-
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.19.2.1 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:removed
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.19.2.1	Thu Oct  5 18:07:09 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Tue Nov  7 17:04:33 2006
@@ -1,239 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_BASE_PATH."/admin/class/AbstractModuleInstaller.class.php";
-
-/**
- * This class extends a base class for the process of install module. This is added
- * some private functions.
- */
-class Legacy_ModuleInstaller extends Legacy_AbstractModuleInstaller
-{
-    var $mAgree = false;
-	
-	function Legacy_ModuleInstaller($dirname)
-	{
-		parent::Legacy_AbstractModuleInstaller($dirname);
-		
-		$this->mProcessScript->register('Legacy_ModuleInstaller.ProcessScript');
-		$this->mProcessScript->add('Legacy_ModuleInstaller::_processScript');
-		
-		$this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable');
-		$this->mInstallTable->add('Legacy_ModuleUtils::installTable');
-		
-		$this->mInstallTemplate->register('Legacy_ModuleInstaller.InstallTemplate');
-		$this->mInstallTemplate->add('Legacy_ModuleInstaller::_installTemplate');
-	}
-
-    /**
-     * Load xoops module object that isn't installed and return it.
-     * @static
-     * @access public
-     * @param $dirname string
-     * @return XoopsModule
-     */
-    function &loadModuleObject($dirname)
-    {
-        $ret = null;
-
-        $moduleHandler =& xoops_gethandler('module');
-        $module =& $moduleHandler->getByDirname($dirname);
-
-        if (is_object($module))
-            return $ret;
-
-        $module =& $moduleHandler->create();
-        $module->setVar('weight', 1);
-        $module->loadInfoAsVar($this->mDirname);
-        
-        if ($module->get('dirname') == null) {
-            return $ret;
-        }
-        
-        if ($module->get('dirname') == 'system') {
-            $module->setVar('mid', 1);
-        }
-        
-        if (isset($module->modinfo['installer']) && isset($module->modinfo['installer']['licence']) ) {
-            $this->mAgree = true;
-        }
-        
-        return $module;
-    }
-    
-    function _installModule()
-    {
-        if (parent::_installModule()) {
-            $gpermHandler =& xoops_gethandler('groupperm');
-
-            //
-            // Add a permission which administrators can manage.
-            //
-            if ($this->mModule->getInfo('hasAdmin')) {
-                $adminPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-                $adminPerm->setVar('gperm_name', 'module_admin');
-
-                if (!$gpermHandler->insert($adminPerm)) {
-                    $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION);
-                }
-            }
-
-            //
-            // Add a permission which administrators can manage. (Special for Legacy System Module)
-            //
-            if ($this->mModule->getVar('dirname') == 'system') {
-				$root =& XCube_Root::getSingleton();
-				$root->mLanguageManager->loadModuleAdminMessageCatalog('system');
-
-                require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
-				
-                $fileHandler = opendir(XOOPS_ROOT_PATH . "/modules/system/admin");
-                while ($file = readdir($fileHandler)) {
-                    $infoFile = XOOPS_ROOT_PATH . "/modules/system/admin/" . $file . "/xoops_version.php";
-                    if (file_exists($infoFile)) {
-                        require_once $infoFile;
-                        if (!empty($modversion['category'])) {
-                            $sysAdminPerm  =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-                            $adminPerm->setVar('gperm_itemid', $modversion['category']);
-                            $adminPerm->setVar('gperm_name', 'system_admin');
-                            if (!$gpermHandler->insert($adminPerm)) {
-                                $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION);
-                            }
-                            unset($sysAdminPerm);
-                        }
-                        unset($modversion);
-                    }
-                }
-            }
-            
-            if ($this->mModule->getInfo('hasMain')) {
-                $read_any = $this->mModule->getInfo('read_any');
-                if ($read_any) {
-                    $memberHandler =& xoops_gethandler('member');
-                    $groupObjects =& $memberHandler->getGroups();
-                    //
-                    // Add a permission all group members and guest can read.
-                    //
-                    foreach($groupObjects as $group) {
-                        $readPerm =& $this->_createPermission($group->getVar('groupid'));
-                        $readPerm->setVar('gperm_name', 'module_read');
-
-                        if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION);
-                        }
-                    }
-                } else {
-                    //
-                    // Add a permission which administrators can read.
-                    //
-                    $root =& XCube_Root::getSingleton();
-                    $groups = $root->mContext->mXoopsUser->getGroups();
-                    foreach($groups as $mygroup) {
-                        $readPerm =& $this->_createPermission($mygroup);
-                        $readPerm->setVar('gperm_name', 'module_read');
-
-                        if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a permission object which has been initialized for admin.
-     * For flexibility, creation only and not save it.
-     * @access private
-     * @param $group
-     */
-    function &_createPermission($group)
-    {
-        $gpermHandler =& xoops_gethandler('groupperm');
-
-        $perm =& $gpermHandler->create();
-
-        $perm->setVar('gperm_groupid', $group);
-        $perm->setVar('gperm_itemid', $this->mModule->getVar('mid'));
-        $perm->setVar('gperm_modid', 1);
-        
-        return $perm;
-    }
-
-	/**
-	 * @static
-	 */
-	function _installTemplate(&$module, &$log)
-	{
-        $templates = $module->getInfo('templates');
-        if ($templates != false) {
-            foreach ($templates as $template) {
-                Legacy_ModuleUtils::installTemplate($module, $template, $log);
-            }
-        }
-	}
-
-    function _installBlock()
-    {
-        $definedBlocks = $this->mModule->getInfo('blocks');
-        if($definedBlocks == false)
-            return true;
-
-        $blockHandler =& xoops_gethandler('block');
-
-        $func_num=0;
-        foreach ($definedBlocks as $block) {
-            $func_num++;
-            $newBlock =& Legacy_ModuleUtils::createBlockByInfo($this->mModule, $block);
-            $newBlock->setVar('func_num', $func_num);
-
-            Legacy_ModuleUtils::installBlock($this->mModule, $newBlock, $block, $this->mLog);
-        }
-    }
-
-	function _installNotification()
-	{
-	}
-	
-    function _installPreference()
-    {
-        Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
-    }
-    
-    function _processScript(&$module, &$log)
-    {
-        $installScript = trim($module->getInfo('onInstall'));
-        if ($installScript != false) {
-            require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-            $funcName = 'xoops_module_install_' . $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));
-                }
-            }
-        }
-    }
-	
-	function _processReport()
-	{
-		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
-		}
-		else {
-			if (is_object($this->mModule)) {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
-			}
-			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mDirname));
-			}
-		}
-	}
-
-    function hasAgree()
-    {
-        return $this->mAgree;
-    }
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.3 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:removed
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.24.2.3	Tue Oct 10 18:00:10 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Tue Nov  7 17:04:33 2006
@@ -1,533 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/template.php";
-
-define("MODINSTALL_LOGTYPE_REPORT", "report");
-define("MODINSTALL_LOGTYPE_WARNING", "warning");
-define("MODINSTALL_LOGTYPE_ERROR", "error");
-
-/**
- * A temporary log class.
- */
-class Legacy_ModuleUtilsSimpleLog
-{
-	var $mFetalErrorFlag = false;
-	var $mMessages = array();
-
-	function add($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_REPORT, 'message' => $msg);
-	}
-
-	function addReport($msg)
-	{
-		$this->add($msg);
-	}
-	
-	function addWarning($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_WARNING, 'message' => $msg);
-	}
-
-	function addError($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_ERROR, 'message' => $msg);
-		$this->mFetalErrorFlag = true;
-	}
-	
-	function hasError()
-	{
-		return $this->mFetalErrorFlag;
-	}
-}
-
-/**
- * This provides static methods for the module installation. Methods of this
- * class may move to base class of installers. 
- */
-class Legacy_ModuleUtils
-{
-	/**
-	 */
-	function installTable(&$module, &$log)
-	{
-		$sqlfileInfo =& $module->getInfo('sqlfile');
-		$dirname = $module->getVar('dirname');
-
-		if (!isset($sqlfileInfo[XOOPS_DB_TYPE])) {
-			return;
-		}
-		
-		require_once XOOPS_MODULE_PATH . "/base/admin/class/Legacy_SQLScanner.class.php";
-		$scanner =& new Legacy_SQLScanner();
-		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
-		
-		$sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
-		if (!$scanner->loadFile(XOOPS_MODULE_PATH . "/${dirname}/" . $sqlfile)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
-			return false;
-		}
-
-		$scanner->parse();
-		$sqls = $scanner->getSQL();
-		
-		$root =& XCube_Root::getSingleton();
-		$db =& $root->mController->getDB();
-		
-		//
-		// TODO The following variable exists for rollback, but it is not implemented.
-		//
-		foreach ($sqls as $sql) {
-			if (!$db->query($sql)) {
-				$log->addError($db->error());
-				return;
-			}
-		}
-		
-		$log->addReport(_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED);
-	}
-
-	/**
-	 *  Insert template to DB.
-	 *  This function depends on the structure of Legacy_RenderSystem. We should
-	 * move this to another mechanism.
-	 *
-	 * @param $dirname string
-	 * @param $$template string[][]
-	 * @param $log Legacy_ModuleUtilsSimpleLog *
-	 * @param bool
-	 */
-	function installTemplate($module, $template, &$log)
-	{
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$fileName = trim($template['file']);
-
-		$tpldata = Legacy_ModuleUtils::readTemplateFile($module->getVar('dirname'), $fileName);
-		if ($tpldata == false)
-			return false;
-
-		//
-		// Create template file object, then store it.
-		//
-		$tplfile =& $tplHandler->create();
-		$tplfile->setVar('tpl_refid', $module->getVar('mid'));
-		$tplfile->setVar('tpl_lastimpoerted', 0);
-		$tplfile->setVar('tpl_lastmodified', time());
-
-		if (preg_match("/\.css$/i", $fileName)) {
-			$tplfile->setVar('tpl_type', 'css');
-		}
-		else {
-			$tplfile->setVar('tpl_type', 'module');
-		}
-
-		$tplfile->setVar('tpl_source', $tpldata, true);
-		$tplfile->setVar('tpl_module', $module->getVar('dirname'));
-		$tplfile->setVar('tpl_tplset', 'default');
-		$tplfile->setVar('tpl_file', $fileName, true);
-
-		$description = isset($tpl['description']) ? $tpl['description'] : '';
-		$tplfile->setVar('tpl_desc', $description, true);
-		
-		if ($tplHandler->insert($tplfile)) {
-			$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_TEMPLATE_INSTALLED, $fileName));
-		}
-		else {
-			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
-			return false;
-		}
-
-		return true;
-	}
-	
-	/**
-	 * Read template file, return it.
-	 *
-	 * @return string or false
-	 */
-	function readTemplateFile($dirname, $fileName, $isblock = false)
-	{
-		//
-		// Load template data
-		//
-		if ($isblock) {
-			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/blocks/" . $fileName;
-		}
-		else {
-			$filePath = XOOPS_MODULE_PATH . "/" . $dirname . "/templates/" . $fileName;
-		}
-
-		if (!file_exists($filePath)) {
-			return false;
-		}
-
-		$lines = file($filePath);
-		if ($lines == false) {
-			return false;
-		}
-
-		$tpldata = "";
-		foreach ($lines as $line) {
-			//
-			// Unify linefeed to "\r\n" 
-			//
-			$tpldata .= str_replace("\n", "\r\n", str_replace("\r\n", "\n", $line));
-		}
-		
-		return $tpldata;
-	}
-	
-	/**
-	 * Create XoopsBlock object by array that is defined in xoops_version, return it.
-	 * @param $module XoopsModule
-	 * @param $block array
-	 * @return XoopsBlock
-	 */
-	function &createBlockByInfo(&$module, $block)
-	{
-		$options = isset($block['options']) ? $block['options'] : null;
-		$edit_func = isset($block['edit_func']) ? $block['edit_func'] : null;
-		$template = isset($block['template']) ? $block['template'] : null;
-		$visible = isset($block['visible']) ? $block['visible'] : (isset($block['visible_any']) ? $block['visible_any']: 0);
-		$blockHandler =& xoops_gethandler('block');
-		$blockObj =& $blockHandler->create();
-
-		$blockObj->set('mid', $module->getVar('mid'));
-		$blockObj->set('options', $options);
-		$blockObj->set('name', $block['name']);
-		$blockObj->set('title', $block['name']);
-		$blockObj->set('block_type', 'M');
-		$blockObj->set('c_type', 1);
-		$blockObj->set('isactive', 1);
-		$blockObj->set('dirname', $module->getVar('dirname'));
-		$blockObj->set('func_file', $block['file']);
-		
-		//
-		// IMPORTANT CONVENTION
-		//
-		$show_func = "";
-		if (isset($block['class'])) {
-			$show_func = "cl::" . $block['class'];
-		}
-		else {
-			$show_func = $block['show_func'];
-		}
-		
-		$blockObj->set('show_func', $show_func);
-		$blockObj->set('edit_func', $edit_func);
-		$blockObj->set('template', $template);
-		$blockObj->set('last_modified', time());
-		$blockObj->set('visible', $visible);
-
-		return $blockObj;
-	}
-
-    /**
-     * Merge existing block XoopsBlock object and new XoopsBlock object from xoops_verion
-     * @param $oldBlock XoopsBlock
-     * @param $newBlock XoopsBlock
-     * @param $changedFlag bool
-     * @return XoopsBlock
-     */
-	function &mergeBlockObject(&$oldBlock, &$newBlock, &$changedFlag)
-    {
-        $blockObj =& $oldBlock->xoopsClone();
-        $blockObj->unsetNew();
-        
-		$changedFlag = false;
-		$checkValues = array('name', 'func_file', 'show_func', 'edit_func', 'template');
-		foreach($checkValues as $checkValue) {
-		    if ($newBlock->getVar($checkValue) != $oldBlock->getVar($checkValue)) {
-		        $blockObj->setVar($checkValue, $newBlock->getVar($checkValue));
-		        $changedFlag |= true;
-		    }
-		}
-
-		$old_options=explode("|",$oldBlock->getVar('options'));
-		$new_options=explode("|",$newBlock->getVar('options'));
-		if (count($new_options) > count($old_options)) {
-	        $changedFlag |= true;
-		    for ($i=count($old_options); $i<count($new_options); $i++) {
-		        $old_options[$i] = $old_options[$i];
-		    }
-		    $blockObj->setVar('options', implode("|", $old_options));
-		} else if (count($new_options) < count($old_options)) {
-	        $changedFlag |= true;
-		    $blockObj->setVar('options', $newBlock->getVar('options'));
-		}
-		
-		return $blockObj;
-    }
-
-	/**
-	 * This function can receive both new and update.
-	 * @param $module XoopsModule
-	 * @param $blockObj XoopsBlock
-	 * @param $block array
-	 * @return bool
-	 */
-	function installBlock(&$module, &$blockObj, &$block, &$log)
-	{
-		$isNew = $blockObj->isNew();
-		$blockHandler =& xoops_gethandler('block');
-
-        if (!empty($block['show_all_module'])) {
-            $autolink = false;
-        } else {
-            $autolink = true;
-        }
-		if (!$blockHandler->insert($blockObj, $autolink)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
-
-			return false;
-		}
-		else {
-			$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
-
-			$tplHandler =& xoops_gethandler('tplfile');
-
-			if (!Legacy_ModuleUtils::installBlockTemplate($module, $blockObj)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->getVar('name')));
-			}
-			
-			//
-			// Process of a permission.
-			//
-			if ($isNew) {
-                if (!empty($block['show_all_module'])) {
-        			$link_sql = "INSERT INTO " . $blockHandler->db->prefix('block_module_link') . " (block_id, module_id) VALUES (".$blockObj->getVar('bid').", 0)";
-		        	if (!$blockHandler->db->query($link_sql)) {
-       					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
-		        	}
-    			}
-   				$gpermHandler =& xoops_gethandler('groupperm');
-   				$bperm =& $gpermHandler->create();
-				$bperm->setVar('gperm_itemid', $blockObj->getVar('bid'));
-				$bperm->setVar('gperm_name', 'block_read');
-				$bperm->setVar('gperm_modid', 1);
-				
-				if (!empty($block['visible_any'])) {
-    				$memberHandler =& xoops_gethandler('member');
-    				$groupObjects =& $memberHandler->getGroups();
-    				foreach($groupObjects as $group) {
-        				$bperm->setVar('gperm_groupid', $group->getVar('groupid'));
-        				$bperm->setNew();
-        				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
-        				}
-        			}
-				} else {
-				    $root =& XCube_Root::getSingleton();
-                    $groups = $root->mContext->mXoopsUser->getGroups();
-                    foreach ($groups as $mygroup) {
-        				$bperm->setVar('gperm_groupid', $mygroup);
-        				$bperm->setNew();
-        				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
-    				    }
-    				}
-				}
-			}
-
-			return true;
-		}
-	}
-	
-	function unInstallBlock(&$block, &$log) {
-		$blockHandler =& xoops_gethandler('block');
-		$blockHandler->delete($block);
-		$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $block->get('name')));
-		//
-		// delete permission
-		//
-		$gpermHandler =& xoops_gethandler('groupperm');
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('gperm_name', 'block_read'));
-		$criteria->add(new Criteria('gperm_itemid', $block->getVar('bid')));
-		$criteria->add(new Criteria('gperm_modid', 1));
-		$gpermHandler->deleteAll($criteria);
-    }
-    
-	/**
-	 * Save the information of block's template specified and the source code of it
-	 * to database.
-	 * @return bool
-	 */
-	function installBlockTemplate(&$module, &$block)
-	{
-		if ($block->get('template') == null) {
-			return true;
-		}
-		
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('tpl_type', 'block'));
-		$criteria->add(new Criteria('tpl_tplset', 'default'));
-		$criteria->add(new Criteria('tpl_module', $module->getVar('dirname')));
-		$criteria->add(new Criteria('tpl_file', $block->getVar('template')));
-		$tplfiles =& $tplHandler->getObjects($criteria);
-
-		if (count($tplfiles) > 0) {
-			$tplfile =& $tplfiles[0];
-		}
-		else {
-			$tplfile =& $tplHandler->create();
-			$tplfile->setVar('tpl_refid', $block->getVar('bid'));
-			$tplfile->setVar('tpl_tplset', 'default');
-			$tplfile->setVar('tpl_file', $block->getVar('template'));
-			$tplfile->setVar('tpl_module', $module->getVar('dirname'));
-			$tplfile->setVar('tpl_type', 'block');
-			// $tplfile->setVar('tpl_desc', $tpl_desc);
-			$tplfile->setVar('tpl_lastimported', 0);
-		}
-		
-		$tplSource = Legacy_ModuleUtils::readTemplateFile($module->getVar('dirname'), $block->getVar('template'), true);
-		$tplfile->setVar('tpl_source', $tplSource);
-		$tplfile->setVar('tpl_lastmodified', time());
-
-		return $tplHandler->insert($tplfile);
-	}
-
-	function insertAllConfigs(&$module, &$log)
-	{
-		$configInfos = Legacy_ModuleUtils::getConfigInfosFromManifesto($module);
-
-		$count = 0;
-		if (is_array($configInfos)) {
-			$configHandler =& xoops_gethandler('config');
-			
-			foreach ($configInfos as $configInfo) {
-				$config =& $configHandler->createConfig();
-				
-				$config->loadFromConfigInfo($module->get('mid'), $configInfo, $count++);
-				
-				if ($configHandler->insertConfig($config)) {
-					$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_INSERT_CONFIG, $configInfo['name']));
-				}
-				else {
-					$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
-				}
-				
-				unset($config);
-			}
-		}
-	}
-
-	/**
-	 * Get & build config items from Manifesto by specific module object.
-	 */	
-	function &getConfigInfosFromManifesto(&$module)
-	{
-		$configInfos = $module->getInfo('config');
-		
-		//
-		// Insert comment config by old style.
-		//
-		if ($module->getVar('hascomments') !=0 ) {
-			require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
-
-			$configInfos[] = array('name' => 'com_rule',
-			                         'title' => '_CM_COMRULES',
-			                         'description' => '',
-			                         'formtype' => 'select',
-			                         'valuetype' => 'int',
-			                         'default' => 1,
-			                         'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
-			                   );
-
-			$configInfos[] = array('name' => 'com_anonpost',
-			                         'title' => '_CM_COMANONPOST',
-			                         'description' => '',
-			                         'formtype' => 'yesno',
-			                         'valuetype' => 'int',
-			                         'default' => 0
-			                   );
-		}
-
-		//
-		// Insert comment config by old style.
-		//
-		if ($module->get('hasnotification') != 0) {
-			require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-			require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-			
-			$t_options = array();
-			$t_options['_NOT_CONFIG_DISABLE'] = XOOPS_NOTIFICATION_DISABLE;
-			$t_options['_NOT_CONFIG_ENABLEBLOCK'] = XOOPS_NOTIFICATION_ENABLEBLOCK;
-			$t_options['_NOT_CONFIG_ENABLEINLINE'] = XOOPS_NOTIFICATION_ENABLEINLINE;
-			$t_options['_NOT_CONFIG_ENABLEBOTH'] = XOOPS_NOTIFICATION_ENABLEBOTH;
-			
-			$configInfos[] = array(
-				'name' => 'notification_enabled',
-				'title' => '_NOT_CONFIG_ENABLE',
-				'description' => '_NOT_CONFIG_ENABLEDSC',
-				'formtype' => 'select',
-				'valuetype' => 'int',
-				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
-				'options' => $t_options
-			);
-			
-			//
-			// FIXME: doesn't work when update module... can't read back the
-			//        array of options properly...  " changing to &quot;
-			//
-			
-			unset ($t_options);
-			
-			$t_options = array();
-			$t_categoryArr =& notificationCategoryInfo('', $module->get('mid'));
-			foreach ($t_categoryArr as $t_category) {
-				$t_eventArr =& notificationEvents($t_category['name'], false, $module->get('mid'));
-				foreach ($t_eventArr as $t_event) {
-					if (!empty($event['invisible'])) {
-						continue;
-					}
-					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
-					$t_options[$t_optionName] = $t_category['name'] . '-' . $t_event['name'];
-				}
-			}
-				
-			$configInfos[] = array(
-				'name' => 'notification_events',
-				'title' => '_NOT_CONFIG_EVENTS',
-				'description' => '_NOT_CONFIG_EVENTSDSC',
-				'formtype' => 'select_multi',
-				'valuetype' => 'array',
-				'default' => array_values($t_options),
-				'options' => $t_options
-			);
-		}
-		
-		return $configInfos;
-	}
-	
-
-	/**
-	 * Delete all configs of $module.
-	 *
-	 * @param $module XoopsModule
-	 */
-	function deleteAllConfigs(&$module, &$log)
-	{
-		if ($this->mModule->getVar('hasconfig') == 0) {
-			return;
-		}
-
-		$configHandler =& xoops_gethandler('config');
-		$configs =& $configHandler->getConfigs(new Criteria('conf_modid', $this->mModule->getVar('mid')));
-
-		if (count($configs) == 0) {
-			return;
-		}
-
-		foreach ($configs as $config) {
-			$configHandler->deleteConfig($config);
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php
diff -u xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:removed
--- xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php:1.1.2.5	Tue Aug 29 19:22:46 2006
+++ xoops2jp/html/modules/base/admin/class/EasyLex_SQLScanner.class.php	Tue Nov  7 17:04:33 2006
@@ -1,415 +0,0 @@
-<?php
-/**
- * @package EasyLexSQL
- * @varsion $Id: EasyLex_SQLScanner.class.php,v 1.1.2.5 2006/08/29 10:22:46 minahito Exp $
- * 
- * In the original BSD license, both occurrences of the phrase "COPYRIGHT
- * HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
- * 
- * Copyright (c) 2006, XOOPS Cube Project team/minahito (minahito ＠ users.sourceforge.jp)
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * b) Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * c) Neither the name of the XOOPS Cube Project team nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *    
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-define('EASYLEX_SQL_UNKNOWN', 0);
-define('EASYLEX_SQL_DIGIT', 1);
-define('EASYLEX_SQL_LETTER', 2);
-define('EASYLEX_SQL_STRING_LITERAL', 3);
-define('EASYLEX_SQL_STRING_LITERAL_ESCAPE', 10);
-define('EASYLEX_SQL_OPEN_PARENTHESIS', 4);
-define('EASYLEX_SQL_CLOSE_PARENTHESIS', 5);
-define('EASYLEX_SQL_SEPARATER', 6);
-define('EASYLEX_SQL_SEMICOLON', 7);
-define('EASYLEX_SQL_MARK', 8);
-define('EASYLEX_SQL_COMMA', 9);
-
-/**
- * This is BSD easy lexcal scanner for SQL.
- * 
- * @version 1.00
- */
-class EasyLex_SQLScanner
-{
-	var $mTokens;
-	var $mStatus = EASYLEX_SQL_UNKNOWN;
-	
-	/**
-	 * @var Array of char
-	 */
-	var $mBuffer = array();
-	
-	var $mIndex = 0;
-	
-	var $mActiveToken = '';
-	
-	var $mActiveQuoteMark = null;
-	
-	function setBuffer($buffer)
-	{
-		$this->mBuffer = array();
-		for ($i = 0; $i < strlen($buffer); $i++) {
-			$this->mBuffer[$i] = $buffer{$i};
-		}
-		
-		$this->mIndex = 0;
-	}
-	
-	function parse()
-	{
-		while ($this->mIndex <= count($this->mBuffer)) {
-			if ($this->mIndex == count($this->mBuffer)) {
-				$ch = '';
-				$type = EASYLEX_SQL_UNKNOWN;
-			}
-			else {
-				$ch = $this->mBuffer[$this->mIndex];
-				$type = $this->_getChrType($ch);
-			}
-			
-			switch ($this->mStatus) {
-				case EASYLEX_SQL_UNKNOWN:
-					$this->_parseUnknown($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_DIGIT:
-					$this->_parseDigit($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_LETTER:
-					$this->_parseLetter($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_STRING_LITERAL:
-					$this->_parseStringLiteral($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_STRING_LITERAL_ESCAPE:
-					$this->_parseStringLiteralEscape($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_OPEN_PARENTHESIS:
-					$this->_parseOpenParenthesis($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_CLOSE_PARENTHESIS:
-					$this->_parseCloseParenthesis($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_SEPARATER:
-					$this->_parseSeparater($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_MARK:
-					$this->_parseMark($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_SEMICOLON:
-					$this->_parseSemicolon($ch, $type);
-					break;
-					
-				case EASYLEX_SQL_COMMA:
-					$this->_parseComma($ch, $type);
-					break;
-			}
-		}
-	}
-	
-	/**
-	 * Load file and set buffer. If $preprocess is true, scan commetns and
-	 * remove these.
-	 * 
-	 * @param  string $path file path
-	 * @param  bool   $preprocess
-	 * @return bool
-	 */
-	function loadFile($path, $preprocess = true)
-	{
-		if (!file_exists($path)) {
-			return false;
-		}
-
-		$fp = fopen($path, "rb");
-		if (!$fp) {
-			return false;
-		}
-		
-		$t_buff = "";
-		while ($str = fgets($fp)) {
-			if ($preprocess) {
-				$str = preg_replace("/^\s*\#.*/", "", $str);
-			}
-			$t_buff .= $str;
-		}
-		
-		$this->setBuffer($t_buff);
-		
-		fclose($fp);
-		return true;
-	}
-	
-	function _getChrType($ch)
-	{
-		if (preg_match("/\s/", $ch)) {
-			return EASYLEX_SQL_SEPARATER;
-		}
-		
-		if ($ch == '(') {
-			return EASYLEX_SQL_OPEN_PARENTHESIS;
-		}
-		
-		if ($ch == ')') {
-			return EASYLEX_SQL_CLOSE_PARENTHESIS;
-		}
-		
-		if ($ch == ';') {
-			return EASYLEX_SQL_SEMICOLON;
-		}
-		
-		if ($ch == ',') {
-			return EASYLEX_SQL_COMMA;
-		}
-		
-		if (preg_match("/[0-9]/", $ch)) {
-			return EASYLEX_SQL_DIGIT;
-		}
-		
-		if (preg_match("/[!=<>%\*]/", $ch)) {
-			return EASYLEX_SQL_MARK;
-		}
-		
-		return EASYLEX_SQL_LETTER;
-	}
-	
-	function _parseUnknown($ch, $type)
-	{
-		$this->mStatus = $type;
-		$this->mActiveToken .= $ch;
-		$this->mIndex++;
-		
-		if ($ch == "'" || $ch == '"' || $ch == '`') {
-			$this->mStatus = EASYLEX_SQL_STRING_LITERAL;
-			$this->mActiveQuoteMark = $ch;
-		}
-
-	}
-	
-	function _parseDigit($ch, $type)
-	{
-		if ($type == EASYLEX_SQL_DIGIT) {
-			$this->mActiveToken .= $ch;
-			$this->mIndex++;
-		}
-		elseif ($type == EASYLEX_SQL_LETTER) {
-			$this->mStatus = EASYLEX_SQL_LETTER;
-			$this->mActiveToken .= $ch;
-			$this->mIndex++;
-		}
-		else {
-			$this->_createToken();
-		}
-	}
-	
-	function _parseLetter($ch, $type)
-	{
-		if ($type == EASYLEX_SQL_LETTER || $type == EASYLEX_SQL_DIGIT) {
-			$this->mActiveToken .= $ch;
-			$this->mIndex++;
-		}
-		else {
-			$this->_createToken();
-		}
-	}
-	
-	function _parseStringLiteral($ch, $type)
-	{
-		$this->mActiveToken .= $ch;
-		$this->mIndex++;
-		
-		if ($ch == "\\") {
-			$this->mStatus = EASYLEX_SQL_STRING_LITERAL_ESCAPE;
-		}
-		elseif ($ch == $this->mActiveQuoteMark) {
-			$this->_createToken();
-		}
-	}
-	
-	function _parseStringLiteralEscape($ch, $type)
-	{
-		$this->mStatus = EASYLEX_SQL_STRING_LITERAL;
-	}
-	
-	function _parseOpenParenthesis($ch, $type)
-	{
-		$this->_createToken();
-	}
-	
-	function _parseCloseParenthesis($ch, $type)
-	{
-		$this->_createToken();
-	}
-	
-	function _parseSeparater($ch, $type)
-	{
-		if ($type == EASYLEX_SQL_SEPARATER) {
-			$this->mActiveToken .= $ch;
-			$this->mIndex++;
-		}
-		else {
-			// $this->_createToken();
-			$this->mStatus = EASYLEX_SQL_UNKNOWN;
-			$this->mActiveToken = "";
-		}
-	}
-	
-	function _parseSemicolon($ch, $type)
-	{
-		$this->_createToken();
-	}
-	
-	function _parseMark($ch, $type)
-	{
-		if ($type == EASYLEX_SQL_MARK) {
-			$this->mActiveToken .= $ch;
-			$this->mIndex++;
-		}
-		else {
-			$this->_createToken();
-		}
-	}
-	
-	function _parseComma($ch, $type)
-	{
-		$this->_createToken();
-	}
-	
-	function _createToken($type = null, $value = null)
-	{
-		if ($type === null) {
-			$type = $this->mStatus;
-		}
-		
-		if ($value === null) {
-			$value = $this->mActiveToken;
-		}
-		
-		$token =& new EasyLex_SQLToken($type, $value);
-		$this->mTokens[] =& $token;
-		
-		$this->mStatus = EASYLEX_SQL_UNKNOWN;
-		$this->mActiveToken = "";
-		
-		return $token;
-	}
-	
-	/**
-	 * Return Array of operations.
-	 * 
-	 * @return Array $ret[Index] = Array of tokens.
-	 */
-	function &getOperations()
-	{
-		$ret = array();
-		$t_tokens = array();
-		$depth = 0;
-		
-		foreach (array_keys($this->mTokens) as $key) {
-			if ($this->mTokens[$key]->mType == EASYLEX_SQL_OPEN_PARENTHESIS) {
-				$depth++;
-			}
-			elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_CLOSE_PARENTHESIS) {
-				$depth--;
-			}
-			
-			$t_tokens[] =& $this->mTokens[$key];
-			
-			if ($this->mTokens[$key]->mType == EASYLEX_SQL_SEMICOLON && $depth == 0) {
-				$ret[] =& $t_tokens;
-				unset($t_tokens);
-				$t_tokens = array();
-			}
-		}
-		
-		if (count($t_tokens) > 0) {
-			$ret[] =& $t_tokens;
-			unset($t_tokens);
-		}
-		
-		return $ret;
-	}
-	
-	function getSQL()
-	{
-		$sqls = array();
-		$lines =& $this->getOperations();
-		
-		foreach ($lines as $line) {
-			$t_arr = array();
-			foreach ($line as $token) {
-				$t_arr[] = $token->getOutputValue();
-			}
-			$sqls[] = join(" ", $t_arr);
-		}
-		
-		return $sqls;
-	}
-}
-
-class EasyLex_SQLToken
-{
-	var $mType = EASYLEX_SQL_UNKNOWN;
-	var $mValue = "";
-	
-	function EasyLex_SQLToken($type, $value)
-	{
-		$this->mType = $type;
-		$this->mValue = $value;
-	}
-	
-	function getOutputValue()
-	{
-		if ($this->mType == EASYLEX_SQL_SEPARATER) {
-			return "";
-		}
-		else {
-			return $this->mValue;
-		}
-	}
-	
-	function getValue()
-	{
-		if ($this->mType == EASYLEX_SQL_SEPARATER) {
-			return "";
-		}
-		
-		if ($this->mType == EASYLEX_SQL_STRING_LITERAL) {
-			return substr($this->mValue, 1, strlen($this->mValue) - 2);
-		}
-		
-		return $this->mValue;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.12 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:removed
--- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.12	Mon Aug 21 18:59:02 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php	Tue Nov  7 17:04:33 2006
@@ -1,172 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_BASE_PATH."/admin/class/AbstractModuleInstaller.class.php";
-
-class Legacy_ModuleUninstaller extends Legacy_AbstractModuleInstaller
-{
-	function Legacy_ModuleUninstaller($dirname)
-	{
-		parent::Legacy_AbstractModuleInstaller($dirname);
-		
-		$this->mProcessScript->register('Legacy_ModuleUninstaller.ProcessScript');
-		$this->mProcessScript->add('Legacy_ModuleUninstaller::_processScript');
-		
-		$this->mInstallTable->register('Legacy_ModuleInstaller.InstallTable');
-		$this->mInstallTable->add('Legacy_ModuleUninstaller::_uninstallTable');
-
-		$this->mInstallTemplate->register('Legacy_ModuleUninstaller.InstallTemplate');
-		$this->mInstallTemplate->add('Legacy_ModuleUninstaller::_uninstallTemplate');
-	}
-	
-	/**
-	 * Load xoops module object that isn't installed and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
-	 */
-	function &loadModuleObject($dirname)
-	{
-		$error = null;
-
-		$moduleHandler =& xoops_gethandler('module');
-		$module =& $moduleHandler->getByDirname($dirname);
-
-		if (!is_object($module)) {
-			$this->mLog->addError(_AD_BASE_ERROR_MODULE_NOT_FOUND);
-			return $error;
-		}
-		
-		if ($module->getVar('isactive') != 0) {
-			$this->mLog->addError(_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE);
-			return $error;
-		}
-
-		return $module;
-	}
-	
-	/**
-	 * Delete module information from XOOPS database because this class is uninstaller.
-	 */
-	function _installModule()
-	{
-		$moduleHandler =& xoops_gethandler('module');
-		if (!$moduleHandler->delete($this->mModule)) {
-			$this->mLog->addError(_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB);
-		}
-		else {
-			$this->mLog->addReport(_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB);
-		}
-	}
-
-	/**
-	 * Drop table because this class is uninstaller.
-	 */
-	function _uninstallTable(&$module, &$log)
-	{
-		$root =& XCube_Root::getSingleton();
-		$db =& $root->mController->getDB();
-
-		$tables = $module->getInfo('tables');
-		if ($tables != false && is_array($tables)) {
-			foreach($tables as $table) {
-				//
-				// TODO Do we need to check reserved core tables?
-				//
-				$sql = "DROP TABLE " . $db->prefix($table);
-				if ($db->query($sql)) {
-					$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_DROP_TABLE, $db->prefix($table)));
-				}
-				else {
-					$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_DROP_TABLE, $db->prefix($table)));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delete template because this class is uninstaller.
-	 */
-	function _uninstallTemplate(&$module, &$log)
-	{
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		$deleteTemplates =& $tplHandler->find(null, 'module', $module->getVar('mid'));
-		
-		foreach($deleteTemplates as $tpl) {
-			if (!$tplHandler->delete($tpl)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
-			}
-		}
-	}
-
-	/**
-	 * Delete all of module's blocks.
-	 */
-	function _installBlock()
-	{
-		$blockHandler =& xoops_gethandler('block');
-		$criteria = new Criteria('mid', $this->mModule->getVar('mid'));
-
-		$blocks =& $blockHandler->getObjectsDirectly($criteria);
-		
-		$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')));
-
-			//
-			// delete permission
-			//
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_name', 'block_read'));
-			$criteria->add(new Criteria('gperm_itemid', $block->getVar('bid')));
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$gpermHandler->deleteAll($criteria);
-		}
-
-		$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()));
-		}
-	}
-
-	function _installPreference()
-	{
-		Legacy_ModuleUtils::deleteAllConfigs($this->mModule, $this->mLog);
-	}
-
-	function _processScript(&$module, &$log)
-	{
-		$installScript = trim($module->getInfo('onUninstall'));
-		if ($installScript != false) {
-			require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-			$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));
-				}
-			}
-		}
-	}
-	
-	function _processReport()
-	{
-		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_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')));
-			}
-			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname));
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:removed
--- xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.9	Mon Aug 21 18:59:12 2006
+++ xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php	Tue Nov  7 17:04:33 2006
@@ -1,205 +0,0 @@
-<?php
-/**
- * @version
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_BASE_PATH."/admin/class/ModuleUtils.class.php";
-
-/**
- * This is a abstract class for the process of install, update and uninstall.
- */
-class Legacy_AbstractModuleInstaller
-{
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mProcessScript = null;
-	
-	/**
-	 * Install or uninstall templates of this target module, this function is
-	 * called by own execute().
-	 *
-	 * @var XCube_Delegate
-	 */
-	var $mInstallTemplate = null;
-	
-	/**
-	 * Create or drop tables, this function is called by own execute().
-	 * 
-	 * @var XCube_Delegate
-	 */
-	var $mInstallTable = null;
-	
-	var $mDirname = null;
-
-	/**
-	 * XoopsModule
-	 */
-	var $mModule = null;
-
-	/**
-	 * Legacy_ModuleUtilsSimpleLog
-	 */
-	var $mLog = null;
-
-	/**
-	 * If this flag is true, never stop processing.
-	 */
-	var $mForceMode = false;
-
-	function Legacy_AbstractModuleInstaller($dirname)
-	{
-		$this->mDirname = $dirname;
-		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
-		
-		//
-		// Load message catalog for the required module installer of 'common'
-		// process.
-		//
-		$root =& XCube_Root::getSingleton();
-		if (is_object($root->mLanguageManager)) {
-			$root->mLanguageManager->loadModuleAdminMessageCatalog('base');
-		}
-		
-		$this->mProcessScript =& new XCube_Delegate();
-		$this->mInstallTable =& new XCube_Delegate();
-		$this->mInstallTemplate =& new XCube_Delegate();
-	}
-	
-	/**
-	 * Start callback to required member functions with module install
-	 * framework.
-	 * 
-	 * @return bool
-	 */
-	function execute()
-	{
-		$this->mModule =& $this->loadModuleObject($this->mDirname);
-		
-		if (!is_object($this->mModule)) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->mInstallTable->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installModule();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->mInstallTemplate->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installBlock();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-		
-		$this->_installNotification();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installPreference();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-		
-		$this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		
-		$this->_processReport();
-		
-		return true;
-	}
-
-	/**
-	 * Load xoops module object and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
-	 */
-	function &loadModuleObject($dirname)
-	{
-	}
-
-	function _installModule()
-	{
-		$moduleHandler =& xoops_gethandler('module');
-		if (!$moduleHandler->insert($this->mModule)) {
-			$this->mLog->addError("*Could not install module information*");
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Install or uninstall blocks and their templates, this function is called by own execute().
-	 */
-	function _installBlock()
-	{
-	}
-	
-	/**
-	 * Install or uninstall notifications, this member function is called by
-	 * own execute().
-	 * 
-	 * @access protected
-	 */
-	function _installNotification()
-	{
-	}
-	
-	/**
-	 * Install or uninstall blocks and their preference, this function is called by own execute().
-	 */
-	function _installPreference()
-	{
-	}
-
-	/**
-	 * If set true, this class may never stop for error.
-	 */
-	function setForceMode($flag)
-	{
-		$this->mForceMode = $flag;
-	}
-
-	/**
-	 * This member function is called back at the last part of execute().
-	 * Report the conclusion to the log.
-	 */	
-	function _processReport()
-	{
-	}
-	
-	/**
-	 * Return log instance.
-	 */
-	function &getLog()
-	{
-		return $this->mLog;
-	}
-	
-	function hasAgree()
-	{
-		return false;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.14.2.1 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:removed
--- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.14.2.1	Sat Oct 14 13:52:24 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php	Tue Nov  7 17:04:33 2006
@@ -1,310 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_BASE_PATH."/admin/class/AbstractModuleInstaller.class.php";
-
-class Legacy_ModuleUpdater extends Legacy_AbstractModuleInstaller
-{
-	var $mPreVersion = 0;
-
-	function Legacy_ModuleUpdater($dirname)
-	{
-		parent::Legacy_AbstractModuleInstaller($dirname);
-		
-		$this->mProcessScript->register('Legacy_ModuleUpdater.ProcessScript');
-		$this->mProcessScript->add(array(&$this, '_processScript'));
-		
-		$this->mInstallTable->register('Legacy_ModuleUpdater.InstallTable');
-
-		$this->mInstallTemplate->register('Legacy_ModuleUpdater.InstallTemplate');
-		$this->mInstallTemplate->add('Legacy_ModuleUpdater::_uninstallTemplate');
-	}
-
-	/**
-	 * @return bool
-	 */
-	function execute()
-	{
-		$this->mLog->addReport(_AD_BASE_MESSAGE_UPDATE_STARTED);
-		
-		parent::execute();
-	}
-	
-	/**
-	 * Load xoops module object installed and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
-	 */
-	function &loadModuleObject($dirname)
-	{
-		$ret = null;
-
-		$moduleHandler =& xoops_gethandler('module');
-		$module =& $moduleHandler->getByDirname($dirname);
-
-		if (!is_object($module))
-			return $ret;
-
-		$this->mPreVersion = $module->getVar('version');
-        $name = $module->getVar('name','n');
-		$module->loadInfoAsVar($dirname);
-		$module->setVar('name', $name, true);
-		return $module;
-	}
-
-	/**
-	 * @static
-	 */
-	function _uninstallTemplate(&$module, &$log)
-	{
-		$tplHandler =& xoops_gethandler('tplfile');
-
-		//
-		// The following processing depends on the structure of Legacy_RenderSystem.
-		//
-		$tplHandler =& xoops_gethandler('tplfile');
-		$delTemplates =& $tplHandler->find('default', 'module', $module->getVar('mid'));
-		if(is_array($delTemplates) && count($delTemplates) > 0) {
-			//
-			// clear cache
-			//
-			$xoopsTpl=new XoopsTpl();
-			$xoopsTpl->clear_cache(null, "mod_" . $module->getVar('dirname'));
-			
-			foreach ($delTemplates as $tpl) {
-				if (!$tplHandler->delete($tpl)) {
-					$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
-				}
-			}
-		}
-
-		//
-		// install Template All
-		//
-		$templates = $module->getInfo('templates');
-		if ($templates != false) {
-			foreach ($templates as $template) {
-				Legacy_ModuleUtils::installTemplate($module, $template, $log);
-			}
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	function _installBlock()
-	{
-		// XoopsBlock[]
-		$installBlocks = array();
-
-		// XoopsBlock[]
-		$unInstallBlocks = array();
-
-		$definedBlocks = $this->mModule->getInfo('blocks');
-		if($definedBlocks == false)
-			return false;
-
-		$blockHandler =& xoops_gethandler('block');
-
-		$func_num=0;
-		$showfuncs = array();
-        $funcfiles = array();
-		for ($i=1; $i<= count($definedBlocks); $i++) {
-		    $block =&  $definedBlocks[$i];
-			$func_num = $i;
-		    $showfuncs[] = isset($block['class']) ? ('cl::' . $block['class']) : $block['show_func'];
-		    $funcfiles[]=$block['file'];
-			$newBlock =& Legacy_ModuleUtils::createBlockByInfo($this->mModule, $block);
-			//
-			// Get a installed block by mid and name.
-			//
-			$criteria = new CriteriaCompo();
-			$criteria->add(new Criteria('mid', $this->mModule->getVar('mid')));
-			$criteria->add(new Criteria('func_num', $func_num));
-			$criteria->add(new Criteria('show_func', isset($block['class']) ? ('cl::' . $block['class']) : $block['show_func']));
-			$criteria->add(new Criteria('func_file', $block['file']));
-			$installedBlocks =& $blockHandler->getObjectsDirectly($criteria);
-			//
-			// If a installed block is not found, push it to new install block list.
-			//
-			if (count($installedBlocks) == 0) {
-				$newBlock->setVar('func_num', $func_num);
-				$installBlocks[] = array($newBlock, $block);
-				unset($newBlock);
-
-				continue;
-			}
-
-			$changedFlag = false;
-
-			$oldBlock =& $installedBlocks[0];
-            $newBlock =& Legacy_ModuleUtils::mergeBlockObject($oldBlock, $newBlock, $changedFlag);
-
-			if ($changedFlag) {
-				$installBlocks[] = array($newBlock, $block);
-			}
-			else {
-				if (!Legacy_ModuleUtils::installBlockTemplate($this->mModule, $oldBlock)) {
-					$this->mLog->addError("ERROR : Could not update block template ".$oldBlock->getVar('name'));
-				}
-			}
-
-			unset($newBlock);
-			unset($oldBlock);
-		}
-		$criteria = new CriteriaCompo();
-		$criteria->add(new Criteria('mid', $this->mModule->getVar('mid')));
-		$installedBlocks =& $blockHandler->getObjectsDirectly($criteria);
-		foreach ($installedBlocks as $blockObj) {
-            if (!in_array($blockObj->getVar('show_func'), $showfuncs) || !in_array($blockObj->getVar('func_file'), $funcfiles)) {
-				$unInstallBlocks[] =& $blockObj;
-				unset($blockObj);
-            }
-        }
-
-		foreach ($installBlocks as $block) {
-			Legacy_ModuleUtils::installBlock($this->mModule, $block[0], $block[1], $this->mLog);
-		}
-        
-		foreach ($unInstallBlocks as $block) {
-			Legacy_ModuleUtils::unInstallBlock($block, $this->mLog);
-		}
-
-	}
-	
-	function _installPreference()
-	{
-		$configHandler =& xoops_gethandler('config');
-		
-		//
-		// At the start, load config items of this time.
-		//
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('conf_modid', $this->mModule->get('mid')));
-		$criteria->add(new Criteria('conf_catid', 0));
-		
-		$activeConfigArr =& $configHandler->getConfigs($criteria);
-		
-		//
-		// Next, load config item from xoops_version.php.
-		//
-		$newConfigArr = array();
-		$t_configInfoArr = Legacy_ModuleUtils::getConfigInfosFromManifesto($this->mModule);
-		
-		$count = 0;
-		if (is_array($t_configInfoArr)) {
-			foreach ($t_configInfoArr as $t_configInfo) {
-				$config =& $configHandler->createConfig();
-				$config->loadFromConfigInfo($this->mModule->get('mid'), $t_configInfo, $count++);
-				$newConfigArr[] =& $config;
-				unset($config);
-			}
-		}
-		
-		//
-		// If some active configs were deleted, remove them form database.
-		//
-		foreach (array_keys($activeConfigArr) as $t_actkey) {
-			$findFlag = false;
-			foreach (array_keys($newConfigArr) as $t_newkey) {
-				
-				if ($activeConfigArr[$t_actkey]->get('conf_name') == $newConfigArr[$t_newkey]->get('conf_name')) {
-					$findFlag = true;
-					if (!$activeConfigArr[$t_actkey]->isEqual($newConfigArr[$t_newkey])) {
-						//
-						// Update object
-						//
-						$activeConfigArr[$t_actkey]->set('conf_title', $newConfigArr[$t_newkey]->get('conf_title'));
-						$activeConfigArr[$t_actkey]->set('conf_value', $newConfigArr[$t_newkey]->get('conf_value'));
-						$activeConfigArr[$t_actkey]->set('conf_desc', $newConfigArr[$t_newkey]->get('conf_desc'));
-						$activeConfigArr[$t_actkey]->set('conf_formtype', $newConfigArr[$t_newkey]->get('conf_formtype'));
-						$activeConfigArr[$t_actkey]->set('conf_valuetype', $newConfigArr[$t_newkey]->get('conf_valuetype'));
-						
-						//
-						// Delete config options.
-						//
-						$t_optionArr =& $activeConfigArr[$t_actkey]->getOptionItems();
-						foreach (array_keys($t_optionArr) as $t_optionKey) {
-							$configHandler->_oHandler->delete($t_optionArr[$t_optionKey]);	//< Exception!!
-						}
-						
-						$activeConfigArr[$t_actkey]->setConfOptions($newConfigArr[$t_newkey]->getConfOptions());
-						
-						$configHandler->insertConfig($activeConfigArr[$t_actkey]);	//< FIXME need log.
-					}
-				}
-			}
-			
-			if (!$findFlag) {
-				$configHandler->deleteConfig($activeConfigArr[$t_actkey]);
-				unset($activeConfigArr[$t_actkey]);
-			}
-		}
-		
-		//
-		// If some new configs were registered, insert them into database.
-		//
-		$maxOrder = 0;
-		foreach (array_keys($activeConfigArr) as $t_actkey) {
-			if ($activeConfigArr[$t_actkey]->get('conf_order') > $maxOrder) {
-				$maxOrder = $activeConfigArr[$t_actkey]->get('conf_order');
-			}
-		}
-		
-		$order = $maxOrder + 1;
-		
-		foreach (array_keys($newConfigArr) as $t_newkey) {
-			$newFlag = true;
-			foreach (array_keys($activeConfigArr) as $t_actkey) {
-				if ($newConfigArr[$t_newkey]->isEqual($activeConfigArr[$t_actkey])) {
-					$newFlag = false;
-					break;
-				}
-			}
-			
-			if ($newFlag) {
-				$newConfigArr[$t_newkey]->set('conf_order', $order);
-				if ($configHandler->insertConfig($newConfigArr[$t_newkey])) {
-					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_INSERT_CONFIG, $newConfigArr[$t_newkey]->get('conf_name')));
-				}
-				else {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG, $newConfigArr[$t_newkey]->get('conf_name')));
-				}
-			}
-		}
-	}
-
-	function _processScript(&$module, &$log)
-	{
-		$installScript = trim($module->getInfo('onUpdate'));
-		if ($installScript != false) {
-			require_once XOOPS_MODULE_PATH . "/" . $module->getVar('dirname') . "/" . $installScript;
-			$funcName = 'xoops_module_update_' . $module->getVar('dirname');
-			if (function_exists($funcName)) {
-				if (!call_user_func($funcName, $module, $this->mPreVersion)) {
-					$log->addError("Failed to execute " . $funcName);
-				}
-			}
-		}
-	}
-	
-	function _processReport()
-	{
-		if (!$this->mLog->hasError()) {
-			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL, $this->mModule->get('name')));
-		}
-		else {
-			if (is_object($this->mModule)) {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mModule->get('name')));
-			}
-			else {
-				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mDirname));
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/index.html
diff -u xoops2jp/html/modules/base/admin/class/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/class/index.html:removed
--- xoops2jp/html/modules/base/admin/class/index.html:1.1.2.1	Mon Mar 27 11:41:54 2006
+++ xoops2jp/html/modules/base/admin/class/index.html	Tue Nov  7 17:04:33 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:34 +0900
Subject: [xoops-cvslog 5672] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20061107080434.4AE332AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/global.php
diff -u xoops2jp/html/modules/base/language/english/global.php:1.1.2.11 xoops2jp/html/modules/base/language/english/global.php:removed
--- xoops2jp/html/modules/base/language/english/global.php:1.1.2.11	Thu Sep 21 15:50:33 2006
+++ xoops2jp/html/modules/base/language/english/global.php	Tue Nov  7 17:04:34 2006
@@ -1,222 +0,0 @@
-<?php
-// $Id: global.php,v 1.1.2.11 2006/09/21 06:50:33 minahito Exp $
-
-define('_TOKEN_ERROR', 'Alert ! This prevent you from instantiating a malformed request or post. Please, submit again to confirm!');
-define('_SYSTEM_MODULE_ERROR', 'Following Modules are not installed.');
-define('_INSTALL','Install');
-define('_UNINSTALL','Uninstall');
-define('_SYS_MODULE_UNINSTALLED','Required(Not Installed)');
-define('_SYS_MODULE_DISABLED','Required(Disabled)');
-define('_SYS_RECOMMENDED_MODULES','Recommended Module');
-define('_SYS_OPTION_MODULES','Optional Module');
-define('_UNINSTALL_CONFIRM','Are you sure to uninstall system module?');
-
-//%%%%%%	File Name mainfile.php 	%%%%%
-define("_PLEASEWAIT","Please Wait");
-define("_FETCHING","Loading...");
-define("_TAKINGBACK","Taking you back to where you were....");
-define("_LOGOUT","Logout");
-define("_SUBJECT","Subject");
-define("_MESSAGEICON","Message Icon");
-define("_COMMENTS","Comments");
-define("_POSTANON","Post Anonymously");
-define("_DISABLESMILEY","Disable smiley");
-define("_DISABLEHTML","Disable html");
-define("_PREVIEW","Preview");
-
-define("_GO","Go!");
-define("_NESTED","Nested");
-define("_NOCOMMENTS","No Comments");
-define("_FLAT","Flat");
-define("_THREADED","Threaded");
-define("_OLDESTFIRST","Oldest First");
-define("_NEWESTFIRST","Newest First");
-define("_MORE","more...");
-define("_MULTIPAGE","To have your article span multiple pages, insert the word <font color=red>[pagebreak]</font> (with brackets) in the article.");
-define("_IFNOTRELOAD","If the page does not automatically reload, please click <a href='%s'>here</a>");
-define("_WARNINSTALL2","WARNING: Directory %s exists on your server. <br />Please remove this directory for security reasons.");
-define("_WARNINWRITEABLE","WARNING: File %s is writeable by the server. <br />Please change the permission of this file for security reasons.<br /> in Unix (444), in Win32 (read-only)");
-define('_WARNPHPENV','WARNING: php.ini parameter "%s" is set to "%s". %s');
-define('_WARNSECURITY','(It may cause a security problem)');
-
-//%%%%%%	File Name themeuserpost.php 	%%%%%
-define("_PROFILE","Profile");
-define("_POSTEDBY","Posted by");
-define("_VISITWEBSITE","Visit Website");
-define("_SENDPMTO","Send Private Message to %s");
-define("_SENDEMAILTO","Send Email to %s");
-define("_ADD","Add");
-define("_REPLY","Reply");
-define("_DATE","Date");   // Posted date
-
-//%%%%%%	File Name admin_functions.php 	%%%%%
-define("_MAIN","Main");
-define("_MANUAL","Manual");
-define("_INFO","Info");
-define("_CPHOME","Control Panel Home");
-define("_YOURHOME","Home Page");
-
-//%%%%%%	File Name misc.php (who's-online popup)	%%%%%
-define("_WHOSONLINE","Who's Online");
-define('_GUESTS', 'Guests');
-define('_MEMBERS', 'Members');
-define("_ONLINEPHRASE","%s user(s) are online");
-define("_ONLINEPHRASEX","%s user(s) are browsing %s");
-define("_CLOSE","Close");  // Close window
-
-//%%%%%%	File Name module.textsanitizer.php 	%%%%%
-define("_QUOTEC","Quote:");
-
-//%%%%%%	File Name admin.php 	%%%%%
-define("_NOPERM","Sorry, you don't have the permission to access this area.");
-
-//%%%%%		Common Phrases		%%%%%
-define("_NO","No");
-define("_YES","Yes");
-define("_EDIT","Edit");
-define("_DELETE","Delete");
-define("_VIEW","View");
-define("_SUBMIT","Submit");
-define("_MODULENOEXIST","Selected module does not exist!");
-define("_ALIGN","Align");
-define("_LEFT","Left");
-define("_CENTER","Center");
-define("_RIGHT","Right");
-define("_FORM_ENTER", "Please enter %s");
-// %s represents file name
-define("_MUSTWABLE","File %s must be writable by the server!");
-// Module info
-define('_PREFERENCES', 'Preferences');
-define("_VERSION", "Version");
-define("_DESCRIPTION", "Description");
-define("_ERRORS", "Errors");
-define("_NONE", "None");
-define('_ON','on');
-define('_READS','reads');
-define('_WELCOMETO','Welcome to %s');
-define('_SEARCH','Search');
-define('_ALL', 'All');
-define('_TITLE', 'Title');
-define('_OPTIONS', 'Options');
-define('_QUOTE', 'Quote');
-define('_LIST', 'List');
-define('_LOGIN','User Login');
-define('_USERNAME','Username: ');
-define('_PASSWORD','Password: ');
-define("_SELECT","Select");
-define("_IMAGE","Image");
-define("_SEND","Send");
-define("_CANCEL","Cancel");
-define("_ASCENDING","Ascending order");
-define("_DESCENDING","Descending order");
-define('_BACK', 'Back');
-define('_NOTITLE', 'No title');
-define('_RETURN_TOP', 'returns to the top');
-
-/* Image manager */
-define('_IMGMANAGER','Image Manager');
-define('_NUMIMAGES', '%s images');
-define('_ADDIMAGE','Add Image File');
-define('_IMAGENAME','Name:');
-define('_IMGMAXSIZE','Max size allowed (bytes):');
-define('_IMGMAXWIDTH','Max width allowed (pixels):');
-define('_IMGMAXHEIGHT','Max height allowed (pixels):');
-define('_IMAGECAT','Category:');
-define('_IMAGEFILE','Image file:');
-define('_IMGWEIGHT','Display order in image manager:');
-define('_IMGDISPLAY','Display this image?');
-define('_IMAGEMIME','MIME type:');
-define('_FAILFETCHIMG', 'Could not get uploaded file %s');
-define('_FAILSAVEIMG', 'Failed storing image %s into the database');
-define('_NOCACHE', 'No Cache');
-define('_CLONE', 'Clone');
-
-//%%%%%	File Name class/xoopsform/formmatchoption.php 	%%%%%
-define("_STARTSWITH", "Starts with");
-define("_ENDSWITH", "Ends with");
-define("_MATCHES", "Matches");
-define("_CONTAINS", "Contains");
-
-//%%%%%%	File Name commentform.php 	%%%%%
-define("_REGISTER","Register");
-
-//%%%%%%	File Name xoopscodes.php 	%%%%%
-define("_SIZE","SIZE");  // font size
-define("_FONT","FONT");  // font family
-define("_COLOR","COLOR");  // font color
-define("_EXAMPLE","SAMPLE");
-define("_ENTERURL","Enter the URL of the link you want to add:");
-define("_ENTERWEBTITLE","Enter the web site title:");
-define("_ENTERIMGURL","Enter the URL of the image you want to add.");
-define("_ENTERIMGPOS","Now, enter the position of the image.");
-define("_IMGPOSRORL","'R' or 'r' for right, 'L' or 'l' for left, or leave it blank.");
-define("_ERRORIMGPOS","ERROR! Enter the position of the image.");
-define("_ENTEREMAIL","Enter the email address you want to add.");
-define("_ENTERCODE","Enter the codes that you want to add.");
-define("_ENTERQUOTE","Enter the text that you want to be quoted.");
-define("_ENTERTEXTBOX","Please input text into the textbox.");
-define("_ALLOWEDCHAR","Allowed max chars length: ");
-define("_CURRCHAR","Current chars length: ");
-define("_PLZCOMPLETE","Please complete the subject and message fields.");
-define("_MESSAGETOOLONG","Your message is too long.");
-
-//%%%%%		TIME FORMAT SETTINGS   %%%%%
-define('_SECOND', '1 second');
-define('_SECONDS', '%s seconds');
-define('_MINUTE', '1 minute');
-define('_MINUTES', '%s minutes');
-define('_HOUR', '1 hour');
-define('_HOURS', '%s hours');
-define('_DAY', '1 day');
-define('_DAYS', '%s days');
-define('_WEEK', '1 week');
-define('_MONTH', '1 month');
-
-define('_HELP', "Help");
-
-define("_DATESTRING","Y/n/j G:i:s");
-define("_MEDIUMDATESTRING","Y/n/j G:i");
-define("_SHORTDATESTRING","Y/n/j");
-/*
-The following characters are recognized in the format string:
-a - "am" or "pm"
-A - "AM" or "PM"
-d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
-D - day of the week, textual, 3 letters; i.e. "Fri"
-F - month, textual, long; i.e. "January"
-h - hour, 12-hour format; i.e. "01" to "12"
-H - hour, 24-hour format; i.e. "00" to "23"
-g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
-G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
-i - minutes; i.e. "00" to "59"
-j - day of the month without leading zeros; i.e. "1" to "31"
-l (lowercase 'L') - day of the week, textual, long; i.e. "Friday"
-L - boolean for whether it is a leap year; i.e. "0" or "1"
-m - month; i.e. "01" to "12"
-n - month without leading zeros; i.e. "1" to "12"
-M - month, textual, 3 letters; i.e. "Jan"
-s - seconds; i.e. "00" to "59"
-S - English ordinal suffix, textual, 2 characters; i.e. "th", "nd"
-t - number of days in the given month; i.e. "28" to "31"
-T - Timezone setting of this machine; i.e. "MDT"
-U - seconds since the epoch
-w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
-Y - year, 4 digits; i.e. "1999"
-y - year, 2 digits; i.e. "99"
-z - day of the year; i.e. "0" to "365"
-Z - timezone offset in seconds (i.e. "-43200" to "43200")
-*/
-
-
-//%%%%%		LANGUAGE SPECIFIC SETTINGS   %%%%%
-if (!defined('_CHARSET')) {
-	define('_CHARSET', 'ISO-8859-1');
-}
-
-if (!defined('_LANGCODE')) {
-	define('_LANGCODE', 'en');
-}
-
-// change 0 to 1 if this language is a multi-bytes language
-define("XOOPS_USE_MULTIBYTES", "0");
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/english/modinfo.php
diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.19 xoops2jp/html/modules/base/language/english/modinfo.php:removed
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.19	Thu Aug 24 20:16:09 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Tue Nov  7 17:04:34 2006
@@ -1,40 +0,0 @@
-<?php
-
-define('_MI_BASE_BLOCK_COMMENTS_DESC', "Shows most recent comments");
-define('_MI_BASE_BLOCK_COMMENTS_NAME', "Recent Comments");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "Shows the main navigation menu of the site");
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search block");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "Search");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic site information and a link to a 'Recommend Us' pop up window");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info");
-define('_MI_BASE_BLOCK_THEMES_DESC', "Shows theme selection box");
-define('_MI_BASE_BLOCK_THEMES_NAME', "Themes");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu");
-define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval");
-define('_MI_BASE_BLOCK_WAITING_NAME', "Pending Contents");
-define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new");
-define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
-define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload");
-define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new");
-define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall");
-define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list");
-define('_MI_BASE_MENU_ACTIONSEARCH', "Action Search");
-define('_MI_BASE_MENU_BLOCKINSTALL', "Block Installation");
-define('_MI_BASE_MENU_BLOCKLIST', "Block Management");
-define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment Management");
-define('_MI_BASE_MENU_CREATE_SMILES', "Create Smilies");
-define('_MI_BASE_MENU_IMAGE_MANAGE', "Image Management");
-define('_MI_BASE_MENU_MODULEINSTALL', "Module Installation");
-define('_MI_BASE_MENU_MODULELIST', "Module Management");
-define('_MI_BASE_MENU_PREFERENCE', "Preferences");
-define('_MI_BASE_MENU_SMILES_MANAGE', "Smilies Management");
-define('_MI_BASE_MENU_THEME_MANAGE', "Theme Management");
-define('_MI_BASE_NAME', "Legacy System");
-define('_MI_BASE_NAME_DESC', "This module provides compatibility between XOOPS Cube and XOOPS 2.0.x.");
-
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/english/blocks.php
diff -u xoops2jp/html/modules/base/language/english/blocks.php:1.1.2.3 xoops2jp/html/modules/base/language/english/blocks.php:removed
--- xoops2jp/html/modules/base/language/english/blocks.php:1.1.2.3	Mon Sep 25 18:37:22 2006
+++ xoops2jp/html/modules/base/language/english/blocks.php	Tue Nov  7 17:04:34 2006
@@ -1,36 +0,0 @@
-<?php
-define("_MB_BASE_HOME",  "Home");
-
-define("_MB_BASE_VACNT", "View Account");
-define("_MB_BASE_EACNT", "Edit Account");
-define("_MB_BASE_NOTIF", "Notifications");
-define("_MB_BASE_INBOX", "Inbox");
-define("_MB_BASE_LOUT",  "Logout");
-define("_MB_BASE_ADMENU","Administration Menu");
-
-define("_MB_BASE_SEARCH","Search");
-define("_MB_BASE_ADVS",  "Advanced Search");
-
-define("_MB_BASE_SUBMS", "Submitted News");
-define("_MB_BASE_WLNKS", "Waiting Links");
-define("_MB_BASE_BLNK",  "Broken Links");
-define("_MB_BASE_MLNKS", "Modified Links");
-define("_MB_BASE_WDLS",  "Waiting Downloads");
-define("_MB_BASE_BFLS",  "Broken Files");
-define("_MB_BASE_MFLS",  "Modified Downloads");
-define("_MB_BASE_COMPEND", "Comments");
-
-define("_MB_BASE_RECO",  "Recommend Us");
-define("_MB_BASE_PWWIDTH", "Pop-Up Window Width");
-define("_MB_BASE_PWHEIGHT","Pop-Up Window Height");
-define("_MB_BASE_LOGO",    "Logo image file under %s directory");  // %s is your root image directory name
-define("_MB_BASE_SADMIN",  "Show admin groups");
-define("_MB_BASE_DISPLAYC","Display %s comments");
-
-define("_MB_BASE_LANG_NUMTHEME", "%s themes");
-define('_MB_BASE_LANG_THSHOW', "Display screenshot image");
-define('_MB_BASE_LANG_THWIDTH', "Screenshot image width");
-
-define('_MB_BASE_LANG_RECOMMENDSITE', "Recommend this Site to a Friend");
-
-?>
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.52.2.1 xoops2jp/html/modules/base/language/english/admin.php:removed
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.52.2.1	Tue Oct 10 17:55:13 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Tue Nov  7 17:04:34 2006
@@ -1,361 +0,0 @@
-<?php
-
-define('_AD_BASE_ERROR_ACTION_SEARCH_NORESULT', "Couldn't find results with your keyword(s).");
-define('_AD_BASE_ERROR_ACTION_SEARCH_TRY_AGAIN', "Try again with different keyword(s).");
-define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "Could not install block template '{0}'");
-define('_AD_BASE_ERROR_BMODULE', "You must specify one or more modules as the target module in which to display the block.");
-define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "Can't uninstall active module. To uninstall, turn off the active-status of the module.");
-define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates　: {0}");
-define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "Could not insert config '{0}'");
-define('_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK', "Could not install '{0}' block.");
-define('_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE', "Could not install '{0}' template.");
-define('_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION', "Could not set admin permission(s).");
-define('_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION', "Could not set block permission of '{0}'");
-define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "Could not set link with all module at '{0}' block");
-define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "Could not set read permission(s).");
-define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "Could not set system admin permission(s).");
-define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "Could not delete module information from XOOPS database.");
-define('_AD_BASE_ERROR_DROP_TABLE', "Could not drop table {0}");
-define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
-define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "Failed to execute '{0}' callback.");
-define('_AD_BASE_ERROR_GROUPID', "You must grant access permission to one or more groups.");
-define('_AD_BASE_ERROR_IMG_FILESIZE', "The maximum size of an image file is {0} bytes.");
-define('_AD_BASE_ERROR_IMG_SIZE', "The maximum width and height of an image file is {0} x {1}.");
-define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{0}' module has failed.");
-define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
-define('_AD_BASE_ERROR_MIN', "Input {0} with {1} or more numeric value.");
-define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "The specified module cannot be found.");
-define('_AD_BASE_ERROR_NO_HELP_FILE', "The help file can not be found.");
-define('_AD_BASE_ERROR_OBJECTEXIST', "Incorrect input on {0}.");
-define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree to the following licence.");
-define('_AD_BASE_ERROR_READGROUPS', "You must grant read permission to one or more groups.");
-define('_AD_BASE_ERROR_SEARCH_REQUIRED', "Input keyword");
-define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {0}");
-define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "Could not uninstall template '{0}'.");
-define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Sorry, uninstallation of '{0}' module has failed.");
-define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Sorry, updating '{0}' module has failed.");
-define('_AD_BASE_ERROR_UPLOADGROUPS', "You must grant upload permission to one or more groups.");
-define('_AD_BASE_LANG_ACTIONSEARCH', "Action Search");
-define('_AD_BASE_LANG_ACTIONSEARCH_INFO', "You can use ActionSearch to search for a menu item or a help file by typing in a keyword.");
-define('_AD_BASE_LANG_ACTIVE', "Active");
-define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block");
-define('_AD_BASE_LANG_ADMIN_MENU', "Information about the Adminstration Menu");
-define('_AD_BASE_LANG_ADMINMENU_HAS_MAIN', "Administration Menu");
-define('_AD_BASE_LANG_ADMINMENU_INDEX', "Administration Menu");
-define('_AD_BASE_LANG_ADMINMENU_MENU', "Detailed module package information ");
-define('_AD_BASE_LANG_ADMINMENU_NAME', "Name of Administration Menu");
-define('_AD_BASE_LANG_ADMINMENU_URL', "URL of Administration Menu");
-define('_AD_BASE_LANG_AGREE', "Agree");
-define('_AD_BASE_LANG_ALL_MODULE', "All modules");
-define('_AD_BASE_LANG_ALL_MODULES', "All modules");
-define('_AD_BASE_LANG_ALL_STATUS', "All status");
-define('_AD_BASE_LANG_AUTHOR', "author");
-define('_AD_BASE_LANG_BCACHETIME', "Cache time");
-define('_AD_BASE_LANG_BID', "BID");
-define('_AD_BASE_LANG_BLOCK_EDIT', "Block edit");
-define('_AD_BASE_LANG_BLOCK_INSTALL', "Block install");
-define('_AD_BASE_LANG_BLOCK_KEY', "Key");
-define('_AD_BASE_LANG_BLOCK_MOD', "Module ");
-define('_AD_BASE_LANG_BLOCK_TYPE', "Block type");
-define('_AD_BASE_LANG_BLOCK_UNINSTALL', "Block uninstall");
-define('_AD_BASE_LANG_BLOCK_VAL', "Value");
-define('_AD_BASE_LANG_BLOCKS_INFO', "Block information");
-define('_AD_BASE_LANG_C_TYPE', "Type");
-define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block - center");
-define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block - left");
-define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block - right");
-define('_AD_BASE_LANG_COM_CREATED', "Created");
-define('_AD_BASE_LANG_COM_MODIFIED', "Modified");
-define('_AD_BASE_LANG_COM_SIG', "Signature");
-define('_AD_BASE_LANG_COM_STATUS', "Status");
-define('_AD_BASE_LANG_COM_UID', "UID");
-define('_AD_BASE_LANG_COMMENT_DELETE', "Delete a comment");
-define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment");
-define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment");
-define('_AD_BASE_LANG_COMMENT_SVC', "Comment");
-define('_AD_BASE_LANG_COMMENT_VIEW', "Comment view");
-define('_AD_BASE_LANG_CONFCAT_ID', "Config Category ID");
-define('_AD_BASE_LANG_CONFCAT_NAME', "Confing Category Name");
-define('_AD_BASE_LANG_CONFIG_INFO', "Module Preferences");
-define('_AD_BASE_LANG_CONFIG_KEY', "Key");
-define('_AD_BASE_LANG_CONFIG_VAL', "Value");
-define('_AD_BASE_LANG_CONTENT', "Content");
-define('_AD_BASE_LANG_CONTROL', "Control");
-define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
-define('_AD_BASE_LANG_CTYPE_HTML', "HTML");
-define('_AD_BASE_LANG_CTYPE_PHP', "PHP");
-define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "Auto format with smilies");
-define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "Auto format without smilies");
-define('_AD_BASE_LANG_CUSTOM_HTML', "Custom HTML");
-define('_AD_BASE_LANG_CUSTOM_PHP', "Custom PHP");
-define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "Custom with Smilies");
-define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "Custom without Smilies");
-define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "Custom block delete");
-define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "Custom block edit");
-define('_AD_BASE_LANG_DEACTIVATE', "Inactive");
-define('_AD_BASE_LANG_DIRNAME', "Directory name");
-define('_AD_BASE_LANG_DISPLAY', "Display");
-define('_AD_BASE_LANG_DOIMAGE', "Enable [img] tag");
-define('_AD_BASE_LANG_EDIT_FUNC', "Callback edit function name");
-define('_AD_BASE_LANG_FEATURE_SVC_INFO', "Information about feature function");
-define('_AD_BASE_LANG_FORCE_MODE', "Force mode: Force uninstall overriding errors and clean up database as much as possible.");
-define('_AD_BASE_LANG_FORMAT', "format");
-define('_AD_BASE_LANG_FUNC_FILE', "Callback file name");
-define('_AD_BASE_LANG_FUNC_NUM', "Function number");
-define('_AD_BASE_LANG_GET_THE_LATEST_VERSION', "Get the latest version");
-define('_AD_BASE_LANG_GROUPID', "Group");
-define('_AD_BASE_LANG_ID', "ID");
-define('_AD_BASE_LANG_IMAGE_COUNT', "Image count");
-define('_AD_BASE_LANG_IMAGE_CREATED', "image created");
-define('_AD_BASE_LANG_IMAGE_DELETE', "Image delete");
-define('_AD_BASE_LANG_IMAGE_DISPLAY', "image display");
-define('_AD_BASE_LANG_IMAGE_EDIT', "Image edit");
-define('_AD_BASE_LANG_IMAGE_ID', "image id");
-define('_AD_BASE_LANG_IMAGE_LIST', "Image list");
-define('_AD_BASE_LANG_IMAGE_NAME', "image name");
-define('_AD_BASE_LANG_IMAGE_NEW', "Image new");
-define('_AD_BASE_LANG_IMAGE_WEIGHT', "image weight");
-define('_AD_BASE_LANG_IMAGECATEGORY_DELETE', "Delete Image Category");
-define('_AD_BASE_LANG_IMAGECATEGORY_EDIT', "Edit Image Category");
-define('_AD_BASE_LANG_IMAGECATEGORY_LIST', "Image Category list");
-define('_AD_BASE_LANG_IMAGECATEGORY_NEW', "Add New Image Category");
-define('_AD_BASE_LANG_IMGCAT_DISPLAY', "Cat. display");
-define('_AD_BASE_LANG_IMGCAT_ID', "Cat. id");
-define('_AD_BASE_LANG_IMGCAT_MAXHEIGHT', "Cat. maxheight (px)");
-define('_AD_BASE_LANG_IMGCAT_MAXSIZE', "Cat. maxsize (byte)");
-define('_AD_BASE_LANG_IMGCAT_MAXWIDTH', "Cat. maxwidth (px)");
-define('_AD_BASE_LANG_IMGCAT_NAME', "Cat. name");
-define('_AD_BASE_LANG_IMGCAT_READ_GROUPS', "Groups who can view this category.");
-define('_AD_BASE_LANG_IMGCAT_STORETYPE', "Cat. storetype");
-define('_AD_BASE_LANG_IMGCAT_TYPE', "Cat. type");
-define('_AD_BASE_LANG_IMGCAT_UPLOAD_GROUPS', "Groups who can upload to this category.");
-define('_AD_BASE_LANG_IMGCAT_WEIGHT', "Weight");
-define('_AD_BASE_LANG_INFORMATION', "Information");
-define('_AD_BASE_LANG_INSTALL', "Install");
-define('_AD_BASE_LANG_ISACTIVE', "Active");
-define('_AD_BASE_LANG_LAST_MODIFIED', "Last modified");
-define('_AD_BASE_LANG_LASTUPDATE', "Last update");
-define('_AD_BASE_LANG_LCR', "L-CNTR-R");
-define('_AD_BASE_LANG_LIST', "List");
-define('_AD_BASE_LANG_MAINMENU_HAS_MAIN', "Main Menu");
-define('_AD_BASE_LANG_MAINMENU_INFO', "Information about the Main Menu");
-define('_AD_BASE_LANG_MOD_AUTHOR', "Module Author");
-define('_AD_BASE_LANG_MOD_BASIC_INFO', "Basic Information");
-define('_AD_BASE_LANG_MOD_CREDITS', "Signature / Memo");
-define('_AD_BASE_LANG_MOD_DESC', "Module description");
-define('_AD_BASE_LANG_MOD_DIR_NAME', "Module directory");
-define('_AD_BASE_LANG_MOD_LICENSE_INFO', "Licence Information ");
-define('_AD_BASE_LANG_MOD_MID', "MID");
-define('_AD_BASE_LANG_MOD_NAME', "Module name");
-define('_AD_BASE_LANG_MODINSTALL', "Module install");
-define('_AD_BASE_LANG_MODINSTALL_ADVICE', "Are you sure you want to install <b>_%s_</b>?");
-define('_AD_BASE_LANG_MODINSTALL_CONF', "Are you sure you want to install this module?");
-define('_AD_BASE_LANG_MODINSTALL_LIST_ADVICE', "Delete unused module files from the server to maintain security of your site.  ");
-define('_AD_BASE_LANG_MODINSTALL_LOG', "module install log");
-define('_AD_BASE_LANG_MODINSTALL_SUCCESS', "The module has been successfully installed.");
-define('_AD_BASE_LANG_MODLIST', "Module administration");
-define('_AD_BASE_LANG_MODULE_LICENSE', "Module license");
-define('_AD_BASE_LANG_MODUNINSTALL_ADVICE', "Are you sure you want to uninstall this module?");
-define('_AD_BASE_LANG_MODUNINSTALL_CONF', "Confirm module uninstall.");
-define('_AD_BASE_LANG_MODUNINSTALL_LOG', "Module uninstall log");
-define('_AD_BASE_LANG_MODUNINSTALL_SUCCESS', "The module has been successfully uninstalled.");
-define('_AD_BASE_LANG_MODUPDATE_ADVICE', "Are you sure you want to update <b>_%s_</b>?");
-define('_AD_BASE_LANG_MODUPDATE_CONF', "Confirm module update.");
-define('_AD_BASE_LANG_MODUPDATE_LOG', "Module update log");
-define('_AD_BASE_LANG_MODUPDATE_SUCCESS', "The module has been successfully updated.");
-define('_AD_BASE_LANG_NAME', "Name");
-define('_AD_BASE_LANG_NO', "No");
-define('_AD_BASE_LANG_NO_ADMINMENU', "No Administration Menu");
-define('_AD_BASE_LANG_NO_AGREE', " I Do Not Agree.");
-define('_AD_BASE_LANG_NO_BLOCK', "No block information");
-define('_AD_BASE_LANG_NO_CHANGE', "No change");
-define('_AD_BASE_LANG_NO_CONFIG', "Module preferences have not been configured.");
-define('_AD_BASE_LANG_NO_MAINMENU', "Mainmenu settings have not been configured.");
-define('_AD_BASE_LANG_NO_SETTING', "No setting");
-define('_AD_BASE_LANG_NO_SQL', "SQL information has not been configured.");
-define('_AD_BASE_LANG_NO_SUBMENU', "SubMenu information has not been configured.");
-define('_AD_BASE_LANG_NO_TEMPLATE', "Template information has not been configured.");
-define('_AD_BASE_LANG_NONE', "None");
-define('_AD_BASE_LANG_NOTIF_SVC', "Notification");
-define('_AD_BASE_LANG_OPTIONS', "Options");
-define('_AD_BASE_LANG_PACKAGE', "Package Data");
-define('_AD_BASE_LANG_RENDER', "Render System");
-define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment");
-define('_AD_BASE_LANG_RESULT', "Results");
-define('_AD_BASE_LANG_SEARCH', "Search");
-define('_AD_BASE_LANG_SEARCH_SVC', "Search");
-define('_AD_BASE_LANG_SELECTED', "Selected");
-define('_AD_BASE_LANG_SHOW_FUNC', "Callback show function");
-define('_AD_BASE_LANG_SIDE', "Side");
-define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block - left");
-define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block - right");
-define('_AD_BASE_LANG_SMARTY', "Smarty");
-define('_AD_BASE_LANG_SMILE_URL', "Images");
-define('_AD_BASE_LANG_SMILES_DELETE', "Delete smiley");
-define('_AD_BASE_LANG_SMILES_EDIT', "Edit smiley");
-define('_AD_BASE_LANG_SMILES_NEW', "Add a smiley");
-define('_AD_BASE_LANG_SQL_ENGINE', "SQL engine");
-define('_AD_BASE_LANG_SQL_FILE_NAME', "SQL file name");
-define('_AD_BASE_LANG_SQL_HAS_MAIN', "Use SQL");
-define('_AD_BASE_LANG_SQL_INFO', "SQL information");
-define('_AD_BASE_LANG_SQL_MYSQL', "MySQL");
-define('_AD_BASE_LANG_SUBMENU_NAME', "SubMenu name");
-define('_AD_BASE_LANG_SUBMENU_URL', "SubMenu URL");
-define('_AD_BASE_LANG_TABLE_NAME', "Table name");
-define('_AD_BASE_LANG_TABLE_NUM', "Table Number");
-define('_AD_BASE_LANG_TABLE_PROPERTIES', "Table Properties");
-define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
-define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
-define('_AD_BASE_LANG_TEMPLATE', "Template");
-define('_AD_BASE_LANG_TEMPLATE_DESC', "Template description");
-define('_AD_BASE_LANG_TEMPLATE_ENGINE', "Template engine");
-define('_AD_BASE_LANG_TEMPLATE_FILE', "Template name");
-define('_AD_BASE_LANG_TEMPLATE_HAS_MAIN', "Use template");
-define('_AD_BASE_LANG_TEMPLATE_INFO', "Template information");
-define('_AD_BASE_LANG_TEMPLATE_KEY', "Template Key");
-define('_AD_BASE_LANG_THEME', "Theme");
-define('_AD_BASE_LANG_THEME_ADMIN', "Theme admin");
-define('_AD_BASE_LANG_TITLE', "Title");
-define('_AD_BASE_LANG_TOPPAGE', "Toppage");
-define('_AD_BASE_LANG_UNINSTALL', "Uninstall");
-define('_AD_BASE_LANG_UPDATE', "Update");
-define('_AD_BASE_LANG_VERSION', "Version");
-define('_AD_BASE_LANG_VISIBLE', "Visible");
-define('_AD_BASE_LANG_WEIGHT', "Weight");
-define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled");
-define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "Block {0} has been installed");
-define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
-define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?");
-define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished.");
-define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database.");
-define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}.");
-define('_AD_BASE_MESSAGE_INSERT_CONFIG', "Config {0} added.");
-define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{0}' module has been successful.");
-define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{0}' has been installed.");
-define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{0}' module has been successful.");
-define('_AD_BASE_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL', "Uninstallation of '{0}' block has been successful.");
-define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started.");
-define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{0}' module has been successful.");
-define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "<a href=\"index.php?action=BlockInstallList\">Install new blocks</a>, and set your site just the way you want it!<br/>If you want to have a block with free content that is not part of a module, simply <a href=\"index.php?action=CustomBlockEdit\">create a custom block</a> and write your message in it.");
-define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall a block, the configuration of the block isn't deleted. The block is simply removed from view. Therefore you can re-install the block easily because the installer remembers the last configuration.");
-define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is simply removed from view. You can re-install or delete it from the database from the <a href=\"index.php?action=BlockInstallList\">'install block' page</a>.");
-define('_AD_BASE_TIPS_IMGCAT_STORETYPE', "Please choose either the file or the database storage scheme for your image files. <strong>This setting cannot be changed later.</strong><br/>Do keep in mind that if you select the database as the storage destination, image files will be stored as BLOB type data which may not be suitable for backup purposes.");
-define('_AD_BASE_TIPS_INSTALL_BLOCK', "You can customize your site by installing your favorite blocks. You can edit each block's options when you install the block.");
-define('_AD_BASE_TIPS_THEME_ADMIN', "Choose the look of your site by clicking the 'select' button next to your favourite theme.<br/> Let your users choose their own favourite look and feel for your site.  Check the boxes to add a theme to the theme selection block. For more details, read the help.");
-define('_MD_AM_ADMINML', "Admin mail address");
-define('_MD_AM_ADMNOTSET', "Admin mail has not been set.");
-define('_MD_AM_ALLOWHTML', "Allow HTML tags in user comments?");
-define('_MD_AM_ALLOWIMAGE', "Allow users to display image files in posts?");
-define('_MD_AM_ALLOWREG', "Allow new user registration?");
-define('_MD_AM_ALLOWREGDSC', "Select yes to accept new user registration");
-define('_MD_AM_ALLOWTHEME', "Allow users to select theme?");
-define('_MD_AM_ALWDHTML', "HTML tags allowed in all posts.");
-define('_MD_AM_ANONNAME', "Username for anonymous users");
-define('_MD_AM_ANONPOST', "Anonymous user can post");
-define('_MD_AM_BADIPS', "Enter IP addresses that should be banned from the site.<br />Separate each with a <b>|</b>, case insensitive, regex enabled.");
-define('_MD_AM_BADIPSDSC', "^aaa.bbb.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa.bbb.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa.bbb.ccc will disallow visitors with an IP that contains aaa.bbb.ccc");
-define('_MD_AM_CENSOR', "Word Censoring Options");
-define('_MD_AM_CENSORRPLC', "Censored words will be replaced with:");
-define('_MD_AM_CENSORRPLCDSC', "Censored words will be replaced with the characters entered in this textbox");
-define('_MD_AM_CENSORWRD', "Words to censor");
-define('_MD_AM_CENSORWRDDSC', "Enter words that should be censored in user posts.<br />Separate each with a <b>|</b>, case insensitive.");
-define('_MD_AM_CHNGUTHEME', "Change all users' theme");
-define('_MD_AM_CLOSESITE', "Turn your site off?");
-define('_MD_AM_CLOSESITEDSC', "Select yes to turn your site off so that only users in selected groups have access to the site. ");
-define('_MD_AM_CLOSESITEOK', "Select groups that are allowed to access while the site is turned off.");
-define('_MD_AM_CLOSESITEOKDSC', "Users in the default webmasters group are always granted access.");
-define('_MD_AM_CLOSESITETXT', "Reason for turning off the site");
-define('_MD_AM_CLOSESITETXTDSC', "The text that is presented when the site is closed.");
-define('_MD_AM_COMMODE', "Default Comment Display Mode");
-define('_MD_AM_COMORDER', "Default Comments Display Order");
-define('_MD_AM_DEBUGMODE', "Debug mode");
-define('_MD_AM_DEBUGMODE0', "Off");
-define('_MD_AM_DEBUGMODE1', "PHP Debug");
-define('_MD_AM_DEBUGMODE2', "MySQL/Blocks Debug");
-define('_MD_AM_DEBUGMODE3', "Smarty Templates Debug");
-define('_MD_AM_DEBUGMODEDSC', "Several debug options. A running website should have this turned off.");
-define('_MD_AM_DEFAULTTZ', "Default timezone");
-define('_MD_AM_DOBADIPS', "Enable IP bans?");
-define('_MD_AM_DOBADIPSDSC', "Users from specified IP addresses will not be able to view your site");
-define('_MD_AM_DOCENSOR', "Enable censoring of unwanted words?");
-define('_MD_AM_DOCENSORDSC', "Words will be censored if this option is enabled. This option may be turned off for enhanced site speed.");
-define('_MD_AM_DONTCHNG', "Don't change!");
-define('_MD_AM_DOSEARCH', "Enable global searches?");
-define('_MD_AM_DOSEARCHDSC', "Allow searching for posts/items within your site.");
-define('_MD_AM_DTHEME', "Default theme");
-define('_MD_AM_DTPLSET', "Default template set");
-define('_MD_AM_GENERAL', "General Settings");
-define('_MD_AM_IFUCANT', "If you can't change the permissions you can edit the rest of this file by hand.");
-define('_MD_AM_INVLDMINPASS', "Invalid value for minimum length of password.");
-define('_MD_AM_INVLDSCOOK', "Invalid value for sessioncookie name.");
-define('_MD_AM_INVLDSEXP', "Invalid value for session expiration time.");
-define('_MD_AM_INVLDUCOOK', "Invalid value for usercookie name.");
-define('_MD_AM_IPBAN', "IP Banning");
-define('_MD_AM_LANGUAGE', "Default language");
-define('_MD_AM_LOADINGIMG', "Display loading... image?");
-define('_MD_AM_MAILER', "Mail Setup");
-define('_MD_AM_MAILER_', "");
-define('_MD_AM_MAILER_MAIL', "");
-define('_MD_AM_MAILER_SENDMAIL', "");
-define('_MD_AM_MAILERMETHOD', "Mail delivery method");
-define('_MD_AM_MAILERMETHODDESC', "Method used to deliver mail. Default is \"mail\", use others only if that makes trouble.");
-define('_MD_AM_MAILFROM', "FROM address");
-define('_MD_AM_MAILFROMDESC', "");
-define('_MD_AM_MAILFROMNAME', "FROM name");
-define('_MD_AM_MAILFROMNAMEDESC', "");
-define('_MD_AM_MAILFROMUID', "FROM user");
-define('_MD_AM_MAILFROMUIDDESC', "When the system sends a private message, which user should appear to have sent it?");
-define('_MD_AM_METAFOOTER', "Metadata");
-define('_MD_AM_MINSEARCH', "Minimum keyword length");
-define('_MD_AM_MINSEARCHDSC', "Enter the minimum keyword length that users are required to enter to perform search");
-define('_MD_AM_MODCACHE', "Module-wide Cache");
-define('_MD_AM_MODCACHEDSC', "Caches module contents for a specified amount of time to enhance performance. Setting module-wide cache will override module item level cache if any.");
-define('_MD_AM_MODCONFIG', "Module Config Options");
-define('_MD_AM_MYIP', "Your IP address");
-define('_MD_AM_MYIPDSC', "This IP will not counted as impression for banners");
-define('_MD_AM_NO', "No");
-define('_MD_AM_NOMODULE', "There is no module that can be cached.");
-define('_MD_AM_NONE', "None");
-define('_MD_AM_NOTIFYTO', "Select group to which new user notification mail will be sent");
-define('_MD_AM_PERMADDNG', "Could not add %s permission to %s for group %s");
-define('_MD_AM_PERMADDNGP', "All parent items must be selected.");
-define('_MD_AM_PERMADDOK', "Added %s permission to %s for group %s");
-define('_MD_AM_PERMRESETNG', "Could not reset group permission for module %s");
-define('_MD_AM_PREFMAIN', "Preferences Main");
-define('_MD_AM_REMEMBER', "Remember to chmod 666 this file in order to let the system write to it properly.");
-define('_MD_AM_SEARCH', "Search Options");
-define('_MD_AM_SENDMAILPATH', "Path to sendmail");
-define('_MD_AM_SENDMAILPATHDESC', "Path to the sendmail program (or substitute) on the webserver.");
-define('_MD_AM_SERVERTZ', "Server timezone");
-define('_MD_AM_SESSEXPIRE', "Session expiration");
-define('_MD_AM_SESSEXPIREDSC', "Maximum duration of session idle time in minutes (Valid only when 'use custom session' is enabled. Works only when you are using PHP4.2.0 or later.)");
-define('_MD_AM_SESSNAME', "Session name");
-define('_MD_AM_SESSNAMEDSC', "The name of session (Valid only when 'use custom session' is enabled)");
-define('_MD_AM_SITECACHE', "Site-wide Cache");
-define('_MD_AM_SITECACHEDSC', "Caches whole contents of the site for a specified amount of time to enhance performance. Setting site-wide cache will override module-level cache, block-level cache, and module item level cache if any.");
-define('_MD_AM_SITENAME', "Site name");
-define('_MD_AM_SITEPREF', "Site Preferences");
-define('_MD_AM_SLOGAN', "Slogan for your site");
-define('_MD_AM_SMTPHOST', "SMTP host(s)");
-define('_MD_AM_SMTPHOSTDESC', "List of SMTP servers to try to connect to.");
-define('_MD_AM_SMTPPASS', "SMTPAuth password");
-define('_MD_AM_SMTPPASSDESC', "Password to connect to an SMTP host with SMTPAuth.");
-define('_MD_AM_SMTPUSER', "SMTPAuth username");
-define('_MD_AM_SMTPUSERDESC', "Username to connect to an SMTP host with SMTPAuth.");
-define('_MD_AM_SSLLINK', "URL where SSL login page is located");
-define('_MD_AM_SSLPOST', "SSL Post variable name");
-define('_MD_AM_SSLPOSTDSC', "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess.");
-define('_MD_AM_STARTPAGE', "Module for your start page");
-define('_MD_AM_THEMEFILE', "Update module template .html files from themes/your theme/templates directory?");
-define('_MD_AM_THEMEFILEDSC', "If this option is enabled, module template .html files will be updated automatically if there are newer files under the themes/your theme/templates directory for the current theme. This should be turned off once the site goes public.");
-define('_MD_AM_THEMEOK', "Selectable themes");
-define('_MD_AM_THEMEOKDSC', "Choose themes that users can select as their default theme");
-define('_MD_AM_THEMESET', "Theme Set");
-define('_MD_AM_USEGZIP', "Use gzip compression?");
-define('_MD_AM_USEMYSESS', "Use custom session");
-define('_MD_AM_USEMYSESSDSC', "Select yes to customise session related values.");
-define('_MD_AM_USERSETTINGS', "User Settings");
-define('_MD_AM_USESSL', "Use SSL for login?");
-define('_MD_AM_YES', "Yes");
-
-?>
Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.26.2.2 xoops2jp/html/modules/base/language/english/main.php:removed
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.26.2.2	Sat Oct 14 18:05:50 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Tue Nov  7 17:04:34 2006
@@ -1,55 +0,0 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed");
-define('_MD_BASE_ERROR_EMAIL', "{0} is an invalid email address");
-define('_MD_BASE_ERROR_INCORRECTLOGIN', "Invalid Login!");
-define('_MD_BASE_ERROR_MASK', "{0} format is invalid.");
-define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
-define('_MD_BASE_ERROR_PERMISSION', "Permission denied");
-define('_MD_BASE_ERROR_REQUIRED', "{0} is required.");
-define('_MD_BASE_ERROR_SEARCH_NOT_ENABLED', "The search isn't enabled.");
-define('_MD_BASE_ERROR_SEARCH_QUERY_REQUIRED', "Input keywords of minimum length.");
-define('_MD_BASE_ERROR_YOU_MUST_UPLOAD', "You must upload an image file.");
-define('_MD_BASE_FORMAT_SEARCH_SEPARATOR', "/[\s,]+/");
-define('_MD_BASE_LANG_ANDOR', "AndOr");
-define('_MD_BASE_LANG_CLICKASMILIE', "Click a smiley to insert it into your message.");
-define('_MD_BASE_LANG_CODE', "Code");
-define('_MD_BASE_LANG_COM_EXPARAMS', "Comment extra parameters");
-define('_MD_BASE_LANG_COM_ICON', "Icon");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "Item ID");
-define('_MD_BASE_LANG_COM_MODID', "Module ID");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_TEXT', "Comment");
-define('_MD_BASE_LANG_COM_TITLE', "Title");
-define('_MD_BASE_LANG_COMMENT_RULE', "Comment rules");
-define('_MD_BASE_LANG_DOBR', "Insert line-break automatically");
-define('_MD_BASE_LANG_DOHTML', "Enable HTML tags");
-define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
-define('_MD_BASE_LANG_DOXCODE', "Enable XOOPS code");
-define('_MD_BASE_LANG_EMOTION', "Emoticon");
-define('_MD_BASE_LANG_ERROR', "error");
-define('_MD_BASE_LANG_FMAIL', "Friend's Email");
-define('_MD_BASE_LANG_FNAME', "Friend's Name");
-define('_MD_BASE_LANG_IMAGE', "image");
-define('_MD_BASE_LANG_IMAGE_FILE', "Image file");
-define('_MD_BASE_LANG_IMAGE_MIMETYPE', "Image mimetype");
-define('_MD_BASE_LANG_IMAGE_NICENAME', "Image nicename");
-define('_MD_BASE_LANG_IMAGE_POSITION', "Image position");
-define('_MD_BASE_LANG_IMAGE_UPLOAD', "Image upload");
-define('_MD_BASE_LANG_MID', "mid");
-define('_MD_BASE_LANG_OPTION', "Option");
-define('_MD_BASE_LANG_POST', "Post");
-define('_MD_BASE_LANG_PREV_PAGE', "Prev. page");
-define('_MD_BASE_LANG_SHOW_ALL', "Show all");
-define('_MD_BASE_LANG_SMILIES', "Smilies");
-define('_MD_BASE_LANG_UID', "uid");
-define('_MD_BASE_LANG_YMAIL', "Your Email");
-define('_MD_BASE_LANG_YNAME', "Your Name");
-define('_MD_BASE_MESSAGE_LOGGEDOUT', "You are now logged out.");
-define('_MD_BASE_MESSAGE_LOGIN_SUCCESS', "Login successful");
-define('_MD_BASE_MESSAGE_THANKYOUFORVISIT', "Thank you for your visit to our site!");
-
-?>
Index: xoops2jp/html/modules/base/language/english/index.html
diff -u xoops2jp/html/modules/base/language/english/index.html:1.1.2.1 xoops2jp/html/modules/base/language/english/index.html:removed
--- xoops2jp/html/modules/base/language/english/index.html:1.1.2.1	Mon Mar 27 11:41:52 2006
+++ xoops2jp/html/modules/base/language/english/index.html	Tue Nov  7 17:04:34 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:34 +0900
Subject: [xoops-cvslog 5673] CVS update: xoops2jp/html/modules/base
Message-ID: <20061107080434.EC4142AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/index.html
diff -u xoops2jp/html/modules/base/index.html:1.1.4.1 xoops2jp/html/modules/base/index.html:removed
--- xoops2jp/html/modules/base/index.html:1.1.4.1	Wed Oct 19 17:04:18 2005
+++ xoops2jp/html/modules/base/index.html	Tue Nov  7 17:04:34 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/xoops_version.php
diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.31.2.1 xoops2jp/html/modules/base/xoops_version.php:removed
--- xoops2jp/html/modules/base/xoops_version.php:1.1.2.31.2.1	Sat Oct 14 18:28:02 2006
+++ xoops2jp/html/modules/base/xoops_version.php	Tue Nov  7 17:04:34 2006
@@ -1,209 +0,0 @@
-<?php
-// $Id: xoops_version.php,v 1.1.2.31.2.1 2006/10/14 09:28:02 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//              XOOPSCube - PHP Content Management System                    //
-//                  Copyright (c) 2005 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-// ------------------------------------------------------------------------- //
-
-$modversion['name'] = _MI_BASE_NAME;
-$modversion['version'] = 1.00;
-$modversion['description'] = _MI_BASE_NAME_DESC;
-$modversion['author'] = "";
-$modversion['credits'] = "The XOOPS Project";
-$modversion['help'] = "help.html";
-$modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 1;
-$modversion['image'] = "images/base.gif";
-$modversion['dirname'] = "base";
-
-$modversion['cube_style'] = true;
-
-//
-// Database Setting
-//
-
-// Admin things
-$modversion['hasAdmin'] = 1;
-$modversion['adminindex'] = "admin/index.php";
-$modversion['adminmenu'] = "admin/menu.php";
-
-// Templates
-$modversion['templates'][1]['file'] = 'legacy_misc_ssllogin.html';
-$modversion['templates'][1]['description'] = '';
-$modversion['templates'][2]['file'] = 'legacy_misc_smilies.html';
-$modversion['templates'][2]['description'] = '';
-$modversion['templates'][3]['file'] = 'legacy_search_form.html';
-$modversion['templates'][3]['description'] = '';
-$modversion['templates'][4]['file'] = 'legacy_comment_edit.html';
-$modversion['templates'][4]['description'] = '';
-$modversion['templates'][5]['file'] = 'legacy_xoops_result.html';
-$modversion['templates'][5]['description'] = '';
-$modversion['templates'][6]['file'] = 'legacy_xoops_error.html';
-$modversion['templates'][6]['description'] = '';
-$modversion['templates'][7]['file'] = 'legacy_xoops_confirm.html';
-$modversion['templates'][7]['description'] = '';
-$modversion['templates'][8]['file'] = 'legacy_comment_navi.html';
-$modversion['templates'][8]['description'] = '';
-$modversion['templates'][9]['file'] = 'legacy_comment.html';
-$modversion['templates'][9]['description'] = '';
-$modversion['templates'][10]['file'] = 'legacy_comments_flat.html';
-$modversion['templates'][10]['description'] = '';
-$modversion['templates'][11]['file'] = 'legacy_comments_nest.html';
-$modversion['templates'][11]['description'] = '';
-$modversion['templates'][12]['file'] = 'legacy_comments_thread.html';
-$modversion['templates'][12]['description'] = '';
-$modversion['templates'][13]['file'] = 'legacy_notification_select.html';
-$modversion['templates'][13]['description'] = '';
-$modversion['templates'][14]['file'] = 'legacy_dummy.html';
-$modversion['templates'][14]['description'] = '';
-$modversion['templates'][15]['file'] = 'legacy_redirect.html';
-$modversion['templates'][15]['description'] = '';
-$modversion['templates'][16]['file'] = 'legacy_image_list.html';
-$modversion['templates'][16]['description'] = '';
-$modversion['templates'][17]['file'] = 'legacy_image_upload.html';
-$modversion['templates'][17]['description'] = '';
-$modversion['templates'][18]['file'] = 'legacy_rss.html';
-$modversion['templates'][18]['description'] = '';
-$modversion['templates'][19]['file'] = 'legacy_search_results.html';
-$modversion['templates'][19]['description'] = '';
-$modversion['templates'][20]['file'] = 'legacy_search_showall.html';
-$modversion['templates'][20]['description'] = '';
-$modversion['templates'][21]['file'] = 'legacy_search_showallbyuser.html';
-$modversion['templates'][21]['description'] = '';
-$modversion['templates'][22]['file'] = 'legacy_notification_list.html';
-$modversion['templates'][22]['description'] = '';
-$modversion['templates'][23]['file'] = 'legacy_notification_delete.html';
-$modversion['templates'][23]['description'] = '';
-$modversion['templates'][24]['file'] = 'legacy_notification_select_form.html';
-$modversion['templates'][24]['description'] = '';
-$modversion['templates'][25]['file'] = 'legacy_misc_friend.html';
-$modversion['templates'][25]['description'] = '';
-$modversion['templates'][26]['file'] = 'legacy_misc_friend_success.html';
-$modversion['templates'][26]['description'] = '';
-$modversion['templates'][27]['file'] = 'legacy_misc_friend_error.html';
-$modversion['templates'][27]['description'] = '';
-$modversion['templates'][28]['file'] = 'legacy_xoopsform_checkbox.html';
-$modversion['templates'][28]['description'] = 'The embedded template for the checkbox of the xoopsform.';
-$modversion['templates'][29]['file'] = 'legacy_xoopsform_button.html';
-$modversion['templates'][29]['description'] = 'The embedded template for the button of the xoopsform.';
-$modversion['templates'][30]['file'] = 'legacy_xoopsform_text.html';
-$modversion['templates'][30]['description'] = 'The embedded template for the text of the xoopsform.';
-$modversion['templates'][31]['file'] = 'legacy_xoopsform_select.html';
-$modversion['templates'][31]['description'] = 'The embedded template for the select of the xoopsform.';
-$modversion['templates'][32]['file'] = 'legacy_xoopsform_file.html';
-$modversion['templates'][32]['description'] = 'The embedded template for the file of the xoopsform.';
-$modversion['templates'][33]['file'] = 'legacy_xoopsform_hidden.html';
-$modversion['templates'][33]['description'] = 'The embedded template for the hidden of the xoopsform.';
-$modversion['templates'][34]['file'] = 'legacy_xoopsform_radio.html';
-$modversion['templates'][34]['description'] = 'The embedded template for the hidden of the xoopsform.';
-$modversion['templates'][35]['file'] = 'legacy_xoopsform_label.html';
-$modversion['templates'][35]['description'] = 'The embedded template for the label of the xoopsform.';
-$modversion['templates'][36]['file'] = 'legacy_xoopsform_password.html';
-$modversion['templates'][36]['description'] = 'The embedded template for the password of the xoopsform.';
-$modversion['templates'][37]['file'] = 'legacy_xoopsform_textarea.html';
-$modversion['templates'][37]['description'] = 'The embedded template for the textarea of the xoopsform.';
-$modversion['templates'][38]['file'] = 'legacy_xoopsform_simpleform.html';
-$modversion['templates'][38]['description'] = 'The embedded template for the simple form of the xoopsform.';
-$modversion['templates'][39]['file'] = 'legacy_xoopsform_tableform.html';
-$modversion['templates'][39]['description'] = 'The embedded template for the table form of the xoopsform.';
-$modversion['templates'][40]['file'] = 'legacy_xoopsform_themeform.html';
-$modversion['templates'][40]['description'] = 'The embedded template for the theme form of the xoopsform.';
-$modversion['templates'][41]['file'] = 'legacy_xoopsform_elementtray.html';
-$modversion['templates'][41]['description'] = 'The embedded template for the element tray of the xoopsform.';
-$modversion['templates'][42]['file'] = 'legacy_xoopsform_textdateselect.html';
-$modversion['templates'][42]['description'] = 'The embedded template for the text date select of the xoopsform.';
-$modversion['templates'][43]['file'] = 'legacy_xoopsform_dhtmltextarea.html';
-$modversion['templates'][43]['description'] = 'The embedded template for the dhtml text area of the xoopsform.';
-$modversion['templates'][44]['file'] = 'legacy_xoopsform_opt_smileys.html';
-$modversion['templates'][44]['description'] = 'The embedded template for the smiles list of the dhtml text area of the xoopsform.';
-$modversion['templates'][45]['file'] = 'legacy_xoopsform_opt_validationjs.html';
-$modversion['templates'][45]['description'] = 'The embedded template for the javascriot of the the xoopsform to validation the input value.';
-$modversion['templates'][46]['file'] = 'legacy_xoopsform_grouppermform.html';
-$modversion['templates'][46]['description'] = 'The embedded template for the groupperm form of the the xoopsform.';
-
-// Menu
-$modversion['hasMain'] = 0;
-
-// Blocks
-$modversion['blocks'][1]['file'] = "legacy_mainmenu.php";
-$modversion['blocks'][1]['name'] = _MI_BASE_BLOCK_MAINMENU_NAME;
-$modversion['blocks'][1]['description'] = _MI_BASE_BLOCK_MAINMENU_DESC;
-$modversion['blocks'][1]['show_func'] = "b_legacy_mainmenu_show";
-$modversion['blocks'][1]['template'] = 'legacy_block_mainmenu.html';
-$modversion['blocks'][1]['visible_any'] = true;
-$modversion['blocks'][1]['show_all_module'] = true;
-
-$modversion['blocks'][2]['file'] = "legacy_usermenu.php";
-$modversion['blocks'][2]['name'] = _MI_BASE_BLOCK_USERMENU_NAME;
-$modversion['blocks'][2]['description'] = _MI_BASE_BLOCK_USERMENU_DESC;
-$modversion['blocks'][2]['show_func'] = "b_legacy_usermenu_show";
-$modversion['blocks'][2]['template'] = 'legacy_block_usermenu.html';
-$modversion['blocks'][2]['visible_any'] = true;
-$modversion['blocks'][2]['show_all_module'] = true;
-
-$modversion['blocks'][3]['file'] = "legacy_search.php";
-$modversion['blocks'][3]['name'] = _MI_BASE_BLOCK_SEARCH_NAME;
-$modversion['blocks'][3]['description'] = _MI_BASE_BLOCK_SEARCH_DESC;
-$modversion['blocks'][3]['show_func'] = "b_legacy_search_show";
-$modversion['blocks'][3]['template'] = 'legacy_block_search.html';
-$modversion['blocks'][3]['show_all_module'] = true;
-
-$modversion['blocks'][4]['file'] = "legacy_waiting.php";
-$modversion['blocks'][4]['name'] = _MI_BASE_BLOCK_WAITING_NAME;
-$modversion['blocks'][4]['description'] = _MI_BASE_BLOCK_WAITING_DESC;
-$modversion['blocks'][4]['show_func'] = "b_legacy_waiting_show";
-$modversion['blocks'][4]['template'] = 'legacy_block_waiting.html';
-
-$modversion['blocks'][5]['file'] = "legacy_siteinfo.php";
-$modversion['blocks'][5]['name'] = _MI_BASE_BLOCK_SITEINFO_NAME;
-$modversion['blocks'][5]['description'] = _MI_BASE_BLOCK_SITEINFO_DESC;
-$modversion['blocks'][5]['show_func'] = "b_legacy_siteinfo_show";
-$modversion['blocks'][5]['edit_func'] = "b_legacy_siteinfo_edit";
-$modversion['blocks'][5]['options'] = "320|190|s_poweredby.gif|1";
-$modversion['blocks'][5]['template'] = 'legacy_block_siteinfo.html';
-$modversion['blocks'][5]['show_all_module'] = true;
-
-$modversion['blocks'][6]['file'] = "legacy_comments.php";
-$modversion['blocks'][6]['name'] = _MI_BASE_BLOCK_COMMENTS_NAME;
-$modversion['blocks'][6]['description'] = _MI_BASE_BLOCK_COMMENTS_DESC;
-$modversion['blocks'][6]['show_func'] = "b_legacy_comments_show";
-$modversion['blocks'][6]['options'] = "10";
-$modversion['blocks'][6]['edit_func'] = "b_legacy_comments_edit";
-$modversion['blocks'][6]['template'] = 'legacy_block_comments.html';
-$modversion['blocks'][6]['show_all_module'] = true;
-
-$modversion['blocks'][7]['file'] = "legacy_notification.php";
-$modversion['blocks'][7]['name'] = _MI_BASE_BLOCK_NOTIFICATION_NAME;
-$modversion['blocks'][7]['description'] = _MI_BASE_BLOCK_NOTIFICATION_DESC;
-$modversion['blocks'][7]['show_func'] = "b_legacy_notification_show";
-$modversion['blocks'][7]['template'] = 'legacy_block_notification.html';
-
-$modversion['blocks'][8]['file'] = "legacy_themes.php";
-$modversion['blocks'][8]['name'] = _MI_BASE_BLOCK_THEMES_NAME;
-$modversion['blocks'][8]['description'] = _MI_BASE_BLOCK_THEMES_DESC;
-$modversion['blocks'][8]['show_func'] = "b_legacy_themes_show";
-$modversion['blocks'][8]['options'] = "0|80";
-$modversion['blocks'][8]['edit_func'] = "b_legacy_themes_edit";
-$modversion['blocks'][8]['template'] = 'legacy_block_themes.html';
-
-?>
Index: xoops2jp/html/modules/base/index.php
diff -u xoops2jp/html/modules/base/index.php:1.1.2.1.2.2 xoops2jp/html/modules/base/index.php:removed
--- xoops2jp/html/modules/base/index.php:1.1.2.1.2.2	Tue Oct 10 15:12:08 2006
+++ xoops2jp/html/modules/base/index.php	Tue Nov  7 17:04:34 2006
@@ -1,20 +0,0 @@
-<?php
-
-require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH . "/header.php";
-require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
-
-$root =& XCube_Root::getSingleton();
-
-$actionName = isset($_GET['action']) ? trim($_GET['action']) : "Default";
-
-$moduleRunner =& new Legacy_ActionFrame(false);
-$moduleRunner->setActionName($actionName);
-
-$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
-$root->mController->execute();
-
-require_once XOOPS_ROOT_PATH . "/footer.php";
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:35 +0900
Subject: [xoops-cvslog 5674] CVS update:
	xoops2jp/html/modules/base/preload/Primary
Message-ID: <20061107080435.21A342AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.7.2.1 xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:removed
--- xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.7.2.1	Thu Sep 28 19:24:35 2006
+++ xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php	Tue Nov  7 17:04:35 2006
@@ -1,53 +0,0 @@
-<?php
-
-if (!defined("XOOPS_ROOT_PATH")) exit();
-
-class Legacy_NuSoapLoader extends XCube_ActionFilter
-{
-	function preFilter()
-	{
-		$this->mRoot->mDelegateManager->add('XCube_ServiceManager.CreateClient', 'Legacy_NuSoapLoader::createClient');
-		$this->mRoot->mDelegateManager->add('XCube_ServiceManager.CreateServer', 'Legacy_NuSoapLoader::createServer');
-	}
-	
-	/**
-	 * @static
-	 */
-	function createClient(&$client, $service)
-	{
-		if (is_object($client)) {
-			return;
-		}
-
-		$root =& XCube_Root::getSingleton();
-		
-		if (is_object($service) && is_a($service, 'XCube_Service')) {
-			$client = new XCube_ServiceClient($service);
-		}
-		else {
-			require_once XOOPS_ROOT_PATH . "/modules/base/lib/nusoap/nusoap.php";
-			require_once XOOPS_ROOT_PATH . "/modules/base/lib/ShadePlus/SoapClient.class.php";
-			
-			$client = new Shade_SoapClient($service);
-		}
-	}
-
-	/**
-	 * @static
-	 */
-	function createServer(&$server, $service)
-	{
-		if (is_object($server) || !is_object($service)) {
-			return;
-		}
-		
-		require_once XOOPS_ROOT_PATH . "/modules/base/lib/nusoap/nusoap.php";
-		require_once XOOPS_ROOT_PATH . "/modules/base/lib/ShadePlus/ServiceServer.class.php";
-		require_once XOOPS_ROOT_PATH . "/modules/base/lib/ShadeSoap/NusoapServer.class.php";
-		
-		$server = new ShadePlus_ServiceServer($service);
-		$server->prepare();
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.4 xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:removed
--- xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.4	Sun Oct  8 21:15:23 2006
+++ xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php	Tue Nov  7 17:04:35 2006
@@ -1,211 +0,0 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: SiteClose.class.php,v 1.1.2.6.2.4 2006/10/08 12:15:23 nobunobu Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * The action filter for the site close procedure.
- */
-class Legacy_SiteClose extends XCube_ActionFilter
-{
-	function preBlockFilter()
-	{
-		if (($this->mRoot->mContext->getXoopsConfig('closesite') == 1) || is_array(Legacy_Utils::checkSystemModules())) {
-			$this->mController->mSetupUser->add("Legacy_SiteClose::callbackSetupUser", XCUBE_DELEGATE_PRIORITY_FINAL);
-			$this->mRoot->mDelegateManager->add("Site.CheckLogin.Success", array(&$this, "callbackCheckLoginSuccess"));
-		}
-	}
-
-	/**
-	 * Checks whether the site is closed now, and whether all of must modules
-	 * have been installed. This function is called through delegates.
-	 * @var XoopsUser &$xoopsUser
-	 * @see preBlockFilter()
-	 */
-	function callbackSetupUser(&$principal, &$controller, &$context)
-	{
-		$retArray = Legacy_Utils::checkSystemModules();
-		$accessAllowFlag = false;
-		$xoopsConfig = $controller->mRoot->mContext->getXoopsConfig();
-		
-		if (!empty($_POST['xoops_login'])) {
-			if (is_array($retArray)) {
-				define('XOOPS_CPFUNC_LOADED', 1);
-			}
-
-			$controller->checkLogin();
-			return;
-		} elseif (is_object($context->mXoopsUser)) {
-			foreach ($context->mXoopsUser->getGroups() as $group) {
-				if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
-					$accessAllowFlag = true;
-					break;
-				}
-			}
-		}
-		
-		// @todo Devide following lines to another preload file
-		if ($accessAllowFlag && is_array($retArray)) {
-			if (in_array(XOOPS_GROUP_ADMIN, $context->mXoopsUser->getGroups())) {
-				$GLOBALS['xoopsUser'] = $context->mXoopsUser;
-				if (!empty($_POST['cube_module_install'])) { //@todo use Ticket
-					require_once XOOPS_BASE_PATH . "/admin/class/ModuleInstaller.class.php";
-					if (isset($_POST['uninstalled_modules']) && is_array($_POST['uninstalled_modules'])){
-						foreach ($_POST['uninstalled_modules'] as $module) {
-							$module = basename($module);
-							if (in_array($module, $retArray['uninstalled'])) {
-								$installer =& new Legacy_ModuleInstaller($module);
-								$installer->execute();
-							}
-						}
-					}
-					if (isset($_POST['disabled_modules']) && is_array($_POST['disabled_modules'])){
-						$moduleHandler =& xoops_gethandler('module');
-						foreach ($_POST['disabled_modules'] as $module) {
-							$module = basename($module);
-							if (in_array($module, $retArray['disabled'])) {
-								if ($moduleObject =& $moduleHandler->getByDirname($module)) {
-									$moduleObject->setVar('isactive', 1);
-									$moduleHandler->insert($moduleObject);
-								}
-							}
-						}
-					}
-					if (isset($_POST['option_modules']) && is_array($_POST['option_modules']) ){
-						$handler =& xoops_getmodulehandler('non_installation_module', 'base');
-						$objects = $handler->getObjects();
-						$optionModules = array();
-						foreach ($objects as $module) {
-							if (!in_array($module->get('dirname'), $retArray['uninstalled'])) {
-								$optionModules[] = $module->get('dirname');
-							}
-						}
-						foreach ($_POST['option_modules'] as $module) {
-							$module = basename($module);
-							if (in_array($module, $optionModules)) {
-								$installer =& new Legacy_ModuleInstaller($module);
-								$installer->execute();
-							}
-						}
-					}
-					$controller->executeRedirect(XOOPS_URL . '/', 1);
-				}
-				elseif (!empty($_GET['cube_module_uninstall'])) {
-					require_once XOOPS_ROOT_PATH . '/class/template.php';
-					$xoopsTpl =& new XoopsTpl();
-					$xoopsTpl->assign('cube_module_uninstall', htmlspecialchars($_GET['cube_module_uninstall'],ENT_QUOTES));
-					$xoopsTpl->assign( array(
-								   'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
-								   'xoops_themecss' => xoops_getcss(),
-								   'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
-								   ));
-					///< @todo filebase template with absolute file path
-					$xoopsTpl->compile_check = true;
-					$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/base/templates/legacy_uninstall_modules.html');
-					exit();
-				}
-				elseif (!empty($_POST['cube_module_uninstallok'])) { //@todo use Ticket
-					require_once XOOPS_BASE_PATH . "/admin/class/ModuleUninstaller.class.php";
-					$module = basename($_POST['cube_module_uninstallok']);
-					if (in_array($module, $retArray['disabled'])) {
-						$uninstaller =& new Legacy_ModuleUninstaller($module);
-						$uninstaller->execute();
-					}
-					$controller->executeRedirect(XOOPS_URL . '/',1);
-				}
-				else {
-					$handler =& xoops_getmodulehandler('non_installation_module','base');
-					$objects = $handler->getObjects();
-					$optionModules = array();
-					foreach ($objects as $module) {
-						$dirname = $module->getVar('dirname');
-						if (!in_array($dirname, $retArray['uninstalled'])) {
-							$optionModule['dirname']  = $dirname;
-							if (in_array($dirname, $retArray['recommended'])) {
-								$optionModule['checked']  = 'checked="checked"';
-								$optionModule['desc']  = _SYS_RECOMMENDED_MODULES;
-							} else {
-								$optionModule['checked']  = '';
-								$optionModule['desc']  = _SYS_OPTION_MODULES;
-							}
-							$optionModules[] = $optionModule;
-						}
-					}
-					require_once XOOPS_ROOT_PATH . '/class/template.php';
-					$xoopsTpl =& new XoopsTpl();
-					$xoopsTpl->assign('uninstalled',$retArray['uninstalled']);
-					$xoopsTpl->assign('disabled',$retArray['disabled']);
-					$xoopsTpl->assign('option',$optionModules);
-					$xoopsTpl->assign(array(
-								   'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
-								   'xoops_themecss' => xoops_getcss(),
-								   'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/'
-								   ));
-					///< @todo filebase template with absolute file path
-					$xoopsTpl->compile_check = true;
-					$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/base/templates/legacy_install_modules.html');
-					exit();
-				}
-		   } else {
-				$accessAllowFlag = false;
-		   }
-		}
-
-		if (!$accessAllowFlag) {
-			require_once XOOPS_ROOT_PATH . '/class/template.php';
-			$xoopsTpl =& new XoopsTpl();
-			$xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']),
-									   'xoops_themecss' => xoops_getcss(),
-									   'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/',
-									   'lang_login' => _LOGIN,
-									   'lang_username' => _USERNAME,
-									   'lang_password' => _PASSWORD,
-									   'lang_siteclosemsg' => $xoopsConfig['closesite_text']
-									   ));
-									   
-			$xoopsTpl->compile_check = true;
-			
-			// @todo filebase template with absolute file path
-			$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/base/templates/legacy_site_closed.html');
-			exit();
-		}
-	}
-	
-	/**
-	 * When the user logs in successfully, checks whether the user belongs to
-	 * the special group which is allowed to login. This function is called
-	 * through delegates.
-	 * @var XoopsUser &$xoopsUser
-	 * @see preBlockFilter
-	 */
-	function callbackCheckLoginSuccess(&$xoopsUser)
-	{
-		//
-		// This check is not needed. :)
-		//
-		if (!is_object($xoopsUser)) {
-			return;
-		}
-
-		// Site close
-		if ($this->mRoot->mContext->getXoopsConfig('closesite')) {
-			$accessAllowed = false;
-
-			foreach ($xoopsUser->getGroups() as $group) {
-				if (in_array($group, $this->mRoot->mContext->getXoopsConfig('closesite_okgrp')) || ($group == XOOPS_GROUP_ADMIN)) {
-					$accessAllowed = true;
-					break;
-				}
-			}
-
-			if (!$accessAllowed) {
-				$this->mController->redirectHeader(XOOPS_URL . '/', 1, _NOPERM);
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:35 +0900
Subject: [xoops-cvslog 5675] CVS update:
	xoops2jp/html/modules/base/admin/theme/design
Message-ID: <20061107080435.517AA2AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/design/index.html
diff -u xoops2jp/html/modules/base/admin/theme/design/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/theme/design/index.html:removed
--- xoops2jp/html/modules/base/admin/theme/design/index.html:1.1.2.1	Mon Mar 27 11:41:56 2006
+++ xoops2jp/html/modules/base/admin/theme/design/index.html	Tue Nov  7 17:04:35 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/theme/design/menulist.gif
Index: xoops2jp/html/modules/base/admin/theme/design/logo.gif
Index: xoops2jp/html/modules/base/admin/theme/design/buttonbg.gif
Index: xoops2jp/html/modules/base/admin/theme/design/navy.gif
Index: xoops2jp/html/modules/base/admin/theme/design/orange.gif

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:35 +0900
Subject: [xoops-cvslog 5676] CVS update:
	xoops2jp/html/modules/base/admin/templates/blocks
Message-ID: <20061107080435.863F92AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.16.2.1 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:removed
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.16.2.1	Sat Oct 14 02:51:06 2006
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_sidemenu.html	Tue Nov  7 17:04:35 2006
@@ -1,24 +0,0 @@
-<{foreach item=module from=$modules}>
-
-  <{if $module->hasAdminIndex()}>
-    <div id="t<{$module->mXoopsModule->getShow('mid')}>" class="head">
-      <a href="javascript:void(0)" onclick="ccToggle(<{$module->mXoopsModule->getShow('mid')}>)"><img src="<{"design/navy.gif"|theme}>" alt="" id="i<{$module->mXoopsModule->getShow('mid')}>" /></a>
-      <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a>
-    </div>
-
-    <div id="c<{$module->mXoopsModule->getShow('mid')}>" class="submenu">
-      <ul>
-      <{if $module->getAdminMenu()}>
-        <{foreach item=menu from=$module->getAdminMenu()}>
-          <{if $menu.show !== false}>
-            <li><a href="<{$menu.link|escape}>"><{$menu.title|escape}></a></li>
-          <{/if}>
-        <{/foreach}>
-      <{else}>
-        <li><{$smarty.const._AD_BASE_LANG_NO_SETTING}></li>
-      <{/if}>
-      </ul>
-    </div>
-  <{/if}>
-
-<{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:removed
--- xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html:1.1.2.2	Wed Dec 28 00:02:24 2005
+++ xoops2jp/html/modules/base/admin/templates/blocks/legacy_admin_block_actionsearch.html	Tue Nov  7 17:04:35 2006
@@ -1,4 +0,0 @@
-<form action="<{$xoops_url}>/modules/base/admin/index.php?action=actSearch" method="post">
-  <input type="text" name="keywords"/>
-  <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
-</form>
Index: xoops2jp/html/modules/base/admin/templates/blocks/index.html
diff -u xoops2jp/html/modules/base/admin/templates/blocks/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blocks/index.html:removed
--- xoops2jp/html/modules/base/admin/templates/blocks/index.html:1.1.2.1	Mon Mar 27 11:41:49 2006
+++ xoops2jp/html/modules/base/admin/templates/blocks/index.html	Tue Nov  7 17:04:35 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:35 +0900
Subject: [xoops-cvslog 5677] CVS update:
	xoops2jp/html/modules/base/admin/templates/stylesheets
Message-ID: <20061107080435.C139F2AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/stylesheets/module.css
diff -u xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.16 xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:removed
--- xoops2jp/html/modules/base/admin/templates/stylesheets/module.css:1.1.2.16	Wed Sep 20 11:55:58 2006
+++ xoops2jp/html/modules/base/admin/templates/stylesheets/module.css	Tue Nov  7 17:04:35 2006
@@ -1,123 +0,0 @@
-/* Action Search */
-.base_actionsearch_form {
-	text-align:center;
-	margin:20px;
-}
-ul.base_actionsearch_records {
-	margin:5px 10px;
-}
-.base_actionsearch_records li , .base_actionsearch_records li a , .base_actionsearch_records li a:visited {
-	font-weight:bold;
-	padding:3px;
-}
-.base_actionsearch_records_desc {
-	font-weight:normal;
-	font-style:italic;
-	color:#666666;
-	padding:2px 10px 5px 10px;
-}
-/* block list */
-.base_blocktype_module {
-
-}
-.base_blocktype_custom {
-	color:#0000cc;
-}
-.base_blockside {
-	width:135px;
-	white-space: nowrap;
-}
-.base_blocksideInput{
-	float:left;
-	border:1px solid #333333;
-	padding:1px;
-}
-
-.base_blockside_separator {
-	float:left;
-}
-
-/*  block admin for FireFox */
-input[type="radio"] {
-	margin:2px;
-}
-
-/* module list */
-.base_module_title {
-	font-weight:bold;
-}
-.base_module_error {
-	color:#ff0000;
-}
-.base_module_warning {
-	color:#0000ff;
-}
-.base_module_message {
-
-}
-.base_module_return , .base_module_return a , .base_module_return a:visited {
-	font-weight:bold;
-}
-.base_module_versionMsg {
-	color:#0000ff;
-	font-weight:bold;
-}
-
-.base_modinfo_notmounted {
-	margin:10px 10px 10px 40px;
-}
- 
-/* comment list */
-.base_comment_search {
-	text-align:center;
-	margin:20px;
-}
-
-/* for list table */
-.base_list_id {
-	text-align:center;
-}
-.base_list_title, .base_list_title a, .base_list_title a:visited {
-	text-align:left;
-	padding-left:5px;
-	font-weight:bold;
-}
-.base_list_imagetitle {
-	text-align:center;
-	font-weight:bold;
-}
-.base_list_name {
-	text-align:left;
-	padding-left:5px;
-}
-.base_list_text {
-	text-align:left;
-	padding-left:5px;
-}
-.base_list_description {
-	text-align:left;
-	padding-left:5px;
-	font-weight:normal;
-}
-.base_list_number {
-	text-align:right;
-	padding-right:5px;
-}
-.base_list_order {
-	text-align:center;
-}
-.base_list_image {
-	text-align:center;
-}
-.base_list_select {
-	text-align:center;
-}
-.base_list_type {
-	text-align:center;
-}
-.base_list_date {
-	text-align:center;
-}
-.base_list_control {
-	text-align:center;
-}

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:36 +0900
Subject: [xoops-cvslog 5678] CVS update:
	xoops2jp/html/modules/base/admin/theme/stylesheets
Message-ID: <20061107080436.1AF972AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/stylesheets/style.css
diff -u xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.13 xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:removed
--- xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.13	Fri Sep 15 17:13:12 2006
+++ xoops2jp/html/modules/base/admin/theme/stylesheets/style.css	Tue Nov  7 17:04:36 2006
@@ -1,474 +0,0 @@
-* {
-	margin:0;
-	padding:0;
-}
-
-body {
-	background:#ffffff;
-	color:#000000;
-	font-size:12px;
-	line-height:130%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	color:#47477f;
-	margin:0.5em;
-}
-h3 {
-	font-size:18px;
-}
-
-h4 {
-	font-size:16px;
-	margin:1em;
-}
-h5 {
-	font-size:14px;
-	margin:1em;
-}
-h6 {
-	font-size:12px;
-}
-
-a {
-	color:#333366;
-	font-weight:normal;
-	text-decoration:none;
-}
-a:visited {
-	color:#333366;
-	font-weight:normal;
-}
-a:hover {
-	color:#F8B643;
-}
-
-img {
-	border:0
-}
-
-hr {
-	color:#E18A00;
-	background-color:#E18A00;
-	border:none;
-	width:95%;
-	height:0.3em;
-	margin: 10px auto; 
-	text-align:center; 
-}
-
-ul {
-	margin:2px;
-	padding:2px;
-	list-style:square outside;
-}
-li {
-	margin-left:20px;
-	line-height:130%;
-}
-
-table {
-	margin:0;
-	padding:0;
-	width:100%;
-	border-collapse:collapse; 
-}
-td {
-	vertical-align:top;
-}
-th {
-	color:#ffffff;
-	background: #6766A2;
-	text-align:center;
-	padding:5px 1px;
-}
-th a {
-	font-weight:bold;
-	color:#ffffff;
-}
-th a:visited {
-	font-weight:bold;
-	color:#ffffff;
-}
-th a:hover {
-	font-weight:bold;
-	color:#ff8c00;
-}
-
-form {
-	margin:0.5em 0;
-}
-input.formButton {
-	background:url(<{"design/buttonbg.gif"|theme}>);
-	border-top:solid 1px #9a9caa;
-	border-left:solid 1px #9a9caa;
-	border-right:solid 1px #43445e;
-	border-bottom:solid 1px #43445e;
-	padding: 1px 10px;
-}
-textarea {
-	font-size:13px;
-}
-select option {
-	padding: 0 3px;
-}
-
-#container {
-	width:100%;
-	margin:0 auto;
-	text-align:left;
-}
-
-/* ===== common ===== */
-.outer td , .outer th {
-	border:1px solid #666699;
-}
-table.outer {
-	margin:10px 0;
-	border:1px solid #666699;
-}
-.head {
-	color:#000000;
-	background:#dddddd;
-	padding:5px 3px;
-}
-.foot {
-	color:#FFFFFF;
-	background:#6766A2;
-	padding:6px 4px;
-	text-align: center;
-}
-.foot a{
-	color:#ffffff;
-}
-.odd {
-	background:#eeeeff;
-	padding:5px 3px;
-}
-.even {
-	background:#ffffff;
-	padding:5px 3px;
-}
-tr .odd td {
-	padding:3px;
-	vertical-align:middle;
-}
-tr .even td {
-	padding:3px;
-	vertical-align:middle;
-}
-.nw {
-	white-space:nowrap;
-}
-
-/* ===== header ===== */
-#header {
-	background:#333366;
-}
-#header .logo {
-	vertical-align:middle;
-	padding:3px 0px 0px 3px;
-	background:#333366;
-}
-#header .logo a:hover {
-	border-bottom: 0;
-}
-
-#header .searchbar {
-	text-align:right;
-	vertical-align:middle;
-	padding-right:10px;
-	background:#333366;
-}
-#header .searchBox {
-	margin:0;
-}
-
-#header .topnav {
-	color:#333333;
-	background:#EEEEFF;
-	text-align:right;
-	vertical-align:middle;
-	border-bottom:1px solid #333366;
-	padding:5px 10px;
-}
-#header .topnav a {
-	color:#333333;
-	font-weight:bold;
-}
-#header .topnav a:hover {
-	font-weight:bold;
-	color:#F8B643;
-}
-
-/* ===== LeftColumn ===== */
-#leftcolumn {
-	width:190px;
-	background:#ffffff;
-	border-right:1px solid #6766A2;
-}
-#leftcolumn .head {
-	padding:5px;
-	background:#333366;
-	font-weight:bold;
-	color:#ffffff;
-	text-align:left;
-	border-bottom:1px solid #cccccc;
-}
-#leftcolumn .head a {
-	color:#eeffff;
-	font-weight:bold;
-}
-#leftcolumn .head a:hover {
-	color:#F8B643;
-}
-
-#leftcolumn .head2 {
-	padding:5px;
-	background:#6766A2;
-	font-weight:bold;
-	color:#ffffff;
-	text-align:left;
-	border-bottom:1px solid #cccccc;
-}
-#leftcolumn .head2 a {
-	color:#eeffff;
-	font-weight:bold;
-}
-#leftcolumn .head2 a:hover {
-	color:#F8B643;
-}
-
-#leftcolumn .submenu {
-	margin:0px;
-	padding:3px 2px;
-	display:none;
-}
-#leftcolumn .submenu li {
-	margin:0;
-	padding:2px 2px 2px 17px;
-	list-style:none;
-	background:url(<{"design/menulist.gif"|theme}>) no-repeat center left;
-}
-#leftcolumn .submenu li a {
-	color:#000000;
-}
-#leftcolumn .submenu li a:visited {
-	color:#000000;
-}
-#leftcolumn .submenu li a:hover {
-	color:#F8B643;
-	text-decoration:underline;
-}
-
-/* ===== Center Column ===== */
-#centercolumn {
-	background:#ffffff;
-	margin:0;
-	padding:0;
-	border-right:solid 1px #efefef;
-}
-#contentBody {
-	background:#ffffff;
-	padding:10px;
-}
-
-#footer {
-	background:#EEEEFF;
-	border-top:1px solid #333366;
-	text-align:center;
-	padding:5px 0;
-	font-size:95%;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-.return_top {
-	text-align:right;
-	margin:10px 30px;
-}
-
-/* ===== option MenuNavi =====
-#menunavi {
-	margin:8px;
-	border:1px solid #333366;
-	background-color:#eeeeff;
-}
-#menunavi h2 {
-	margin:0.4em 2em;
-	font-size: 16px;
-	color:#333366;
-}
-ul.submenunavi {
-	text-align:left;
-	padding:0;
-	margin:3px;
-}
-ul.submenunavi li {
-	display:inline;
-	margin:0 2px;
-	border-top:1px solid #ffffff;
-	border-left:1px solid #ffffff;
-	border-right:1px solid #cccccc;
-	border-bottom:1px solid #cccccc;
-	padding:3px;
-	line-height:2em;
-	background-color:#f8f8ff;
-	white-space: nowrap;
-	_white-space:none;
-	
-}
-ul.submenunavi li a {
-	color:#000060;
-}
-ul.submenunavi li a:visited {
-	color:#000060;
-}
- */
-
-/* ===== Admin Navi ===== */
-.adminnavi {
-	color:#ffffff;
-	background:#333366;
-	margin:-5px -3px 20px -3px;
-	padding:5px;
-	font-size:13px;
-}
-.adminnavi a:link , .adminnavi a:visited {
-	color:#ccffff;
-	font-weight:bold;
-}
-.adminnavi a:hover {
-	color:#f8b643;
-	font-weight:bold;
-}
-.adminnaviTitle {
-	font-size:16px;
-	font-weight:bold;
-}
-h3.admintitle {
-	display:none;
-}
-
-/* ===== Top Tab ===== */
-ul.toptab {
-	text-align:right; padding:0; margin:10px;
-}
-ul.toptab li {
-	display:inline;
-	margin:0 5px;
-	border-top:1px solid #EEEEFF;
-	border-left:1px solid #EEEEFF;
-	border-right:1px solid #666699;
-	border-bottom:1px solid #666699;
-	background:#f6f6f6 url(<{"design/menulist.gif"|theme}>) no-repeat center left;
-	padding:5px 5px 5px 18px;
-}
-
-/* ===== Page Navi ===== */
-.pagenavi {
-	font-size:14px;
-	text-align:center;
-	margin:10px;
-	word-spacing: 0.5em;
-}
-
-/* ===== top message ===== */
-.warning {
-	color:#770000;
-	font-size:15px;
-	border:1px solid #cc0000;
-	padding:8px 8px 8px 35px;
-	margin:15px 10px;
-	background:#ffaaaa url(<{"icons/error.gif"|theme}>) no-repeat 5px 4px;
-}
-.confirm {
-	color:#000000;
-	border:1px solid #ff6633;
-	padding:8px 8px 8px 35px;
-	margin:15px 10px;
-	background:#fff8ee url(<{"icons/important.gif"|theme}>) no-repeat 5px 4px;
-}
-.tips {
-	color:#000000;
-	border:1px solid #00cc00;
-	padding:8px 8px 8px 35px;
-	margin:15px 10px;
-	background:#f8fff8 url(<{"icons/idea.gif"|theme}>) no-repeat 5px 4px;
-}
-.error {
-	color:#000000;
-	border:2px dotted #ff6633;
-	padding:8px 8px 8px 35px;
-	margin:15px 10px;
-	background: #fff8ee url(<{"icons/error.gif"|theme}>) no-repeat 5px 4px;
-}
-
-/* ===== Help ===== */
-.help {
-	line-height:150%;
-	padding:5px 25px 25px 25px;
-	border:3px dashed #F8B643;
-	margin:10px;
-}
-.help h4 {
-	margin:25px 0 10px 0;
-	padding:5px 5px 5px 32px;
-	font-size:15px;
-	color:#882200;
-	border-left:5px solid #F8B643;
-	border-bottom:1px solid #F8B643;
-	background:#ffffff url(<{"icons/idea.gif"|theme}>) no-repeat 8px 3px;
-}
-.help h5 {
-	font-size:13px;
-	color:#882200;
-	margin:20px 0 5px 10px;
-	padding:0px 2px 0px 10px;
-	border-left:13px solid #F8B643;
-}
-.help h6 {
-	color:#000000;
-	font-size:12px;
-	margin:10px 0 0 10px;
-	padding:2px 2px 2px 10px;
-}
-.help a {
-	color:darkblue;
-	text-decoration:underline;
-	font-weight:bold;
-	margin:0 0.5em;
-}
-.help p {
-	padding:5px 20px;
-}
-.help ul {
-	margin-left:10px;
-}
-.help ol {
-	margin:2px 2px 2px 20px;
-	padding:2px;
-	list-style:decimal outside;
-}
-.help li {
-	padding:3px 0;
-}
-.help dl {
-	margin: 5px;
-}
-.help dt {
-	margin: 5px 5px 5px 10px;
-	font-weight:bold;
-}
-.help dd {
-	margin: 5px 5px 5px 30px;
-}
-
-/* ===== active ===== */
-.active {
-		background:#ffdddd;
-}
-.active a:hover {
-		color:#cc0000;
-}
-.inactive {
-		color:#333333; 
-}
Index: xoops2jp/html/modules/base/admin/theme/stylesheets/index.html
diff -u xoops2jp/html/modules/base/admin/theme/stylesheets/index.html:1.1.2.1 xoops2jp/html/modules/base/admin/theme/stylesheets/index.html:removed
--- xoops2jp/html/modules/base/admin/theme/stylesheets/index.html:1.1.2.1	Fri Apr 28 18:16:58 2006
+++ xoops2jp/html/modules/base/admin/theme/stylesheets/index.html	Tue Nov  7 17:04:36 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:36 +0900
Subject: [xoops-cvslog 5679] CVS update:
	xoops2jp/html/modules/base/language/english/help
Message-ID: <20061107080436.5B06E2AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/help/help.html
diff -u xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.12 xoops2jp/html/modules/base/language/english/help/help.html:removed
--- xoops2jp/html/modules/base/language/english/help/help.html:1.1.2.12	Sun Sep 10 14:54:33 2006
+++ xoops2jp/html/modules/base/language/english/help/help.html	Tue Nov  7 17:04:36 2006
@@ -1,53 +0,0 @@
-<h4>Outline</h4>
-<ul>
-  <li>This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.</li>
-  <li>Also, it provides module operation menu and theme engine for admin menu.</li>
-  <li>This module is incomplete in this release. It should be used together with System module.</li>
-</ul>
-
-<h4>Action Search</h4>
-<ul>
-  <li>Search information of typed keyword from admin menu and help files.</li>
-  <li>Please perform search when you need to know how to use the XOOPS Cube.</li>
-</ul>
-
-<h4>Index</h4>
-<ul>
-  <li><a href="<{'theme.html'|helpurl}>">Theme management</a></li>
-</ul>
-
-<h4>Module administration / installation</h4>
-<ul>
-  <li>When you go to this area, you see a list of installed module in your XOOPS Cube.</li>
-  <li>To install modules, please go to 'install module'.</li>
-  <li>You can check details of modules when you click 'Information(!)' button.</li>
-  <li>Otherwise, you can operate the administration menu just like XOOPS 2.0.x.</li>
-</ul>
-
-<h4>Block administration / installation</h4>
-<ul>
-  <li>Click <a href="<{'block.html'|helpurl}>">here</a> to understand this feature.</li>
-</ul>
-
-<h4>Themes administration / installation</h4>
-<ul>
-  <li>Click <a href="<{'theme.html'|helpurl}>">here</a> to understand this feature.</li>
-</ul>
-
-<h4>Migration guide (from XOOPS 2.0.x)</h4>
-<ul>
-  <li>Please refer <a href="<{'xoops2.html'|helpurl}>">here.</a></li>
-</ul>
-
-<h4>TODO (What's coming?)</h4>
-<ul>
-  <li>Name of this module would be changed to 'Legacy module' form 'Base module'.</li>
-  <li>Some modules which depend on minor global variables of XOOPS2, can not be installed in XOOPS Cube Legacy 2.1.
-</ul>
-
-<h4>ToDo of Cube Legacy 2.1.0 for the next version</h4>
-<ul>
-  <li>The preview feature in custom blocks has to be implemented.</li>
-  <li>Users can't use forward-match and backward-match in the user search. These search options are available in XOOPS2.</li>
-  <li>IIS may not install modules which have SQL file. If you meet such troubles, please report to us.
-</ul>
Index: xoops2jp/html/modules/base/language/english/help/index.html
diff -u xoops2jp/html/modules/base/language/english/help/index.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help/index.html:removed
--- xoops2jp/html/modules/base/language/english/help/index.html:1.1.2.1	Mon Jun  5 18:30:10 2006
+++ xoops2jp/html/modules/base/language/english/help/index.html	Tue Nov  7 17:04:36 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/language/english/help/xoops2.html
diff -u xoops2jp/html/modules/base/language/english/help/xoops2.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help/xoops2.html:removed
--- xoops2jp/html/modules/base/language/english/help/xoops2.html:1.1.2.1	Wed Aug  2 18:41:55 2006
+++ xoops2jp/html/modules/base/language/english/help/xoops2.html	Tue Nov  7 17:04:36 2006
@@ -1,33 +0,0 @@
-<h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
-<h5>Getting first</h5>
-<p> All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p<p> These features will be ported to 'Legacy module' until stable release.</p>
-
-<h5>Module management</h5>
-<ul>
-<li>You can manage modules on 'Legacy system' module.</li>
-<li>'Install module' and 'Module management' has each control page.</li>
-<li>Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.</li>
-<li>Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.</li>
-<li>Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.</li>
-</ul>
-
-<h5>User management</h5>
-<ul>
-<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to <strong>user module</strong>.</li>
-<li>However, 'Sending mail' hasn't ported yet.</li>
-</ul>
-
-<h5>Theme management</h5>
-<ul>
-<li>Each renderer systems (Theme engine) are used for management themes.</li>
-<li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
-</ul>
-
-<div style="color:red;">New!</div>
-<h5>Block management</h5>
-<ul>
-<li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>
-<li>If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.</li>
-<li>If you uninstall the block, it returns to the list of 'Install block' page.</li>
-<li>You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.
-</ul>
Index: xoops2jp/html/modules/base/language/english/help/block.html
diff -u xoops2jp/html/modules/base/language/english/help/block.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help/block.html:removed
--- xoops2jp/html/modules/base/language/english/help/block.html:1.1.2.1	Wed Aug  2 18:41:55 2006
+++ xoops2jp/html/modules/base/language/english/help/block.html	Tue Nov  7 17:04:36 2006
@@ -1,39 +0,0 @@
-<h4>How to use Blocks</h4>
-<p>Blocks is small content that is displayed to modules you specified.
-It is installed with modules that have blocks.</p>
-
-<h5>Install Blocks</h5>
-<p>At first, you have to install blocks to use it.
-Click <a href="<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList">here</a> to start installing blocks.
-In the form, you can change the name of the block and apply groups that can see the block.
-Weight is order in the column that you specify.</p>
-
-<h5>Column</h5>
-<p>Most themes have three panes.
-The central panes has more two panes.
-These panes are called Left column, Center-Left column, Center column, Center-right column and Right column.
-You can display the block to the column that you specify of the module that you specify.</p>
-
-<p>Some themes don't have Left column or Right column.
-In such case, one column might be inseted to another column.
-You need to read the manual of those themes to understand the feature of them.</p>
-
-<h6>Note</h6>
-<p>The special Render System may give special functions to you about blocks.
-If you have installed it, read the manual of your RenderSystem.</p>
-
-<h5>Block Managing</h5>
-<p>You can change the setting of the block anytime in Block Manage.
-Click <a href="<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockList">here</a>.
-The usage is based on other control functions.
-Click the edit icon to change the setting.</p>
-
-<h6>Uninstall Block</h6>
-<p>If you hope to lay off the display of the block, click the uninstall icon.
-The block returns into the list of uninstall blocks.
-The setting of the block is kept until you uninstall the module that has the block.
-You can re-install the block anytime.</p>
-
-<h5>FOR XOOPS2 USERS</h5>
-<p>XOOPS Cube Legacy 2.1 has separated the list of un-used blocks from Block Manage.
-It is like Module Manage.</p>
Index: xoops2jp/html/modules/base/language/english/help/theme.html
diff -u xoops2jp/html/modules/base/language/english/help/theme.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help/theme.html:removed
--- xoops2jp/html/modules/base/language/english/help/theme.html:1.1.2.1	Wed Aug  2 18:42:07 2006
+++ xoops2jp/html/modules/base/language/english/help/theme.html	Tue Nov  7 17:04:36 2006
@@ -1,48 +0,0 @@
-<p>
-Themes are the skin(Looks) at XOOPS Cube.
-You may change the looks of your site by changing the main theme like a dress-up doll.
-Let's customize the looks of your site. Download themes from sites of theme designers who have published themes for XOOPS Cube.
-</p>
-
-<h4>How to change the main theme</h4>
-<p>
-The main theme is the default theme at your site. You can specify one main theme in one your site.
-</p>
-<ol>
-  <li>Click 'Theme management' in the side menu of Legacy module.</li>
-  <li>Click 'Select' button of the theme which you want to use as the main theme.</li>
-</ol>
-<p>
-After setting, let's go to your site. New design site welcomes you.
-</p>
-
-<h4>How to install new themes</h4>
-<p>
-An additional theme can be obtained on theme developer's website etc.
-The distributed theme is mostly compressed.
-To use the theme, please upload it to /themes directory after decompression of files.
-</p>
-
-<h5>Be careful about the theme directory!</h5>
-<ul>
-  <li>Please upload the folder of the decompressed theme to the themes directory under the root directory of XOOPS Cube. The folder should include theme.html or package.ini.php.</li>
-</ul>
-
-<h5>Let's read the note of the theme</h5>
-<p>
-A theme may need the special <strong>render-system</strong>.
-'Legacy Render System' which is included as default, can handle the theme format of XOOPS2.
-If you install other render systems, XOOPS Cube get able to new theme formats.
-Please, read the note of the theme for installing theme correctly, if the note is there.
-</p>
-
-<h4>How to use Theme Select</h4>
-<p>
-Users may select their favorite theme from theme list which you specified.
-To that end, you need to list up selectable themes and install 'Theme Select' block for visitors.
-</p>
-<ol>
-  <li>At first, let's make theme list. Click 'Theme management' in the side menu of Legacy module.</li>
-  <li>Check themes which you want to specify as selectable themes. Next, Click 'Submit' button.</li>
-  <li>Install 'Theme Select' block. If you don't know about blocks of XOOPS Cube, read help about it.</li>
-</ol>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:36 +0900
Subject: [xoops-cvslog 5680] CVS update: xoops2jp/html/modules/base/language
Message-ID: <20061107080436.B87CA2AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/index.html
diff -u xoops2jp/html/modules/base/language/index.html:1.1.2.1 xoops2jp/html/modules/base/language/index.html:removed
--- xoops2jp/html/modules/base/language/index.html:1.1.2.1	Mon Mar 27 11:41:55 2006
+++ xoops2jp/html/modules/base/language/index.html	Tue Nov  7 17:04:36 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:36 +0900
Subject: [xoops-cvslog 5681] CVS update:
	xoops2jp/html/modules/base/lib/ShadePlus
Message-ID: <20061107080436.8B32F2AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/lib/ShadePlus/ServiceServer.class.php
diff -u xoops2jp/html/modules/base/lib/ShadePlus/ServiceServer.class.php:1.1.2.2 xoops2jp/html/modules/base/lib/ShadePlus/ServiceServer.class.php:removed
--- xoops2jp/html/modules/base/lib/ShadePlus/ServiceServer.class.php:1.1.2.2	Fri Sep  1 12:13:11 2006
+++ xoops2jp/html/modules/base/lib/ShadePlus/ServiceServer.class.php	Tue Nov  7 17:04:36 2006
@@ -1,158 +0,0 @@
-<?php
-/**
- * @package ShadePlus
- * @varsion $Id: ServiceServer.class.php,v 1.1.2.2 2006/09/01 03:13:11 minahito Exp $
- * 
- * In the original BSD license, both occurrences of the phrase "COPYRIGHT
- * HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
- * 
- * Copyright (c) 2006, XOOPS Cube Project team/minahito (minahito ＠ users.sourceforge.jp)
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * b) Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * c) Neither the name of the XOOPS Cube Project team nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *    
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-class ShadePlus_ServiceServer
-{
-	var $_mService;
-	
-	var $_mServer;
-	
-	function ShadePlus_ServiceServer(&$service)
-	{
-		$this->_mService =& $service;
-		$this->_mServer =& new ShadeSoap_NusoapServer();
-		
-		$this->_mServer->configureWSDL($this->_mService->mServiceName, $this->_mService->mNameSpace);
-		$this->_mServer->wsdl->schemaTargetNamespace = $this->_mService->mNameSpace;
-	}
-	
-	function prepare()
-	{
-		$this->_parseType();
-		$this->_parseFunction();
-	}
-	
-	function _parseType()
-	{
-		//
-		// FIXME
-		//
-		foreach ($this->_mService->_mTypes as $className) {
-			if (class_exists($className)) {
-				if (call_user_func(array($className, 'isArray')) == true) {
-					$targetClassName = call_user_func(array($className, 'getClassName'));
-					
-					if (XCube_ServiceUtils::isXSD($targetClassName)) {
-						$targetClassName = 'xsd:' . $targetClassName;
-					}
-					else {
-						$targetClassName = 'tns:' . $targetClassName;
-					}
-					
-					$this->_mServer->wsdl->addComplexType(
-						$className,
-						'complexType',
-						'array',
-						'',
-						'SOAP-ENC:Array',
-						array(),
-						array(
-							array('ref' => 'SOAP-ENC:arrayType', 'wsdl:arrayType' => $targetClassName . '[]')
-						),
-						$targetClassName
-					);
-				}
-				else {
-					$t_fieldArr = call_user_func(array($className, 'getPropertyDefinition'));
-					$t_arr = array();
-					foreach ($t_fieldArr as $t_field) {
-						$name = $t_field['name'];
-						$type = $t_field['type'];
-					
-						if (XCube_ServiceUtils::isXSD($t_field['type'])) {
-							$type = 'xsd:' . $type;
-						}
-						else {
-							$type = 'tns:' . $type;
-						}
-					
-						$t_arr[$name] = array('name' => $name, 'type' => $type);
-					}
-				
-					$this->_mServer->wsdl->addComplexType(
-						$className,
-						'complexType',
-						'struct',
-						'all',
-						'',
-						$t_arr
-					);
-				}
-			}
-		}
-	}
-	
-	function _parseFunction()
-	{
-		//
-		// FIXME
-		//
-		foreach ($this->_mService->_mFunctions as $func) {
-			if (XCube_ServiceUtils::isXSD($func['out'])) {
-				$t_out = 'xsd:' . $func['out'];
-			}
-			else {
-				$t_out = 'tns:' . $func['out'];
-			}
-			
-			$out['return'] = $t_out;
-			
-			//
-			// Parse IN
-			//
-			$in = array();
-			foreach ($func['in'] as $name => $type) {
-				if (XCube_ServiceUtils::isXSD($type)) {
-					$t_type = 'xsd:' . $type;
-				}
-				else {
-					$t_type = 'tns:' . $type;
-				}
-				$in[$name] = $t_type;
-			}
-			
-			$this->_mServer->register($this->_mService->mClassName . "." . $func['name'], $in, $out, $this->_mService->mNameSpace);
-		}
-	}
-	
-	function executeService()
-	{
-		$HTTP_RAW_POST_DATA = isset($GLOBALS['HTTP_RAW_POST_DATA'])? $GLOBALS['HTTP_RAW_POST_DATA'] : null;
-		$this->_mServer->service($HTTP_RAW_POST_DATA);
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/lib/ShadePlus/SoapClient.class.php
diff -u xoops2jp/html/modules/base/lib/ShadePlus/SoapClient.class.php:1.1.2.1 xoops2jp/html/modules/base/lib/ShadePlus/SoapClient.class.php:removed
--- xoops2jp/html/modules/base/lib/ShadePlus/SoapClient.class.php:1.1.2.1	Wed Aug 30 19:06:51 2006
+++ xoops2jp/html/modules/base/lib/ShadePlus/SoapClient.class.php	Tue Nov  7 17:04:36 2006
@@ -1,96 +0,0 @@
-<?php
-/**
- * @package ShadePlus
- * @varsion $Id: SoapClient.class.php,v 1.1.2.1 2006/08/30 10:06:51 minahito Exp $
- * 
- * In the original BSD license, both occurrences of the phrase "COPYRIGHT
- * HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
- * 
- * Copyright (c) 2006, XOOPS Cube Project team/minahito (minahito ＠ users.sourceforge.jp)
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * b) Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * c) Neither the name of the XOOPS Cube Project team nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *    
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-if (!defined('XCube_AbstractServiceClient')) exit();
-
-class ShadePlus_SoapClient extends XCube_AbstractServiceClient
-{
-	var $mClient = null;
-	
-	function Shade_SoapClient(&$service)
-	{
-		parent::XCube_AbstractServiceClient($service);
-		$this->mClient =& new soap_client($service, true);
-	}
-	
-	function call($operation, $args)
-	{
-		$root =& XCube_Root::getSingleton();
-		
-		$args = $this->_encodeUTF8($args, $root->mLanguageManager);
-		
-		$retValue = $this->mClient->call($operation, $args);
-		
-		if (is_array($retValue)) {
-			$retValue = $this->_decodeUTF8($retValue, $root->mLanguageManager);
-		}
-		else {
-			$retValue = $root->mLanguageManager->decodeUTF8($retValue);
-		}
-		
-		return $retValue;
-	}
-	
-	function _encodeUTF8($arr, &$languageManager)
-	{
-		foreach (array_keys($arr) as $key) {
-			if (is_array($arr[$key])) {
-				$arr[$key] = $this->_encodeUTF8($arr[$key], $languageManager);
-			}
-			else {
-				$arr[$key] = $languageManager->encodeUTF8($arr[$key]);
-			}
-		}
-		
-		return $arr;
-	}
-
-	function _decodeUTF8($arr, &$languageManager)
-	{
-		foreach (array_keys($arr) as $key) {
-			if (is_array($arr[$key])) {
-				$arr[$key] = $this->_decodeUTF8($arr[$Key], $languageManager);
-			}
-			else {
-				$arr[$Key] = $languageManager->decodeUTF8($arr[$key]);
-			}
-		}
-		
-		return $arr;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:36 +0900
Subject: [xoops-cvslog 5682] CVS update:
	xoops2jp/html/modules/base/preload/protectorLE
Message-ID: <20061107080436.E06AF2AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/protectorLE/protectorLE.class.php
diff -u xoops2jp/html/modules/base/preload/protectorLE/protectorLE.class.php:1.1.2.2 xoops2jp/html/modules/base/preload/protectorLE/protectorLE.class.php:removed
--- xoops2jp/html/modules/base/preload/protectorLE/protectorLE.class.php:1.1.2.2	Tue Mar 28 22:30:25 2006
+++ xoops2jp/html/modules/base/preload/protectorLE/protectorLE.class.php	Tue Nov  7 17:04:36 2006
@@ -1,28 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class protectorLE_Filter extends XCube_ActionFilter
-{
-	function getCheckRequestKeys()
-	{
-		$checkNames=array('GLOBALS', '_SESSION', 'HTTP_SESSION_VARS', '_GET', 'HTTP_GET_VARS',
-							'_POST', 'HTTP_POST_VARS', '_COOKIE', 'HTTP_COOKIE_VARS', '_REQUEST',
-							'_SERVER', 'HTTP_SERVER_VARS', '_ENV', 'HTTP_ENV_VARS', '_FILES',
-							'HTTP_POST_FILES', 'xoopsDB', 'xoopsUser', 'xoopsUserId', 'xoopsUserGroups',
-							'xoopsUserIsAdmin', 'xoopsConfig', 'xoopsOption', 'xoopsModule', 'xoopsModuleConfig');
-							
-		return $checkNames;
-	}
-
-	function preFilter()
-	{
-		foreach($this->getCheckRequestKeys() as $name) {
-			if (isset($_REQUEST[$name])) {
-				die();
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/preload/protectorLE/index.html
diff -u xoops2jp/html/modules/base/preload/protectorLE/index.html:1.1.2.1 xoops2jp/html/modules/base/preload/protectorLE/index.html:removed
--- xoops2jp/html/modules/base/preload/protectorLE/index.html:1.1.2.1	Mon Mar 27 11:41:52 2006
+++ xoops2jp/html/modules/base/preload/protectorLE/index.html	Tue Nov  7 17:04:36 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:04:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:04:37 +0900
Subject: [xoops-cvslog 5683] CVS update:
	xoops2jp/html/modules/base/lib/ShadeSoap
Message-ID: <20061107080437.109192AC030@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/lib/ShadeSoap/NusoapServer.class.php
diff -u xoops2jp/html/modules/base/lib/ShadeSoap/NusoapServer.class.php:1.1.2.2 xoops2jp/html/modules/base/lib/ShadeSoap/NusoapServer.class.php:removed
--- xoops2jp/html/modules/base/lib/ShadeSoap/NusoapServer.class.php:1.1.2.2	Fri Sep  1 12:13:10 2006
+++ xoops2jp/html/modules/base/lib/ShadeSoap/NusoapServer.class.php	Tue Nov  7 17:04:37 2006
@@ -1,150 +0,0 @@
-<?php
-/**
- * @package ShadeSoap
- * @version $Id: NusoapServer.class.php,v 1.1.2.2 2006/09/01 03:13:10 minahito Exp $
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-if (!class_exists('soap_server')) exit();
-
-class ShadeSoap_NusoapServer extends soap_server
-{
-	function invoke_method() {
-		$this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);
-
-		if ($this->wsdl) {
-			if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {
-				$this->debug('in invoke_method, found WSDL operation=' . $this->methodname);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-			} elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {
-				// Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element
-				$this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-				$this->methodname = $this->opData['name'];
-			} else {
-				$this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);
-				$this->fault('Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");
-				return;
-			}
-		} else {
-			$this->debug('in invoke_method, no WSDL to validate method');
-		}
-
-		// if a . is present in $this->methodname, we see if there is a class in scope,
-		// which could be referred to. We will also distinguish between two deliminators,
-		// to allow methods to be called a the class or an instance
-		$class = '';
-		$method = '';
-		if (strpos($this->methodname, '..') > 0) {
-			$delim = '..';
-		} else if (strpos($this->methodname, '.') > 0) {
-			$delim = '.';
-		} else {
-			$delim = '';
-		}
-
-		if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1 &&
-			class_exists(substr($this->methodname, 0, strpos($this->methodname, $delim)))) {
-			// get the class and method name
-			$class = substr($this->methodname, 0, strpos($this->methodname, $delim));
-			$method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));
-			$this->debug("in invoke_method, class=$class method=$method delim=$delim");
-		}
-
-		// does method exist?
-		if ($class == '') {
-			if (!function_exists($this->methodname)) {
-				$this->debug("in invoke_method, function '$this->methodname' not found!");
-				$this->result = 'fault: method not found';
-				$this->fault('Client',"method '$this->methodname' not defined in service");
-				return;
-			}
-		} else {
-			$method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;
-			if (!in_array($method_to_compare, get_class_methods($class))) {
-				$this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");
-				$this->result = 'fault: method not found';
-				$this->fault('Client',"method '$this->methodname' not defined in service");
-				return;
-			}
-		}
-
-		// evaluate message, getting back parameters
-		// verify that request parameters match the method's signature
-		if(! $this->verify_method($this->methodname,$this->methodparams)){
-			// debug
-			$this->debug('ERROR: request not verified against method signature');
-			$this->result = 'fault: request failed validation against method signature';
-			// return fault
-			$this->fault('Client',"Operation '$this->methodname' not defined in service.");
-			return;
-		}
-
-		// if there are parameters to pass
-		$this->debug('in invoke_method, params:');
-		$this->appendDebug($this->varDump($this->methodparams));
-		$this->debug("in invoke_method, calling '$this->methodname'");
-
-		if ($class == '') {
-			$this->debug('in invoke_method, calling function using call_user_func_array()');
-			$call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()
-		} elseif ($delim == '..') {
-			$this->debug('in invoke_method, calling class method using call_user_func_array()');
-			$call_arg = array ($class, $method);
-		} else {
-			$this->debug('in invoke_method, calling instance method using call_user_func_array()');
-			$instance = new $class ();
-			$call_arg = array(&$instance, $method);
-		}
-		
-		//
-		// Insert CUBE CODE
-		//
-		$root =& XCube_Root::getSingleton();
-		$root->mController->mUser->setService(true);
-		$retValue = call_user_func_array($call_arg, array($root->mController->mUser, $this->methodparams));
-		
-		if (is_array($retValue)) {
-			$retValue = $this->_encodeUTF8($retValue, $root->mLanguageManager);
-		}
-		else {
-			$retValue = $root->mLanguageManager->encodeUTF8($retValue);
-		}
-
-		$this->methodreturn = $retValue;	
-
-        $this->debug('in invoke_method, methodreturn:');
-        $this->appendDebug($this->varDump($this->methodreturn));
-		$this->debug("in invoke_method, called method $this->methodname, received $this->methodreturn of type ".gettype($this->methodreturn));
-	}
-	
-	function _encodeUTF8($arr, &$languageManager)
-	{
-		foreach (array_keys($arr) as $key) {
-			if (is_array($arr[$key])) {
-				$arr[$key] = $this->_encodeUTF8($arr[$key], $languageManager);
-			}
-			else {
-				$arr[$key] = $languageManager->encodeUTF8($arr[$key]);
-			}
-		}
-		
-		return $arr;
-	}
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:06:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:06:05 +0900
Subject: [xoops-cvslog 5684] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061107080605.7910F2AC0C8@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.3	Sun Nov  5 15:33:35 2006
+++ xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php	Tue Nov  7 17:06:05 2006
@@ -29,6 +29,7 @@
 			$module =& $handler->get($this->mObject->get('mid'));
 			if (is_object($module)) {
 				$controller->mRoot->mLanguageManager->loadModinfoMessageCatalog($module->get('dirname'));
+				$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog($module->get('dirname'));
 			}
 		}
 	}

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:24:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:24:51 +0900
Subject: [xoops-cvslog 5685] CVS update: xoops2jp/html/modules/legacy/forms
Message-ID: <20061107082451.92D912AC0B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/forms/SearchShowallbyuserForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/SearchShowallbyuserForm.class.php:1.1.2.2 xoops2jp/html/modules/legacy/forms/SearchShowallbyuserForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/forms/SearchShowallbyuserForm.class.php:1.1.2.2	Sun Oct 15 01:36:55 2006
+++ xoops2jp/html/modules/legacy/forms/SearchShowallbyuserForm.class.php	Tue Nov  7 17:24:51 2006
@@ -7,7 +7,7 @@
 
 require_once XOOPS_MODULE_PATH . "/legacy/forms/SearchShowallForm.class.php";
 
-class Legacy_SearchShowallbyuserForm extends XCube_ActionForm
+class Legacy_SearchShowallbyuserForm extends Legacy_SearchShowallForm
 {
 	function prepare()
 	{
Index: xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.2 xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.2	Sun Oct 15 01:36:41 2006
+++ xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php	Tue Nov  7 17:24:51 2006
@@ -30,7 +30,7 @@
 		//
 		$this->mFieldProperties['andor'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['andor']->setDependsByArray(array('mask'));
-		$this->mFieldProperties['andor']->addMessage('required', _MD_LEGACY_ERROR_MASK, _MD_LEGACY_LANG_ANDOR);
+		$this->mFieldProperties['andor']->addMessage('mask', _MD_LEGACY_ERROR_MASK, _MD_LEGACY_LANG_ANDOR);
 		$this->mFieldProperties['andor']->addVar('mask', '/^(AND|OR|exact)$/i');
 	}
 	
Index: xoops2jp/html/modules/legacy/forms/SearchShowallForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/SearchShowallForm.class.php:1.1.2.2 xoops2jp/html/modules/legacy/forms/SearchShowallForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/forms/SearchShowallForm.class.php:1.1.2.2	Sun Oct 15 01:37:06 2006
+++ xoops2jp/html/modules/legacy/forms/SearchShowallForm.class.php	Tue Nov  7 17:24:51 2006
@@ -24,7 +24,7 @@
 		//
 		$this->mFieldProperties['andor'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['andor']->setDependsByArray(array('mask'));
-		$this->mFieldProperties['andor']->addMessage('required', _MD_LEGACY_ERROR_MASK, _MD_LEGACY_LANG_ANDOR);
+		$this->mFieldProperties['andor']->addMessage('mask', _MD_LEGACY_ERROR_MASK, _MD_LEGACY_LANG_ANDOR);
 		$this->mFieldProperties['andor']->addVar('mask', '/^(AND|OR|exact)$/i');
 
 		$this->set('start', 0);

From minahito ＠ users.sourceforge.jp  Tue Nov  7 17:24:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 17:24:51 +0900
Subject: [xoops-cvslog 5686] CVS update: xoops2jp/html/modules/legacy/.xml
Message-ID: <20061107082451.C81DC2AC146@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/.xml/search_showall.xml
diff -u xoops2jp/html/modules/legacy/.xml/search_showall.xml:1.1.2.2 xoops2jp/html/modules/legacy/.xml/search_showall.xml:1.1.2.3
--- xoops2jp/html/modules/legacy/.xml/search_showall.xml:1.1.2.2	Sun Oct 15 00:39:44 2006
+++ xoops2jp/html/modules/legacy/.xml/search_showall.xml	Tue Nov  7 17:24:51 2006
@@ -9,7 +9,7 @@
 	<form-validation>
 		<field property="andor" depends="mask">
 			<arg0 key="const._MD_LEGACY_LANG_ANDOR" />
-			<msg name="required" key="const._MD_LEGACY_ERROR_MASK" />
+			<msg name="mask" key="const._MD_LEGACY_ERROR_MASK" />
 			<var name="mask" value="/(AND|OR|exact)/" />
 		</field>
 	</form-validation>
Index: xoops2jp/html/modules/legacy/.xml/search_results.xml
diff -u xoops2jp/html/modules/legacy/.xml/search_results.xml:1.1.2.2 xoops2jp/html/modules/legacy/.xml/search_results.xml:1.1.2.3
--- xoops2jp/html/modules/legacy/.xml/search_results.xml:1.1.2.2	Sun Oct 15 00:39:44 2006
+++ xoops2jp/html/modules/legacy/.xml/search_results.xml	Tue Nov  7 17:24:51 2006
@@ -8,7 +8,7 @@
 	<form-validation>
 		<field property="andor" depends="mask">
 			<arg0 key="const._MD_LEGACY_LANG_ANDOR" />
-			<msg name="required" key="const._MD_LEGACY_ERROR_MASK" />
+			<msg name="mask" key="const._MD_LEGACY_ERROR_MASK" />
 			<var name="mask" value="/(AND|OR|exact)/" />
 		</field>
 	</form-validation>
Index: xoops2jp/html/modules/legacy/.xml/search_showallbyuser.xml
diff -u xoops2jp/html/modules/legacy/.xml/search_showallbyuser.xml:1.1.2.2 xoops2jp/html/modules/legacy/.xml/search_showallbyuser.xml:1.1.2.3
--- xoops2jp/html/modules/legacy/.xml/search_showallbyuser.xml:1.1.2.2	Sun Oct 15 00:39:44 2006
+++ xoops2jp/html/modules/legacy/.xml/search_showallbyuser.xml	Tue Nov  7 17:24:51 2006
@@ -10,7 +10,7 @@
 	<form-validation>
 		<field property="andor" depends="mask">
 			<arg0 key="const._MD_LEGACY_LANG_ANDOR" />
-			<msg name="required" key="const._MD_LEGACY_ERROR_MASK" />
+			<msg name="mask" key="const._MD_LEGACY_ERROR_MASK" />
 			<var name="mask" value="/(AND|OR|exact)/" />
 		</field>
 	</form-validation>

From minahito ＠ users.sourceforge.jp  Tue Nov  7 18:56:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 18:56:04 +0900
Subject: [xoops-cvslog 5687] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061107095604.9AD3C2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.7 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.8
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.7	Mon Oct 30 20:46:25 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Tue Nov  7 18:56:04 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.7 2006/10/30 11:46:25 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.8 2006/11/07 09:56:04 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -70,6 +70,7 @@
    		$this->mXoopsTpl->assign(array('xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES),	//@todo ?????????????
 							'xoops_sitename' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['sitename'], ENT_QUOTES),
 							'xoops_pagetitle' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
+							'xoops_slogan' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
 							// set JavaScript/Weird, but need extra <script> tags for 2.0.x themes
 							'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript"><!--'
 						));
@@ -124,21 +125,6 @@
 			);
 		}
 		
-		//
-		// Assign module informations.
-		//
-		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
-			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
-			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
-			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
-			if (!$this->mXoopsTpl->get_template_vars('xoops_pagetitle')) {
-				$this->mXoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getShow('name')));
-			}
-		}
-		else {
-			$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES));
-		}
-
 		$this->mXoopsTpl->assign($arr);
 	}
 
@@ -263,6 +249,19 @@
    		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
    		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
 		
+		//
+		// Assign module informations.
+		//
+		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
+			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
+			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
+			                               'xoops_dirname' => $xoopsModule->getShow('dirname'),
+										   'xoops_pagetitle' => $xoopsModule->getShow('name')));
+		}
+		else {
+			$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES));
+		}
+		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
 			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
 		}

From minahito ＠ users.sourceforge.jp  Tue Nov  7 20:06:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  7 Nov 2006 20:06:48 +0900
Subject: [xoops-cvslog 5688] CVS update: xoops2jp/html/include
Message-ID: <20061107110648.89EFB2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.7 xoops2jp/html/include/version.php:1.4.8.12.2.8
--- xoops2jp/html/include/version.php:1.4.8.12.2.7	Tue Nov  7 01:09:29 2006
+++ xoops2jp/html/include/version.php	Tue Nov  7 20:06:48 2006
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.7 2006/11/06 16:09:29 tom_g3x Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.8 2006/11/07 11:06:48 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-d");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-e");
 
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Tue Nov  7 22:00:58 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue,  7 Nov 2006 22:00:58 +0900
Subject: [xoops-cvslog 5689] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061107130058.2570A2AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/comment_view.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.4	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_view.html	Tue Nov  7 22:00:57 2006
@@ -6,6 +6,11 @@
 
 <h3 class="admintitle"><{$smarty.const._AD_LEGACY_LANG_COMMENT_VIEW}></h3>
 
+<ul class="toptab">
+  <li><a href="./index.php?action=CommentEdit&amp;com_id=<{$object->getShow('com_id')}>"><{$smarty.const._AD_LEGACY_LANG_COMMENT_EDIT}></a></li>
+  <li><a href="./index.php?action=CommentDelete&amp;com_id=<{$object->getShow('com_id')}>"><{$smarty.const._AD_LEGACY_LANG_COMMENT_DELETE}></a></li>
+</ul>
+
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACY_LANG_COMMENT_VIEW}></th>

From minahito ＠ users.sourceforge.jp  Wed Nov  8 15:12:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 15:12:10 +0900
Subject: [xoops-cvslog 5690] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061108061210.F2C602AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.8 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.9
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.8	Tue Nov  7 18:56:04 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Wed Nov  8 15:12:10 2006
@@ -1,11 +1,81 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.8 2006/11/07 09:56:04 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.9 2006/11/08 06:12:10 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH."/modules/legacyRender/kernel/Legacy_RenderTarget.class.php";
+require_once XOOPS_ROOT_PATH . "/class/template.php";
+
+/**
+ * @brief The sub-class for Legacy_RenderSystem. 
+ * 
+ * Because XoopsTpl class may be used without Cube's boot, this is declared.
+ */
+class Legacy_XoopsTpl extends XoopsTpl
+{
+	/**
+	 * @private
+	 * If variables having the following key are assigned, converts value with
+	 * htmlspecialchars_decode, and set it to the context for compatibility.
+	 */
+	var $_mContextReserve = array();
+	
+	function Legacy_XoopsTpl()
+	{
+		$this->_mContextReserve = array ('xoops_pagetitle' => 'legacy_pagetitle');
+		parent::XoopsTpl();
+	}
+	
+    function assign($tpl_var, $value = null)
+    {
+		if (is_array($tpl_var)){
+			foreach ($tpl_var as $key => $val) {
+				if ($key != '') {
+					$this->assign($key, $val);
+				}
+			}
+		}
+		else {
+			if ($tpl_var != '') {
+				if (isset($this->_mContextReserve[$tpl_var])) {
+					$root =& XCube_Root::getSingleton();
+					$root->mContext->setAttribute($this->_mContextReserve[$tpl_var], htmlspecialchars_decode($value));
+				}
+				$this->_tpl_vars[$tpl_var] = $value;
+			}
+        }
+	}
+	
+	function assign_by_ref($tpl_var, &$value)
+	{
+		if ($tpl_var != '') {
+			if (isset($this->_mContextReserve[$tpl_var])) {
+				$root =& XCube_Root::getSingleton();
+				$root->mContext->setAttribute($this->_mContextReserve[$tpl_var], htmlspecialchars_decode($value));
+			}
+			$this->_tpl_vars[$tpl_var] =& $value;
+		}
+	}
+	
+	function &get_template_vars($name = null)
+	{
+		if (!isset($name)) {
+			foreach ($this->_mContextReserve as $t_key => $t_value) {
+				$this->_tpl_vars[$t_key] = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$t_value]), ENT_QUOTES);
+			}
+			return parent::get_template_vars($name);
+		}
+		elseif (isset($this->_mContextReserve[$name])) {
+			$root =& XCube_Root::getSingleton();
+			$value = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$name]), ENT_QUOTES);
+		}
+		else {
+			return parent::get_template_vars($name);
+		}
+	}
+}
 
 /**
  * Compatible render system with XOOPS 2 Themes & Templates.
@@ -45,10 +115,8 @@
 	{
 		parent::prepare($controller);
 		
-		require_once XOOPS_ROOT_PATH . "/class/template.php";
-
 		// XoopsTpl default setup
-		$this->mXoopsTpl =& new XoopsTpl();
+		$this->mXoopsTpl =& new Legacy_XoopsTpl();
 		$this->mXoopsTpl->register_function("legacy_notifications_select", "LegacyRender_smartyfunction_notifications_select");
 		$this->mSetupXoopsTpl->call(new XCube_Ref($this->mXoopsTpl));
 
@@ -68,12 +136,13 @@
 		}
 		
    		$this->mXoopsTpl->assign(array('xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES),	//@todo ?????????????
-							'xoops_sitename' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['sitename'], ENT_QUOTES),
-							'xoops_pagetitle' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
-							'xoops_slogan' => htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES),
 							// set JavaScript/Weird, but need extra <script> tags for 2.0.x themes
 							'xoops_js' => '//--></script><script type="text/javascript" src="'.XOOPS_URL.'/include/xoops.js"></script><script type="text/javascript"><!--'
 						));
+						
+		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
 
 		// --------------------------------------
 		// Meta tags
@@ -144,6 +213,10 @@
    		$this->mXoopsTpl->assign('xoops_theme', $themeName);
    		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
    		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
+
+		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
 		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
 			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
@@ -214,6 +287,10 @@
    		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
    		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
 		
+		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
+		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
 			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
 		}
@@ -249,17 +326,17 @@
    		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
    		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
 		
+		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
+		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
+		
 		//
 		// Assign module informations.
 		//
 		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
 			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
 			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
-			                               'xoops_dirname' => $xoopsModule->getShow('dirname'),
-										   'xoops_pagetitle' => $xoopsModule->getShow('name')));
-		}
-		else {
-			$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->mXoopsConfig['slogan'], ENT_QUOTES));
+			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
 		}
 		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {

From minahito ＠ users.sourceforge.jp  Wed Nov  8 15:12:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 15:12:17 +0900
Subject: [xoops-cvslog 5691] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061108061217.958B42AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.15 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.16
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.15	Tue Nov  7 16:54:06 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Wed Nov  8 15:12:17 2006
@@ -402,6 +402,10 @@
 		}
 		
 		$this->_mStrategy->setupModuleContext($this->mRoot->mContext, $dirname);
+		
+		if ($this->mRoot->mContext->mModule != null) {
+			$this->mRoot->mContext->setAttribute('legacy_pagetitle', $this->mRoot->mContext->mModule->mXoopsModule->get('name'));
+		}
 	}
 	
 	function _processModule()
@@ -609,6 +613,10 @@
 		$this->mRoot->mContext->setThemeName($this->mRoot->mContext->mXoopsConfig['theme_set']);
 	    $this->mRoot->mContext->mXoopsConfig['language'] = $this->mRoot->mLanguageManager->getLanguage();
 		
+		$this->mRoot->mContext->setAttribute('legacy_sitename', $this->mRoot->mContext->mXoopsConfig['sitename']);
+		$this->mRoot->mContext->setAttribute('legacy_pagetitle', $this->mRoot->mContext->mXoopsConfig['slogan']);
+		$this->mRoot->mContext->setAttribute('legacy_slogan', $this->mRoot->mContext->mXoopsConfig['slogan']);
+		
 		$GLOBALS['xoopsConfig'] = $this->mRoot->mContext->mXoopsConfig; // Compatiblity for 2.0.x
 		$GLOBALS['config_handler'] =& $configHandler;
 	}

From minahito ＠ users.sourceforge.jp  Wed Nov  8 15:17:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 15:17:17 +0900
Subject: [xoops-cvslog 5692] CVS update: xoops2jp/html/include
Message-ID: <20061108061717.546722AC031@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.4 xoops2jp/html/include/functions.php:1.2.8.19.2.5
--- xoops2jp/html/include/functions.php:1.2.8.19.2.4	Mon Oct 23 20:23:00 2006
+++ xoops2jp/html/include/functions.php	Wed Nov  8 15:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.4 2006/10/23 11:23:00 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.5 2006/11/08 06:17:17 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -790,4 +790,11 @@
     return trim($text);
 }
 
+if (!function_exists('htmlspecialchars_decode')) {
+	function htmlspecialchars_decode($text)
+	{
+		return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
+	}
+}
+
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov  8 15:41:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 15:41:22 +0900
Subject: [xoops-cvslog 5693] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061108064122.70F3D2AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.6	Mon Nov  6 18:39:39 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Wed Nov  8 15:41:22 2006
@@ -5,7 +5,7 @@
 <meta http-equiv="content-language" content="<{$xoops_langcode}>" />
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
-<title><{$xoops_sitename}> : <{$smarty.const._CPHOME}> : <{$xoops_pagetitle}></title>
+<title><{$legacy_sitename|escape}> : <{$smarty.const._CPHOME}> : <{$legacy_pagetitle|escape}></title>
 <script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
 <{stylesheet file=style.css}>
 <{stylesheet file=module.css}>

From minahito ＠ users.sourceforge.jp  Wed Nov  8 15:41:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 15:41:37 +0900
Subject: [xoops-cvslog 5694] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061108064137.4BFD92AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9 xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.10
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.9	Mon Nov  6 18:39:50 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php	Wed Nov  8 15:41:37 2006
@@ -168,8 +168,9 @@
 		//
 		// Other attributes
 		//
-		$this->mSmarty->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getXoopsConfig('sitename'), ENT_QUOTES));
-		$this->mSmarty->assign('xoops_pagetitle', $moduleObject->mXoopsModule->getShow('name'));
+		$this->mSmarty->assign('legacy_sitename', $this->mController->mRoot->mContext->getAttribute('legacy_sitename'));
+		$this->mSmarty->assign('legacy_pagetitle', $this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'));
+		$this->mSmarty->assign('legacy_slogan', $this->mController->mRoot->mContext->getAttribute('legacy_slogan'));
 		
 		//
 		// Theme rendering

From minahito ＠ users.sourceforge.jp  Wed Nov  8 17:42:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 17:42:33 +0900
Subject: [xoops-cvslog 5695] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061108084234.0129D2AC0FF@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_LanguageManager.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_LanguageManager.class.php:1.1.2.2 xoops2jp/html/modules/legacy/kernel/Legacy_LanguageManager.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/kernel/Legacy_LanguageManager.class.php:1.1.2.2	Sun Oct 15 01:40:55 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_LanguageManager.class.php	Wed Nov  8 17:42:33 2006
@@ -142,7 +142,7 @@
 	{
 		$fileName = XOOPS_MODULE_PATH . "/" . $dirname . "/language/" . $this->mLanguageName . "/" . $fileBodyName . ".php";
 		if (!$this->_loadFile($fileName)) {
-			$fileName = XOOPS_ROOT_PATH . "/" . $dirname . "/language/english/" . $fileBodyName . ".php";
+			$fileName = XOOPS_MODULE_PATH . "/" . $dirname . "/language/english/" . $fileBodyName . ".php";
 			$this->_loadFile($fileName);
 		}
 	}

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:24:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:24:17 +0900
Subject: [xoops-cvslog 5696] CVS update: xoops2jp/html/language/english
Message-ID: <20061108092417.CF1CA2AC07C@users.sourceforge.jp>

Index: xoops2jp/html/language/english/notification.php
diff -u xoops2jp/html/language/english/notification.php:1.2.8.1 xoops2jp/html/language/english/notification.php:1.2.8.1.2.1
--- xoops2jp/html/language/english/notification.php:1.2.8.1	Wed Oct 19 02:21:15 2005
+++ xoops2jp/html/language/english/notification.php	Wed Nov  8 18:24:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification.php,v 1.2.8.1 2005/10/18 17:21:15 minahito Exp $
+// $Id: notification.php,v 1.2.8.1.2.1 2006/11/08 09:24:17 minahito Exp $
 
 // RMV-NOTIFY
 
@@ -9,7 +9,9 @@
 define ('_NOT_UPDATENOW', 'Update Now');
 define ('_NOT_UPDATEOPTIONS', 'Update Notification Options');
 
+define ('_NOT_CANCEL', 'Cancel');
 define ('_NOT_CLEAR', 'Clear');
+define ('_NOT_DELETE', 'Delete');
 define ('_NOT_CHECKALL', 'Check All');
 define ('_NOT_MODULE', 'Module');
 define ('_NOT_CATEGORY', 'Category');

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:26:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:26:08 +0900
Subject: [xoops-cvslog 5697] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061108092608.C83D52AC14B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.4 xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.5
--- xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.4	Thu Oct 19 23:22:23 2006
+++ xoops2jp/html/modules/legacy/language/japanese/admin.php	Wed Nov  8 18:26:08 2006
@@ -21,7 +21,6 @@
 define('_AD_LEGACY_ERROR_GROUPID', "最低１グループ以上にアクセス権限を与えてください");
 define('_AD_LEGACY_ERROR_IMG_FILESIZE', "画像の最大ファイルサイズは{0}バイトです");
 define('_AD_LEGACY_ERROR_IMG_SIZE', "画像の最大サイズは {0} x {1} です");
-define('_AD_LEGACY_ERROR_IMGCAT_READ_GROUPS', "最低１グループ以上にアクセス権限を与えてください");
 define('_AD_LEGACY_ERROR_INSTALLATION_MODULE_FAILURE', "{0} モジュールのインストールに失敗しました");
 define('_AD_LEGACY_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_LEGACY_ERROR_MIN', "{0}は{1}以上の数値を指定して下さい");

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:29:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:29:35 +0900
Subject: [xoops-cvslog 5698] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061108092935.7FB362AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/admin.php
diff -u xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.3 xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.4
--- xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.3	Thu Oct 19 18:01:06 2006
+++ xoops2jp/html/modules/legacy/language/english/admin.php	Wed Nov  8 18:29:35 2006
@@ -305,7 +305,6 @@
 define('_MD_AM_MAILFROMNAMEDESC', "");
 define('_MD_AM_MAILFROMUID', "FROM user");
 define('_MD_AM_MAILFROMUIDDESC', "When the system sends a private message, which user should appear to have sent it?");
-define('_MD_AM_METAFOOTER', "Metadata");
 define('_MD_AM_MINSEARCH', "Minimum keyword length");
 define('_MD_AM_MINSEARCHDSC', "Enter the minimum keyword length that users are required to enter to perform search");
 define('_MD_AM_MODCACHE', "Module-wide Cache");
@@ -344,7 +343,6 @@
 define('_MD_AM_SMTPUSERDESC', "Username to connect to an SMTP host with SMTPAuth.");
 define('_MD_AM_SSLLINK', "URL where SSL login page is located");
 define('_MD_AM_SSLPOST', "SSL Post variable name");
-define('_MD_AM_SSLPOSTDSC', "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess.");
 define('_MD_AM_STARTPAGE', "Module for your start page");
 define('_MD_AM_THEMEFILE', "Update module template .html files from themes/your theme/templates directory?");
 define('_MD_AM_THEMEFILEDSC', "If this option is enabled, module template .html files will be updated automatically if there are newer files under the themes/your theme/templates directory for the current theme. This should be turned off once the site goes public.");
@@ -354,7 +352,6 @@
 define('_MD_AM_USEGZIP', "Use gzip compression?");
 define('_MD_AM_USEMYSESS', "Use custom session");
 define('_MD_AM_USEMYSESSDSC', "Select yes to customise session related values.");
-define('_MD_AM_USERSETTINGS', "User Settings");
 define('_MD_AM_USESSL', "Use SSL for login?");
 define('_MD_AM_YES', "Yes");
 

From tom_g3x ＠ users.sourceforge.jp  Wed Nov  8 18:36:42 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed,  8 Nov 2006 18:36:42 +0900
Subject: [xoops-cvslog 5699] CVS update: xoops2jp/docs
Message-ID: <20061108093642.4D11E2AC07C@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.html
diff -u xoops2jp/docs/INSTALL.html:1.1.8.1 xoops2jp/docs/INSTALL.html:1.1.8.1.2.1
--- xoops2jp/docs/INSTALL.html:1.1.8.1	Sat Feb  4 18:31:01 2006
+++ xoops2jp/docs/INSTALL.html	Wed Nov  8 18:36:42 2006
@@ -1,10 +1,10 @@
 <html>
 <head>
-  <title>Xoops Install Guide</title>
+  <title>Xoops Cube Install Guide</title>
   <meta name="keywords" content="XOOPS docs" />
   <meta name="description" content="XOOPS" />
   <style>
-    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3 }
+    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3; }
     .error { color: #CC3333; font-weight: bold; }
     UL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
     OL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
@@ -16,9 +16,9 @@
     .additions { color: #008800; }
     .deletions { color: #880000; }
     
-	.header { padding: 10px; padding-top: 0px }
+	.header { padding: 10px; padding-top: 0px; }
     .page { background-color: #FFFFFF; padding: 10px; border: 1px inset;}
-	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC }
+	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC; }
 	.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
 
     .revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
@@ -38,7 +38,7 @@
 <h4>First time installation</h4>
 <br />
 <h4>Preface:</h4>
-Before begining the install process, we (the XOOPS team) ask that you have a good understanding of how to install and support server/hosted based software.  As with anything in life, there's no easy answer or way.  Sinice XOOPS is server based, it's not as easy to install as normal desktop software which in itself can be daunting to install so, please be familiar with setting up and installing the software listed below.  Be familiar with how to configure CGI scripts and HTTP server software.  It can easily be demonstrated that 80% of our support questions wind up being improper configurations with the server componenets or two pieces of software conflict. No two servers are configured alike.<br />
+Before begining the install process, we (the XOOPS Cube team) ask that you have a good understanding of how to install and support server/hosted based software.  As with anything in life, there's no easy answer or way.  Sinice XOOPS is server based, it's not as easy to install as normal desktop software which in itself can be daunting to install so, please be familiar with setting up and installing the software listed below.  Be familiar with how to configure CGI scripts and HTTP server software.  It can easily be demonstrated that 80% of our support questions wind up being improper configurations with the server componenets or two pieces of software conflict. No two servers are configured alike.<br />
 <br />
 <br />
 To install XOOPS for the first time, you'll need to have the minimum following server software pre-installed:<br />
@@ -48,7 +48,7 @@
 <br />
 Before starting the install, be sure to have:<br />
 <div class="indent">* Setup the HTTP, PHP and database server properly.<br />
-* Create a database for your <a href="http://www.xoops.org">XOOPS 2</a> installation <br />
+* Create a database for your <a href="http://xoopscube.org">XOOPS Cube Legacy</a> installation <br />
 <div class="indent">(Have your hosting company create one if you can't. The install script does provide this capability with the proper privileges).<br />
 </div>* A user account with the proper database permissions.<br />
 * The ability to set the following directories and files world writeable: uploads/, cache/ and templates_c/ and the file mainfile.php<br />
@@ -56,15 +56,15 @@
 <br />
 <br />
 <h4>Installing locally</h4>
-If your running a local environment for development or testing, make sure that you have the previous requirements met.  Once this is done, copy the contents of the HTML directory (from the XOOPS 2 distribution file or CVS) to the root document path of your web environment. Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
+If your running a local environment for development or testing, make sure that you have the previous requirements met.  Once this is done, copy the contents of the HTML directory (from the XOOPS Cube Legacy distribution file or CVS) to the root document path of your web environment. Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
 <br />
 <h4>Installing on a hosted platform</h4>
-If your running in a hosted environment, unpack the XOOPS 2 files locally or on the server if you have telnet or SSH access. Once you done this, make sure to move or copy all XOOPS 2 files from the HTML directory to your root web directory (your provider usually provides this location with directions).  Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
+If your running in a hosted environment, unpack the XOOPS Cube Legacy files locally or on the server if you have telnet or SSH access. Once you done this, make sure to move or copy all XOOPS Cube Legacy files from the HTML directory to your root web directory (your provider usually provides this location with directions).  Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
 <br />
 <h4>Continuing the install</h4>
 <img src="images/install001.gif" /><br />
 <br />
-After performing the above procedures, your ready to continue installing XOOPS 2 with the Install Wizard.  The first screen in the install Wizard takes you to will be the welcome screen. <br />
+After performing the above procedures, your ready to continue installing XOOPS Cube Legacy with the Install Wizard.  The first screen in the install Wizard takes you to will be the welcome screen. <br />
 <br />
 <img src="images/install002.gif" /><br />
 <br />
@@ -100,7 +100,7 @@
 <br />
 If your in a hosted environment with out the proper access to create databases, please check with your provider for help in getting a database.  If your provider (or you) created the database, all  lights should be green.  If you get a red light stating the DB does not exist and your user name has the ability to create databases, then click next and the install Wizard will attempt to create the database for you.  If your user id does not have the rights to create a database, please correct this and continue the install.  The next two screens are informational on trying to create and access the database.  Click Next or Back depending on the Wizard screen.<br />
 <br />
-After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Forums</a> for further assistance. <br />
+After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">FAQ</a> or <a href="http://www.xoopscube.org">XOOPS Cube Forums</a> for further assistance. <br />
 <br />
 <img src="images/install011.gif" /><br />
 <br />
@@ -110,11 +110,11 @@
 <br />
 <img src="images/install024.gif" /><br />
 <br />
-Please be careful here and write down or remember your administrative password. You'll need this after the install to continue setting up your XOOPS 2 site.  Once you have completed inputting the correct information, click Next to continue.   * Note, try to refrain from using names with spaces for the Admin name. *<br />
+Please be careful here and write down or remember your administrative password. You'll need this after the install to continue setting up your XOOPS Cube site.  Once you have completed inputting the correct information, click Next to continue.   * Note, try to refrain from using names with spaces for the Admin name. *<br />
 <br />
 The next screen is informational. If all the lights are green, click Next to continue.
 <br /><br />
 <h4>Congratulations!</h4>
-Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Forums</a> for further assistance.</div>
+Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Cube Forums</a> for further assistance.</div>
 </body>
 </html>
Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.2 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.3
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.2	Tue Nov  7 16:39:11 2006
+++ xoops2jp/docs/INSTALL.ja.html	Wed Nov  8 18:36:42 2006
@@ -5,7 +5,7 @@
   <meta name="keywords" content="XOOPS Cube docs" />
   <meta name="description" content="XOOPS Cube" />
   <style>
-    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3 }
+    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3; }
     .error { color: #CC3333; font-weight: bold; }
     UL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
     OL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
@@ -17,9 +17,9 @@
     .additions { color: #008800; }
     .deletions { color: #880000; }
     
-	.header { padding: 10px; padding-top: 0px }
+	.header { padding: 10px; padding-top: 0px; }
     .page { background-color: #FFFFFF; padding: 10px; border: 1px inset;}
-	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC }
+	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC; }
 	.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
 
     .revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
@@ -61,7 +61,7 @@
 <p>インストールを始める前に次の準備をしてください</p>
 <div class="indent">
 * HTTPサーバ、PHP、データベースサーバを適切にセットアップする。<br />
-*  <a href="http://XOOPS Cubecube.jp">XOOPS Cube Legacy</a> をインストールするデータベースを作成する。<br />
+*  <a href="http://xoopscube.org">XOOPS Cube Legacy</a> をインストールするデータベースを作成する。<br />
 <div class="indent">
 （もし、作成する権限がない場合は、サーバ管理者かサーバホスティング会社に依頼してください。）<br />
 </div>
@@ -256,7 +256,7 @@
 <p>
 お疲れさまでした、これでXOOPS Cubeのインストール作業はすべて完了しました。
 <u><b>サイト</b></u>に貼られた「ここ」リンクをクリックして、インストールしたXOOPS Cubeのサイトにアクセスし、この管理者ユーザ名でログインし、洗練されたポータルサイトを構築してください。
-もし、このガイドに従ってもインストールできない場合は <a href="http://jp.XOOPS Cube.org/wiki/pukiwiki.php?FrontPage">XOOPS Cubeサイトにあるマニュアル・FAQ</a> で調べたり、 
+もし、このガイドに従ってもインストールできない場合は <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">XOOPS Cubeサイトにあるマニュアル・FAQ</a> で調べたり、 
 <a href="http://xoopscube.jp/">XOOPS Cube日本語公式サイト</a>のフォーラムで開発チームのメンバーやたくさんのXOOPS Cubeユーザーに敬意を払って質問すれば、
 きっとインストールを成功させる方法を見つけられることでしょう。
 </p>

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:54:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:54:18 +0900
Subject: [xoops-cvslog 5700] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061108095418.C6A902AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.5 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.6
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.5	Thu Nov  2 16:37:27 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Wed Nov  8 18:54:18 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.01;
+$modversion['version'] = 2.02;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:54:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:54:25 +0900
Subject: [xoops-cvslog 5701] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061108095425.E38832AC07D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_result.html
diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_result.html:1.1.2.1 xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_result.html:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_result.html:1.1.2.1	Sat Oct 14 23:55:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_result.html	Wed Nov  8 18:54:25 2006
@@ -4,9 +4,9 @@
   <{/if}>
   <{if is_array($message)}>
     <{foreach item=msg from=$message}>
-      <{$msg|escape}><br/>
+      <{$msg}><br/>
     <{/foreach}>
   <{else}>
-    <{$message|escape}>
+    <{$message}>
   <{/if}>
 </div>

From minahito ＠ users.sourceforge.jp  Wed Nov  8 18:54:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 18:54:26 +0900
Subject: [xoops-cvslog 5702] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061108095426.230D02AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoops_result.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoops_result.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_xoops_result.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_xoops_result.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoops_result.html	Wed Nov  8 18:54:26 2006
@@ -4,9 +4,9 @@
   <{/if}>
   <{if is_array($message)}>
     <{foreach item=msg from=$message}>
-      <{$msg|escape}><br/>
+      <{$msg}><br/>
     <{/foreach}>
   <{else}>
-    <{$message|escape}>
+    <{$message}>
   <{/if}>
 </div>

From minahito ＠ users.sourceforge.jp  Wed Nov  8 19:11:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 19:11:22 +0900
Subject: [xoops-cvslog 5703] CVS update: xoops2jp/html/kernel
Message-ID: <20061108101122.775F82AC096@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.14 xoops2jp/html/kernel/module.php:1.2.8.14.2.1
--- xoops2jp/html/kernel/module.php:1.2.8.14	Wed Aug  9 18:34:51 2006
+++ xoops2jp/html/kernel/module.php	Wed Nov  8 19:11:22 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.14 2006/08/09 09:34:51 minahito Exp $
+// $Id: module.php,v 1.2.8.14.2.1 2006/11/08 10:11:22 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -253,7 +253,7 @@
 	 */
     function getRenderedVersion()
     {
-		return $this->getVar('version') / 100;
+		return $this->get('version') / 100;
 	}
 
 	/**
@@ -281,6 +281,15 @@
 		return null;
 	}
 	
+	/**
+	 * @return bool
+	 */
+	function hasNeedUpdate()
+	{
+		$info =& $this->getInfo();
+		return ($this->get('version') < intval($info['version'] * 100));
+	}
+	
     /**#@+
      * For backward compatibility only!
      * @deprecated

From minahito ＠ users.sourceforge.jp  Wed Nov  8 19:11:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 19:11:52 +0900
Subject: [xoops-cvslog 5704] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061108101152.A1BD42AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/module_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.4	Sun Oct 15 21:59:55 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_list.html	Wed Nov  8 19:11:52 2006
@@ -52,7 +52,14 @@
       <td class="legacy_list_id"><{$module->getShow('mid')}></td>
       <td class="legacy_list_image"><img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getShow('name')}>" /><br />
         <input type="text" size="24" name="name[<{$module->getShow('mid')}>]" value="<{$module->getShow('name')}>" /></td>
-      <td class="legacy_list_order"><{$module->getRenderedVersion()}></td>
+      <td class="legacy_list_order">
+        <{if $module->hasNeedUpdate()}>
+          <strong class="legacy_module_versionMsg"><{$module->getRenderedVersion()}></strong>
+          <a href="index.php?action=ModuleUpdate&amp;dirname=<{$module->getShow('dirname')}>"><img src="<{"icons/update.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_UPDATE}>" title="<{$smarty.const._AD_LEGACY_LANG_UPDATE}>" /></a>
+        <{else}>
+          <{$module->getRenderedVersion()}>
+        <{/if}>
+      </td>
       <td class="legacy_list_date"><{$module->get('last_update')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_select">
         <input type="text" size="4" maxlength="4" name="weight[<{$module->getShow('mid')}>]" value="<{$module->getShow('weight','e')}>" class=legacy_list_number />

From minahito ＠ users.sourceforge.jp  Wed Nov  8 19:14:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 19:14:42 +0900
Subject: [xoops-cvslog 5705] CVS update: xoops2jp/html/include
Message-ID: <20061108101442.AAF862AC07D@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.5 xoops2jp/html/include/functions.php:1.2.8.19.2.6
--- xoops2jp/html/include/functions.php:1.2.8.19.2.5	Wed Nov  8 15:17:17 2006
+++ xoops2jp/html/include/functions.php	Wed Nov  8 19:14:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.5 2006/11/08 06:17:17 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.6 2006/11/08 10:14:42 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -93,6 +93,9 @@
 	print $renderTarget->getResult();
 }
 
+/**
+ * @deprecated Don't use.
+ */
 function xoops_result($message, $title='')
 {
 	$root =& XCube_Root::getSingleton();

From minahito ＠ users.sourceforge.jp  Wed Nov  8 19:53:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 19:53:39 +0900
Subject: [xoops-cvslog 5706] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061108105339.23DAF2AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.2	Sun Oct 15 00:51:25 2006
+++ xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php	Wed Nov  8 19:53:39 2006
@@ -189,7 +189,10 @@
 	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
 	{
 		$renderer->setTemplateName("help.html");
-		$renderer->setAttribute('module', $this->mModuleObject);
+		
+		$module =& Legacy_Utils::createModule($this->mModuleObject);
+		
+		$renderer->setAttribute('module', $module);
 		$renderer->setAttribute('contents', $this->mContents);
 	}
 

From minahito ＠ users.sourceforge.jp  Wed Nov  8 19:53:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  8 Nov 2006 19:53:49 +0900
Subject: [xoops-cvslog 5707] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061108105349.7F3F52AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/help.html
diff -u xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.1 xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.1	Sat Oct 14 23:55:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/help.html	Wed Nov  8 19:53:49 2006
@@ -1,10 +1,10 @@
 <div class="adminnavi">
-  <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.adminindex|escape}>"><{$module->getShow('name')}></a>
+  <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a>
   &raquo;&raquo; <span class="adminnaviTitle"><{$smarty.const._HELP}></span>
 </div>
 
 <h3 class="admintitle"><{$smarty.const._HELP}>
- <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.adminindex|escape}>"> ( <{$module->getShow('name')}> )</a>
+ <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a>
 </h3>
 
 <div class="help"><{$contents}></div>

From tom_g3x ＠ users.sourceforge.jp  Wed Nov  8 20:59:16 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed,  8 Nov 2006 20:59:16 +0900
Subject: [xoops-cvslog 5708] CVS update:
	xoops2jp/html/modules/legacy/admin/theme/icons
Message-ID: <20061108115916.0D96C2AC00F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/icons/upgrade.gif

From tom_g3x ＠ users.sourceforge.jp  Wed Nov  8 20:59:52 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed,  8 Nov 2006 20:59:52 +0900
Subject: [xoops-cvslog 5709] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061108115952.1B1B52AC00F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.5 xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.6
--- xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.5	Wed Nov  8 18:26:08 2006
+++ xoops2jp/html/modules/legacy/language/japanese/admin.php	Wed Nov  8 20:59:51 2006
@@ -219,6 +219,7 @@
 define('_AD_LEGACY_LANG_TOPPAGE', "トップページ");
 define('_AD_LEGACY_LANG_UNINSTALL', "アンインストール");
 define('_AD_LEGACY_LANG_UPDATE', "アップデート");
+define('_AD_LEGACY_LANG_UPGRADE', "アップグレード");
 define('_AD_LEGACY_LANG_VERSION', "バージョン");
 define('_AD_LEGACY_LANG_VISIBLE', "可視");
 define('_AD_LEGACY_LANG_WEIGHT', "並び順");

From tom_g3x ＠ users.sourceforge.jp  Wed Nov  8 20:59:52 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed,  8 Nov 2006 20:59:52 +0900
Subject: [xoops-cvslog 5710] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061108115952.41ECA2AC050@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/module_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.5	Wed Nov  8 19:11:52 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_list.html	Wed Nov  8 20:59:52 2006
@@ -55,7 +55,7 @@
       <td class="legacy_list_order">
         <{if $module->hasNeedUpdate()}>
           <strong class="legacy_module_versionMsg"><{$module->getRenderedVersion()}></strong>
-          <a href="index.php?action=ModuleUpdate&amp;dirname=<{$module->getShow('dirname')}>"><img src="<{"icons/update.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_UPDATE}>" title="<{$smarty.const._AD_LEGACY_LANG_UPDATE}>" /></a>
+          <a href="index.php?action=ModuleUpdate&amp;dirname=<{$module->getShow('dirname')}>"><img src="<{"icons/upgrade.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_UPGRADE}>" title="<{$smarty.const._AD_LEGACY_LANG_UPGRADE}>" /></a>
         <{else}>
           <{$module->getRenderedVersion()}>
         <{/if}>

From tom_g3x ＠ users.sourceforge.jp  Wed Nov  8 20:59:52 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed,  8 Nov 2006 20:59:52 +0900
Subject: [xoops-cvslog 5711] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061108115952.650FD2AC00F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/admin.php
diff -u xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.4 xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.5
--- xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.4	Wed Nov  8 18:29:35 2006
+++ xoops2jp/html/modules/legacy/language/english/admin.php	Wed Nov  8 20:59:52 2006
@@ -219,6 +219,7 @@
 define('_AD_LEGACY_LANG_TOPPAGE', "Toppage");
 define('_AD_LEGACY_LANG_UNINSTALL', "Uninstall");
 define('_AD_LEGACY_LANG_UPDATE', "Update");
+define('_AD_LEGACY_LANG_UPGRADE', "Upgrade");
 define('_AD_LEGACY_LANG_VERSION', "Version");
 define('_AD_LEGACY_LANG_VISIBLE', "Visible");
 define('_AD_LEGACY_LANG_WEIGHT', "Weight");

From nobunobu ＠ users.sourceforge.jp  Wed Nov  8 21:26:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  8 Nov 2006 21:26:31 +0900
Subject: [xoops-cvslog 5712] CVS update: xoops2jp/html/modules/legacy/admin
Message-ID: <20061108122631.34DEE2AC050@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/css.php
diff -u xoops2jp/html/modules/legacy/admin/css.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/css.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/css.php:1.1.2.1	Sat Oct 14 23:55:28 2006
+++ xoops2jp/html/modules/legacy/admin/css.php	Wed Nov  8 21:26:31 2006
@@ -1,11 +1,16 @@
 <?php
+$xoopsOption['nocommon']=1;
 
 require_once "../../../mainfile.php";
 
+$root=&XCube_Root::getSingleton();
+$xoopsController=&$root->getController();
+// @todo using private method. 
+$xoopsController->_setupEnvironment();
+
 //
 // @todo Why does this file know Legacy_RenderSystem?
 //
-require_once XOOPS_ROOT_PATH . "/header.php";
 
 function Legacy_modifier_css_theme($string)
 {
@@ -31,7 +36,7 @@
 if (strstr($theme, "..") !== false || strstr($dirname, "..") !== false || strstr($file, "..") !== false) {
 	exit();
 }
-
+require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php';
 $smarty =& new Legacy_AdminSmarty();
 $smarty->register_modifier("theme", "Legacy_modifier_css_theme");
 $smarty->register_function("stylesheet", "Legacy_function_stylesheet");

From minahito ＠ users.sourceforge.jp  Thu Nov  9 00:04:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 00:04:37 +0900
Subject: [xoops-cvslog 5713] CVS update:
	xoops2jp/html/modules/stdCache/language/english/help
Message-ID: <20061108150437.4C4F32AC151@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1 xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.1
--- xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1	Mon Jun  5 18:30:33 2006
+++ xoops2jp/html/modules/stdCache/language/english/help/help.html	Thu Nov  9 00:04:37 2006
@@ -1,20 +1,22 @@
-<h4>Outline</h4>
-<ul>
-  <li>This module adds caching functionality to your site, which can reduce the sever load considerably when your site has a lot of access.</li>
-  <li>However, there still exists some minor problems to be fixed in the future such as the cache exposing contents to those that should not have access.</li>
-  <li>This module enables the function for two types of user group (i.e. guest and registered user groups). Caching contents for other user groups is not available at this time.</li>
-</ul>
-<h4>Cache maintainance using the clear cache block</h4>
-<ul>
-  <li>The clear cache block will invalidate all the cached contents when the block is viewed by a user.</li>
-  <li>We recommend setting the block accessible by the guest users, and the clearance interval to "one day" in block preference, which would then purge all the cached contents once a day.</li>
-  <li>The module might create a large amount of cached files, but it hardly becomes a problem if you use the clear cache block properly as recommended.</li>
-</ul>
-
-<h4>How to set up</h4>
-<ul>
-  <li>Please add the following two lines to the the configuration file, under the [Cube] block.</li>
-  <li>CacheSystem.path=/modules/stdCache/kernel</li>
-  <li>CacheSystem.class=StdRenderCache</li>
-</ul>
+<h4>Standard Cache Module</h4>
+<h5>Summary</h5>
+<p>This module adds the standard cache policy to Legacy System. The policy orders Legacy System to make cache files for every groups except the webmaster group.</p>
 
+<h5>What is this?</h5>
+<p>Legacy System module has contents cache feature for modules and blocks. The cache feature saves the content of their work to files, if cache setting is active. And, if cache files are available, Legacy System prevents the logic and SQL of blocks and modules. That's very powerful but very dangerous, because there is not the cache policy.</p>
+
+<p>For example, if Legacy System makes the cache file for administrators' access, anonymous users may see the cache file having secret informations which only administrators can access. For security, Legacy System should make the cache file for every groups. But, this way makes too many files in your server. In other words, Legacy System doesn't know what you hope.</p>
+
+<p>This module is one of cache modules and adds the standard cache policy to Legacy System. The policy orders Legacy System to make the cache file for every groups except the administrator group.</p>
+
+<p>Therefore, the cache policy of this module makes many files, so you should install "cache clear block". This block is imvisible and deletes all of cache files including extra cache files, with interval timer. </p>
+
+<h5>The cache clear block</h5>
+<h6>Summary</h6>
+<p>This block is imvisible and deletes all of cache files including extra cache files, with interval timer.</p>
+
+<h6>Options</h6>
+  <dl>
+    <dt>Interval timer (min)</dt>
+    <dd>Specify the interval.</dd>
+  </dl>

From minahito ＠ users.sourceforge.jp  Thu Nov  9 00:05:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 00:05:13 +0900
Subject: [xoops-cvslog 5714] CVS update:
	xoops2jp/html/modules/stdCache/language/japanese/help
Message-ID: <20061108150513.4804B2AC153@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/japanese/help/help.html
diff -u xoops2jp/html/modules/stdCache/language/japanese/help/help.html:1.1.2.1 xoops2jp/html/modules/stdCache/language/japanese/help/help.html:removed
--- xoops2jp/html/modules/stdCache/language/japanese/help/help.html:1.1.2.1	Mon Jun  5 18:30:33 2006
+++ xoops2jp/html/modules/stdCache/language/japanese/help/help.html	Thu Nov  9 00:05:13 2006
@@ -1,32 +0,0 @@
-<h4>概要</h4>
-<ul>
-  <li>このモジュールは、あなたのサイトにキャッシュ機能を提供します。キャッシュ機能を有効に使うと、アクセス数の多いサイトでサーバーへの負荷を軽減する事が出来ます。</li>
-  <li>しかし、キャッシュ機能を多用すると、キャッシュファイル数の増大や、隠匿されるべき(管理者用の)情報がキャッシュされて一般ユーザーに公開されてしまう等の問題を起こす可能性があります。</li>
-  <li>このモジュールは、「登録ユーザー」グループのみに所属するユーザーとゲストユーザーに対して個別にキャッシュ機能を働かせます。一般的なサイトでは、この２種類のユーザーグループでアクセスしてくる人が殆どなので、おおむね高い効果が得られるでしょう。
-  </li>
-  <li>その他のグループのユーザーに対してはキャッシュ機能を働かせません。</li>
-  <li>このキャッシュモジュールは、あなたがサイトでグループを独自に作成して、細かくユーザーを分類している場合には効果を発揮できないことがあります。</li>
-</ul>
-
-<h4>キャッシュクリアブロックについて</h4>
-<ul>
-  <li>このブロックは、アクセスを受けるとすべてのキャッシュをクリアします</li>
-  <li>ゲストから閲覧できるようにブロックを設定し、ブロックキャッシュを１日程度に設定して下さい。１日に１度、全キャッシュがクリアされるようになります。</li>
-  <li>XOOPS
-  Cubeのモジュールキャッシュ機能は、URL単位で機能するため、余計なキャッシュファイルが作成される可能性があります。しかし、これはキャッシュクリアブロック等を活用して定期的にキャッシュファイルを全クリアすればほとんど問題になりません。
-  </li>
-</ul>
-
-<h4>設定方法</h4>
-<p>設定ファイルの[Cube]ブロック下に以下の２行を記述して下さい</p>
-<ul>
-  <li>CacheSystem.path=/modules/stdCache/kernel</li>
-  <li>CacheSystem.class=StdRenderCache</li>
-</ul>
-
-<h4>チューンナップについて</h4>
-<ul>
-  <li>このモジュールはチューンナップ項目を持ちません</li>
-  <li>より強力なキャッシュやきめ細かいキャッシュが必要な場合は、他のキャッシュモジュールを探してみましょう</li>
-  <li>あなたのサイトに適切なキャッシュモジュールをセッティングして、より軽いサイトを目指してみましょう</li>
-</ul>

From tom_g3x ＠ users.sourceforge.jp  Thu Nov  9 00:42:45 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  9 Nov 2006 00:42:45 +0900
Subject: [xoops-cvslog 5715] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061108154245.F29B02AC0BD@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_comment.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment.html	Thu Nov  9 00:42:45 2006
@@ -43,7 +43,7 @@
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
-    <{elseif $xoops_isuser == true || $anon_canpost == true}>
+    <{elseif $xoops_isuser == true || $com_anonpost == true}>
       <td class="even"></td>
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>

From nobunobu ＠ users.sourceforge.jp  Thu Nov  9 12:45:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu,  9 Nov 2006 12:45:08 +0900
Subject: [xoops-cvslog 5716] CVS update: xoops2jp/html
Message-ID: <20061109034508.192402AC07F@users.sourceforge.jp>

Index: xoops2jp/html/image.php
diff -u xoops2jp/html/image.php:1.2.8.2 xoops2jp/html/image.php:1.2.8.2.2.1
--- xoops2jp/html/image.php:1.2.8.2	Mon Sep 25 19:34:02 2006
+++ xoops2jp/html/image.php	Thu Nov  9 12:45:07 2006
@@ -1,7 +1,7 @@
 <?php
 
 
-// $Id: image.php,v 1.2.8.2 2006/09/25 10:34:02 tom_g3x Exp $
+// $Id: image.php,v 1.2.8.2.2.1 2006/11/09 03:45:07 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -27,6 +27,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
+// Disable image content invalid rewriting by mbstring
+if (function_exists('mb_http_output')) {
+    mb_http_output('pass');
+}
+
 $image_id = isset ($_GET['id']) ? intval($_GET['id']) : 0;
 if ($image_id > 0) {
 	include './mainfile.php';

From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:14:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:14:35 +0900
Subject: [xoops-cvslog 5717] CVS update:
	xoops2jp/html/modules/stdCache/language/japanese
Message-ID: <20061109051435.6C1912AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/stdCache/language/japanese/modinfo.php:1.1.2.2 xoops2jp/html/modules/stdCache/language/japanese/modinfo.php:1.1.2.2.2.1
--- xoops2jp/html/modules/stdCache/language/japanese/modinfo.php:1.1.2.2	Fri Jan  6 12:05:13 2006
+++ xoops2jp/html/modules/stdCache/language/japanese/modinfo.php	Thu Nov  9 14:14:35 2006
@@ -1,7 +1,7 @@
 <?php
 
 define("_MI_STDCACHE_NAME","標準キャッシュモジュール");
-define("_MI_STDCACHE_NAME_DESC","標準的なキャッシュ機能を提供するモジュール。インストールする必要はありません。");
+define("_MI_STDCACHE_NAME_DESC","標準的なキャッシュポリシーを Legacy System モジュールに提供します");
 
 define("_MI_STDCACHE_BLOCK_CACHECLEAR", "キャッシュクリアブロック");
 

From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:14:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:14:35 +0900
Subject: [xoops-cvslog 5718] CVS update:
	xoops2jp/html/modules/stdCache/language/english
Message-ID: <20061109051435.91CB02AC0C1@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/modinfo.php
diff -u xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.3 xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.3.2.1
--- xoops2jp/html/modules/stdCache/language/english/modinfo.php:1.1.2.3	Wed Aug  9 18:38:43 2006
+++ xoops2jp/html/modules/stdCache/language/english/modinfo.php	Thu Nov  9 14:14:35 2006
@@ -1,7 +1,7 @@
 <?php
 
 define("_MI_STDCACHE_NAME","Cache");
-define("_MI_STDCACHE_NAME_DESC","This module gives standard cache feature to your site. You don't need to install this.");
+define("_MI_STDCACHE_NAME_DESC","Adds the standarc cache policy to Legacy System.");
 
 define("_MI_STDCACHE_BLOCK_CACHECLEAR", "Clear cache block");
 

From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:14:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:14:51 +0900
Subject: [xoops-cvslog 5719] CVS update:
	xoops2jp/html/modules/stdCache/language/english/help/images
Message-ID: <20061109051451.A13BA2AC084@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:14:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:14:55 +0900
Subject: [xoops-cvslog 5720] CVS update:
	xoops2jp/html/modules/stdCache/language/english/help/images
Message-ID: <20061109051455.072362AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help/images/index.html
diff -u /dev/null xoops2jp/html/modules/stdCache/language/english/help/images/index.html:1.1.2.1
--- /dev/null	Thu Nov  9 14:14:54 2006
+++ xoops2jp/html/modules/stdCache/language/english/help/images/index.html	Thu Nov  9 14:14:54 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/stdCache/language/english/help/images/cacheclear_block_option.png

From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:15:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:15:06 +0900
Subject: [xoops-cvslog 5721] CVS update:
	xoops2jp/html/modules/stdCache/language/english/help
Message-ID: <20061109051506.4A7BA2AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.1 xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.2
--- xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.1	Thu Nov  9 00:04:37 2006
+++ xoops2jp/html/modules/stdCache/language/english/help/help.html	Thu Nov  9 14:15:06 2006
@@ -13,9 +13,11 @@
 
 <h5>The cache clear block</h5>
 <h6>Summary</h6>
-<p>This block is imvisible and deletes all of cache files including extra cache files, with interval timer.</p>
+<p>This block is <strong>imvisible</strong> and deletes all of cache files including extra cache files, with interval timer.</p>
 
 <h6>Options</h6>
+<p><img src="<{'cacheclear_block_option.png'|helpimage}>" /></p>
+
   <dl>
     <dt>Interval timer (min)</dt>
     <dd>Specify the interval.</dd>

From minahito ＠ users.sourceforge.jp  Thu Nov  9 14:46:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 14:46:39 +0900
Subject: [xoops-cvslog 5722] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061109054639.87D2C2AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.9 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.9	Thu Nov  2 18:57:44 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Thu Nov  9 14:46:39 2006
@@ -337,28 +337,40 @@
 		// Search preference
 		//
 		if(isset($this->mXoopsModule->modinfo['config'])&&count($this->mXoopsModule->modinfo['config'])>0) {
-			$configInfos=array();
-			foreach($this->mXoopsModule->modinfo['config'] as $config) {
-				if(isset($config['title']))
-					$configInfos[]=@constant($config['title']);
-				if(isset($config['description']))
-					$configInfos[]=@constant($config['description']);
-				if(isset($config['options'])&&count($config['options'])>0) {
-					foreach($config['options'] as $key=>$val) {
-						$configInfos[]=$key;
-					}
-				}
-			}
-
-			$findFlag=true;
+			$findFlag = false;
 			foreach($searchArgs->getKeywords() as $word) {
-				$findFlag&=(stristr(implode(" ",$configInfos),$word)!==false);
+				if (stristr(_PREFERENCES, $word) !== false) {
+					$root =& XCube_Root::getSingleton();
+					$searchArgs->addRecord($this->mXoopsModule->getVar('name'), $root->mController->getPreferenceEditUrl($this->mXoopsModule), _PREFERENCES);
+					$findFlag = true;
+					break;
+				}
 			}
-				
-			if($findFlag) {
-				$searchArgs->addRecord($this->mXoopsModule->getVar('name'),
-				                  XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&amp;confmod_id='.$this->mXoopsModule->getVar('mid'),
-				                  _PREFERENCES );
+			
+			if ($findFlag) {
+				$configInfos=array();
+				foreach($this->mXoopsModule->modinfo['config'] as $config) {
+					if(isset($config['title']))
+						$configInfos[]=@constant($config['title']);
+					if(isset($config['description']))
+						$configInfos[]=@constant($config['description']);
+					if(isset($config['options'])&&count($config['options'])>0) {
+						foreach($config['options'] as $key=>$val) {
+							$configInfos[]=$key;
+						}
+					}
+				}
+	
+				$findFlag=true;
+				foreach($searchArgs->getKeywords() as $word) {
+					$findFlag&=(stristr(implode(" ",$configInfos),$word)!==false);
+				}
+					
+				if($findFlag) {
+					$searchArgs->addRecord($this->mXoopsModule->getVar('name'),
+					                  XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&amp;confmod_id='.$this->mXoopsModule->getVar('mid'),
+					                  _PREFERENCES );
+				}
 			}
 		}
 		
@@ -405,24 +417,37 @@
 		// Search help
 		//
 		if ($this->mXoopsModule->hasHelp()) {
-			$root =& XCube_Root::getSingleton();
-			$language = $root->mContext->getXoopsConfig('language');
-			$helpfile = $this->mXoopsModule->getHelp();
-			$dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
-
-			if (!file_exists($dir . "/" . $helpfile)) {
-				$dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
-					if (!file_exists($dir . "/" . $helpfile)) {
-						return;
-					}
+			$findFlag = false;
+			
+			foreach($searchArgs->getKeywords() as $word) {
+				if (stristr(_HELP, $word) !== false) {
+					$root =& XCube_Root::getSingleton();
+					$searchArgs->addRecord($this->mXoopsModule->getVar('name'), $root->mController->getHelpViewUrl($this->mXoopsModule), _HELP);
+					$findFlag = true;
+					break;
+				}
 			}
-			$lines = file($dir . "/" . $helpfile);
-			foreach ($lines as $line) {
-				foreach($searchArgs->getKeywords() as $word) {
-					if (stristr($line, $word) !== false) {
-						$url = XOOPS_MODULE_URL . "/legacy/admin/index.php?action=Help&amp;dirname=" . $this->mXoopsModule->getVar('dirname');
-						$searchArgs->addRecord($this->mXoopsModule->getVar('name'), $url, _HELP);
-						return;
+			
+			if (!$findFlag) {
+				$root =& XCube_Root::getSingleton();
+				$language = $root->mContext->getXoopsConfig('language');
+				$helpfile = $this->mXoopsModule->getHelp();
+				$dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
+	
+				if (!file_exists($dir . "/" . $helpfile)) {
+					$dir = XOOPS_MODULE_PATH . "/" . $this->mXoopsModule->getVar('dirname') . "/language/" . $language;
+						if (!file_exists($dir . "/" . $helpfile)) {
+							return;
+						}
+				}
+				$lines = file($dir . "/" . $helpfile);
+				foreach ($lines as $line) {
+					foreach($searchArgs->getKeywords() as $word) {
+						if (stristr($line, $word) !== false) {
+							$url = XOOPS_MODULE_URL . "/legacy/admin/index.php?action=Help&amp;dirname=" . $this->mXoopsModule->getVar('dirname');
+							$searchArgs->addRecord($this->mXoopsModule->getVar('name'), $url, _HELP);
+							return;
+						}
 					}
 				}
 			}

From minahito ＠ users.sourceforge.jp  Thu Nov  9 15:11:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 15:11:30 +0900
Subject: [xoops-cvslog 5723] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109061130.E56262AC0EF@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.3	Wed Nov  8 19:53:39 2006
+++ xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php	Thu Nov  9 15:11:30 2006
@@ -66,7 +66,9 @@
 function Legacy_modifier_helpurl($file, $dirname = null )
 {
 	$root =& XCube_Root::getSingleton();
+	
 	$language = $root->mContext->getXoopsConfig('language');
+	$dirname = $root->mContext->getAttribute('legacy_help_dirname');
 
 	if ( $dirname == null ) {
 		$moduleObject =& $root->mContext->mXoopsModule;
@@ -85,10 +87,9 @@
 function Legacy_modifier_helpimage($file)
 {
 	$root =& XCube_Root::getSingleton();
-	$moduleObject =& $root->mContext->mXoopsModule;
 	
 	$language = $root->mContext->getXoopsConfig('language');
-	$dirname = $moduleObject->get('dirname');
+	$dirname = $root->mContext->getAttribute('legacy_help_dirname');
 
 	$url = XOOPS_MODULE_URL . "/${dirname}/language/${language}/help/images/${file}";
 	if (!file_exists($url) && $language != "english") {
@@ -172,6 +173,8 @@
 				return LEGACY_FRAME_VIEW_ERROR;
 			}
 		}
+		
+		$controller->mRoot->mContext->setAttribute('legacy_help_dirname', $this->_mDirname);
 
 		$smarty->template_dir = $template_dir;
 		$this->mContents = $smarty->fetch("file:" . $helpfile);

From minahito ＠ users.sourceforge.jp  Thu Nov  9 16:21:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 16:21:07 +0900
Subject: [xoops-cvslog 5724] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061109072107.A365C2AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.2	Thu Nov  2 00:02:00 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Nov  9 16:21:07 2006
@@ -15,6 +15,76 @@
 class Legacy_ModuleInstallUtils
 {
 	/**
+	 * This is factory for the installer. The factory reads xoops_version
+	 * without modulehandler, to prevent cache in modulehandler.
+	 */
+	function &createInstaller($dirname)
+	{
+		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'installer', 'Legacy_ModuleInstaller');
+	}
+	
+	/**
+	 * This is factory for the updater. The factory reads xoops_version
+	 * without modulehandler, to prevent cache in modulehandler.
+	 */
+	function &createUpdater($dirname)
+	{
+		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'updater', 'Legacy_ModulePhasedUpgrader');
+	}
+	
+	/**
+	 * This is factory for the uninstaller. The factory reads xoops_version
+	 * without modulehandler, to prevent cache in modulehandler.
+	 */
+	function &createUninstaller($dirname)
+	{
+		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'uninstaller', 'Legacy_ModuleUninstaller');
+	}
+	
+	/**
+	 * The generic factory for installers. This function is used by other
+	 * utility functions.
+	 * @param string $dirname
+	 * @param string $mode 'installer' 'updater' or 'uninstaller'
+	 * @param string $defaultClassName
+	 */
+	function &_createInstaller($dirname, $mode, $defaultClassName)
+	{
+		$info = array();
+		
+		$filepath = XOOPS_MODULE_PATH . "/modules/${dirname}/xoops_version.php";
+		if (file_exists($filepath)) {
+			@include $filepath;
+			$info = $modversion;
+		}
+		
+		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer'][$mode])) {
+			$updateInfo = $info['legacy_installer'][$mode];
+				
+			$className = $updateInfo['class'];
+			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
+			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
+				
+			if ($namespace != null) {
+				$className = "${namespace}_${className}";
+			}
+				
+			if (!class_exists($className) && file_exists($filePath)) {
+				require_once $filePath;
+			}
+				
+			if (class_exists($className)) {
+				$installer =& new $className();
+				return $installer;
+			}
+		}
+		
+		$installer =& new $defaultClassName();
+		return $installer;
+	}
+	
+	
+	/**
 	 * Executes SQL file which xoops_version of $module specifies. This
 	 * function is usefull for installers, but it's impossible to control
 	 * for detail.
@@ -69,7 +139,7 @@
 	 * 
 	 * This function gets informations about templates from xoops_version.
 	 * 
-	 * @section Attention
+	 * @warning
 	 * 
 	 * This function depends the specific spec of Legacy_RenderSystem, but this
 	 * static function is needed by the 2nd installer of Legacy System.
@@ -93,7 +163,7 @@
 	/**
 	 * Inserts the specified template to DB.
 	 * 
-	 * @section Attention
+	 * @warning
 	 * 
 	 * This function depends the specific spec of Legacy_RenderSystem, but this
 	 * static function is needed by the 2nd installer of Legacy System.
@@ -157,7 +227,7 @@
 	 * 
 	 * This function gets informations about templates from the database.
 	 * 
-	 * @section Attention
+	 * @warning
 	 * 
 	 * This function depends the specific spec of Legacy_RenderSystem, but this
 	 * static function is needed by the 2nd installer of Legacy System.

From minahito ＠ users.sourceforge.jp  Thu Nov  9 16:21:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 16:21:15 +0900
Subject: [xoops-cvslog 5725] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109072115.A0E722AC084@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.3	Thu Nov  2 00:01:08 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php	Thu Nov  9 16:21:15 2006
@@ -130,33 +130,7 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		$this->mXoopsModule->loadInfo($dirname, false);
-
-		$info = $this->mXoopsModule->modinfo;
-			
-		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer']['installer'])) {
-			$updateInfo = $info['legacy_installer']['installer'];
-				
-			$className = $updateInfo['class'];
-			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
-			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
-				
-			if ($namespace != null) {
-				$className = "${namespace}_${className}";
-			}
-				
-			if (!class_exists($className) && file_exists($filePath)) {
-				require_once $filePath;
-			}
-				
-			if (class_exists($className)) {
-				$installer =& new $className();
-				return $installer;
-			}
-		}
-		
-		$installer =& new Legacy_ModuleInstaller();
-		return $installer;
+		return Legacy_ModuleInstallUtils::createInstaller($dirname);
 	}
 		
 	function _setupActionForm()
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.7 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.7	Thu Nov  2 13:54:00 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Thu Nov  9 16:21:15 2006
@@ -133,33 +133,7 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		$this->mXoopsModule->loadInfo($dirname, false);
-
-		$info = $this->mXoopsModule->modinfo;
-			
-		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer']['updater'])) {
-			$updateInfo = $info['legacy_installer']['updater'];
-				
-			$className = $updateInfo['class'];
-			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
-			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
-				
-			if ($namespace != null) {
-				$className = "${namespace}_${className}";
-			}
-				
-			if (!class_exists($className) && file_exists($filePath)) {
-				require_once $filePath;
-			}
-				
-			if (class_exists($className)) {
-				$installer =& new $className();
-				return $installer;
-			}
-		}
-		
-		$installer =& new Legacy_ModulePhasedUpgrader();
-		return $installer;
+		Legacy_ModuleInstallUtils::createUpdater($dirname);
 	}
 	
 	function getDefaultView(&$controller, &$xoopsUser)
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.4	Thu Nov  2 00:01:25 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Thu Nov  9 16:21:15 2006
@@ -121,33 +121,7 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		$this->mXoopsModule->loadInfo($dirname, false);
-
-		$info = $this->mXoopsModule->modinfo;
-			
-		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer']['uninstaller'])) {
-			$updateInfo = $info['legacy_installer']['uninstaller'];
-				
-			$className = $updateInfo['class'];
-			$filePath = isset($updateInfo['filepath']) ? $updateInfo['filepath'] : XOOPS_MODULE_PATH . "/${dirname}/admin/class/${className}.class.php";
-			$namespace = isset($updateInfo['namespace']) ? $updateInfo['namespace'] : ucfirst($dirname);
-				
-			if ($namespace != null) {
-				$className = "${namespace}_${className}";
-			}
-				
-			if (!class_exists($className) && file_exists($filePath)) {
-				require_once $filePath;
-			}
-				
-			if (class_exists($className)) {
-				$installer =& new $className();
-				return $installer;
-			}
-		}
-		
-		$installer =& new Legacy_ModuleUninstaller();
-		return $installer;
+		return Legacy_ModuleInstallUtils::createUninstaller($dirname);
 	}
 	
 	function _setupActionForm()

From minahito ＠ users.sourceforge.jp  Thu Nov  9 16:21:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 16:21:28 +0900
Subject: [xoops-cvslog 5726] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061109072128.0F62D2AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.4 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.4	Sun Nov  5 15:39:14 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Thu Nov  9 16:21:27 2006
@@ -53,6 +53,7 @@
 				$GLOBALS['xoopsUser'] = $context->mXoopsUser;
 				if (!empty($_POST['cube_module_install'])) { //@todo use Ticket
 					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstaller.class.php";
+					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 					if (isset($_POST['uninstalled_modules']) && is_array($_POST['uninstalled_modules'])){
 						foreach ($_POST['uninstalled_modules'] as $module) {
 							$module = basename($module);
@@ -64,7 +65,7 @@
 								$xoopsModule->set('weight', 1);
 								$xoopsModule->loadInfoAsVar($module);
 								
-								$installer =& new Legacy_ModuleInstaller();
+								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
 								$installer->setCurrentXoopsModule($xoopsModule);
 								$installer->executeInstall();
 							}
@@ -101,7 +102,7 @@
 								$xoopsModule->set('weight', 1);
 								$xoopsModule->loadInfoAsVar($module);
 								
-								$installer =& new Legacy_ModuleInstaller();
+								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
 								$installer->setCurrentXoopsModule($xoopsModule);
 								$installer->executeInstall();
 							}
@@ -125,6 +126,7 @@
 				}
 				elseif (!empty($_POST['cube_module_uninstallok'])) { //@todo use Ticket
 					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
+					require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 					$module = basename($_POST['cube_module_uninstallok']);
 					if (in_array($module, $retArray['disabled'])) {
 						$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
@@ -132,7 +134,7 @@
 						$handler =& xoops_gethandler('module');
 						$xoopsModule =& $handler->getByDirname($module);
 						
-						$uninstaller =& new Legacy_ModuleUninstaller();
+						$uninstaller =& Legacy_ModuleInstallUtils::createUninstaller($xoopsModule->get('dirname'));
 						$uninstaller->setCurrentXoopsModule($xoopsModule);
 						$uninstaller->executeUninstall();
 					}

From minahito ＠ users.sourceforge.jp  Thu Nov  9 16:23:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 16:23:40 +0900
Subject: [xoops-cvslog 5727] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109072340.F3EF72AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.2	Sun Oct 15 00:46:40 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php	Thu Nov  9 16:23:40 2006
@@ -98,26 +98,19 @@
 
 		$db=&$controller->getDB();
 
-		//
-		// TODO : We don't use handler and write sql directly.
-		//
 		$mod = $db->prefix("modules");
 		$perm = $db->prefix("group_permission");
 		$groups = implode(",", $xoopsUser->getGroups());
-		
-		//
-		// FIXME ActiveCheck
-		//
-//		$sql = "SELECT ${mod}.* FROM ${mod},${perm} " .
-//			"WHERE ${perm}.gperm_modid=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
-//			"ORDER BY ${mod}.weight";
-
-		$handler =& xoops_gethandler('groupperm');
-		$midArr = $handler->getItemIds('module_admin', $xoopsUser->getGroups());
+						 
+		$sql = "SELECT DISTINCT ${mod}.mid FROM ${mod},${perm} " .
+		       "WHERE ${mod}.isactive=1 AND ${mod}.mid=${perm}.gperm_itemid AND ${perm}.gperm_name='module_admin' AND ${perm}.gperm_groupid IN (${groups}) " .
+		       "ORDER BY ${mod}.weight, ${mod}.mid";
 
+		$result=$db->query($sql);
+		
 		$handler =& xoops_gethandler('module');
-		foreach ($midArr as $mid) {
-			$module =& $handler->get($mid);
+		while ($row = $db->fetchArray($result)) {
+			$module =& $handler->get($row['mid']);
 			$adapter =& new Legacy_ModuleAdapter($module); // FIXMED
 			
 			$this->mModules[] =& $adapter;

From nobunobu ＠ users.sourceforge.jp  Thu Nov  9 16:29:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu,  9 Nov 2006 16:29:51 +0900
Subject: [xoops-cvslog 5728] CVS update: xoops2jp/html/modules/legacy/admin
Message-ID: <20061109072951.109AC2AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/css.php
diff -u xoops2jp/html/modules/legacy/admin/css.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/css.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/css.php:1.1.2.2	Wed Nov  8 21:26:31 2006
+++ xoops2jp/html/modules/legacy/admin/css.php	Thu Nov  9 16:29:50 2006
@@ -4,9 +4,7 @@
 require_once "../../../mainfile.php";
 
 $root=&XCube_Root::getSingleton();
-$xoopsController=&$root->getController();
-// @todo using private method. 
-$xoopsController->_setupEnvironment();
+$root->mController->executeCommonSubset(false);
 
 //
 // @todo Why does this file know Legacy_RenderSystem?
@@ -37,6 +35,7 @@
 	exit();
 }
 require_once XOOPS_ROOT_PATH.'/modules/legacyRender/kernel/Legacy_AdminRenderSystem.class.php';
+
 $smarty =& new Legacy_AdminSmarty();
 $smarty->register_modifier("theme", "Legacy_modifier_css_theme");
 $smarty->register_function("stylesheet", "Legacy_function_stylesheet");

From nobunobu ＠ users.sourceforge.jp  Thu Nov  9 16:29:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu,  9 Nov 2006 16:29:51 +0900
Subject: [xoops-cvslog 5729] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061109072951.377662AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.16 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.17
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.16	Wed Nov  8 15:12:17 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Thu Nov  9 16:29:51 2006
@@ -215,6 +215,26 @@
 		$this->_processPostFilter();
 	}
 	
+	/**
+	 * Subset of executeCommon() Method
+	 * It'll be used when process starts with $xoopsOption['nocommon'] and
+	 * This process requires connecting XOOPS Database or LEGACY constant values
+	 * But it won't do any other initial settings
+	 *  (eg. Session start, Permission handling)
+	 *
+	 * @access public
+     * @param bool $connectdb set false if you don't want to connetcting XOOPS Database
+	 *
+	 */
+    function executeCommonSubset($connectdb = true) {
+        $this->_setupErrorHandler();
+     	$this->_setupEnvironment();
+     	if ($connectdb) {
+     	    $this->_setupLogger();
+     	    $this->_setupDB();
+     	}
+    }
+
 	function _setupLogger()
 	{
 		require_once XOOPS_ROOT_PATH . '/class/logger.php';

From minahito ＠ users.sourceforge.jp  Thu Nov  9 17:20:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 17:20:12 +0900
Subject: [xoops-cvslog 5730] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061109082012.063BA2AC0F3@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.17 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.18
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.17	Thu Nov  9 16:29:51 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Thu Nov  9 17:20:11 2006
@@ -639,6 +639,8 @@
 		
 		$GLOBALS['xoopsConfig'] = $this->mRoot->mContext->mXoopsConfig; // Compatiblity for 2.0.x
 		$GLOBALS['config_handler'] =& $configHandler;
+		
+		$GLOBALS['module_handler'] =& xoops_gethandler('module');
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:09:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:09:05 +0900
Subject: [xoops-cvslog 5731] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109090905.3015E2AC103@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.4	Thu Nov  9 16:21:15 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php	Thu Nov  9 18:09:05 2006
@@ -7,7 +7,7 @@
  if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_LEGACY_PATH."/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_LEGACY_PATH."/admin/class/ModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 require_once XOOPS_LEGACY_PATH."/admin/forms/ModuleInstallForm.class.php";
 
 /**
@@ -160,7 +160,16 @@
 		}
 		
 		$this->mInstaller->setForceMode($this->mActionForm->get('force'));
-		$this->mInstaller->executeInstall();
+		if (!$this->mInstaller->executeInstall()) {
+			$this->mInstaller->mLog->addReport('Force Uninstallation is started.');
+			$dirname = $this->mXoopsModule->get('dirname');
+			$uninstaller =& Legacy_ModuleInstallUtils::createUninstaller($dirname);
+			
+			$uninstaller->setForceMode(true);
+			$uninstaller->setCurrentXoopsModule($this->mXoopsModule);
+			
+			$uninstaller->executeUninstall();
+		}
 
 		return LEGACY_FRAME_VIEW_SUCCESS;
 	}

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:09:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:09:20 +0900
Subject: [xoops-cvslog 5732] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109090920.EAD2B2AC0F8@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.8 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.8	Thu Nov  9 16:21:15 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Thu Nov  9 18:09:20 2006
@@ -7,7 +7,7 @@
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_LEGACY_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/forms/ModuleUpdateForm.class.php";
 
 /**
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.5	Thu Nov  9 16:21:15 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Thu Nov  9 18:09:20 2006
@@ -7,7 +7,7 @@
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_LEGACY_PATH . "/admin/actions/AbstractModuleInstallAction.class.php";
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/forms/ModuleUninstallForm.class.php";
 
 

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:09:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:09:48 +0900
Subject: [xoops-cvslog 5733] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061109090948.7E6462AC103@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.3	Thu Nov  9 16:21:07 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Nov  9 18:09:48 2006
@@ -2,6 +2,10 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstaller.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
+
 /**
  * This class is collection of static utility functions for module installation.
  * These functions are useful for Legacy modules' system-fixed-installer and

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:35:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:35:42 +0900
Subject: [xoops-cvslog 5734] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061109093542.E84832AC10B@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4	Fri Aug 25 20:04:27 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Thu Nov  9 18:35:42 2006
@@ -25,6 +25,7 @@
 	$tags = "";
 	$objectArr =& $params['from'];
 	$default = isset($params['default']) ? $params['default'] : null;
+	$id = isset($params['id']) ? $params['id'] : null;
 
 	foreach ($objectArr as $object) {
 		$value = htmlspecialchars($object->get($params['value']), ENT_QUOTES);
@@ -38,7 +39,13 @@
 			$selected = " selected=\"selected\"";
 		}
 		
-		$tags .= "<option value=\"${value}\"${selected}>${label}</option>\n";
+		if ($id) {
+			$t_id = "${id}_${value}";
+			$tags .= "<option id=\"${t_id}\" value=\"${value}\"${selected}>${label}</option>\n";
+		}
+		else {
+			$tags .= "<option value=\"${value}\"${selected}>${label}</option>\n";
+		}
 	}
 	
 	print $tags;

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:36:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:36:00 +0900
Subject: [xoops-cvslog 5735] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061109093600.2F6982AC10E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_checkbox.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoopsform_checkbox.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_xoopsform_checkbox.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_checkbox.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_checkbox.html	Thu Nov  9 18:36:00 2006
@@ -1,3 +1,3 @@
 <{foreach from=$element->getOptions() key=value item=name}>
-  <label><input type='checkbox' name='<{$element->getName()}>' value='<{$value}>' <{if (count($element->getValue()) > 0 && in_array($value, $element->getValue()))}>checked<{/if}> <{$element->getExtra()}> /><{$name}></label>
+  <label><input type='checkbox' name='<{$element->getName()}>' id='<{$element->getName()}>_<{$value}>' value='<{$value}>' <{if (count($element->getValue()) > 0 && in_array($value, $element->getValue()))}>checked<{/if}> <{$element->getExtra()}> /><{$name}></label>
 <{/foreach}>

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:36:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:36:11 +0900
Subject: [xoops-cvslog 5736] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061109093611.1DB362AC10A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_radio.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoopsform_radio.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_xoopsform_radio.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_radio.html:1.1.2.2	Mon Oct 23 15:14:22 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_radio.html	Thu Nov  9 18:36:10 2006
@@ -1,3 +1,3 @@
 <{foreach from=$element->getOptions() key=value item=name}>
-  <label><input type='radio' name='<{$element->getName()}>' value='<{$value}>' <{if $element->getValue() !== null && $element->getValue() == $value}> checked='checked'<{/if}> <{$element->getExtra()}> /><{$name}></label>
+  <label><input type='radio' id='<{$element->getName()}>_<{$value}>' name='<{$element->getName()}>' value='<{$value}>' <{if $element->getValue() !== null && $element->getValue() == $value}> checked='checked'<{/if}> <{$element->getExtra()}> /><{$name}></label>
 <{/foreach}>

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:36:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:36:25 +0900
Subject: [xoops-cvslog 5737] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061109093625.9E7EF2AC10A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html	Thu Nov  9 18:36:25 2006
@@ -1,9 +1,9 @@
 <{if $element->isMultiple() != false}>
-  <select size='<{$element->getSize()}>' name='<{$element->getName()}>[]' id='<{$element->getName()}>[]' multiple='multiple' <{$element->getExtra()}>>
+  <select size='<{$element->getSize()}>' name='<{$element->getName()}>[]' id='<{$element->getName()}>' multiple='multiple' <{$element->getExtra()}>>
 <{else}>
    <select size='<{$element->getSize()}>' name='<{$element->getName()}>' id='<{$element->getName()}>' <{$element->getExtra()}>>
 <{/if}>
 <{foreach from=$element->getOptions() key=value item=name}>
-  <option value='<{$value|escape}>' <{if count($element->getValue()) > 0 && in_array($value, $element->getValue())}> selected='selected'<{/if}>><{$name}></option>
+  <option id='<{$element->getName()}>_<{$value|escape}>' value='<{$value|escape}>' <{if count($element->getValue()) > 0 && in_array($value, $element->getValue())}> selected='selected'<{/if}>><{$name}></option>
 <{/foreach}>
 </select>

From minahito ＠ users.sourceforge.jp  Thu Nov  9 18:36:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 18:36:41 +0900
Subject: [xoops-cvslog 5738] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061109093641.7E9CD2AC0FC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.6 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.7
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.6	Wed Nov  8 18:54:18 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Thu Nov  9 18:36:41 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.02;
+$modversion['version'] = 2.03;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Thu Nov  9 19:08:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 19:08:43 +0900
Subject: [xoops-cvslog 5739] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061109100843.67B372AC10E@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/grouppermform.php
diff -u xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.2 xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.3
--- xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.2	Sun Oct 15 00:35:45 2006
+++ xoops2jp/html/class/xoopsform/grouppermform.php	Thu Nov  9 19:08:43 2006
@@ -1,5 +1,5 @@
 <?php 
-// $Id: grouppermform.php,v 1.2.8.3.2.2 2006/10/14 15:35:45 minahito Exp $
+// $Id: grouppermform.php,v 1.2.8.3.2.3 2006/11/09 10:08:43 minahito Exp $
 // ------------------------------------------------------------------------ //
 // XOOPS - PHP Content Management System                      //
 // Copyright (c) 2000-2003 XOOPS.org                           //
@@ -269,7 +269,12 @@
 			}
 		}
 		$checkallbtn_id = $this->getName().'[checkallbtn]['.$this->_groupId.']';
+		$checkallbtn_id = str_replace(array('[', ']'), array('_', ''), $checkallbtn_id); // Remove injury characters for ID
+		
 		$option_ids_str = implode(', ', $option_ids);
+		$option_ids_str = str_replace(array('[', ']'), array('_', ''), $option_ids_str); // Remove injury characters for ID
+		
+		
 		$ret .= _ALL." <input id=\"".$checkallbtn_id."\" type=\"checkbox\" value=\"\" onclick=\"var optionids = new Array(".$option_ids_str."); xoopsCheckAllElements(optionids, '".$checkallbtn_id."');\" />";
 		$ret .= '</td></tr></table>';
 		return $ret;
@@ -286,12 +291,18 @@
      */
     function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-        $tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" onclick=\""; 
+		// Remove injury characters for ID
+ 		$tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() .
+		         "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" .
+				 str_replace(array('[', ']'), array('_', ''), $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]") .
+				 "\" onclick=\"";
+  
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
         foreach ($parentIds as $pid) {
             $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
+			$parent_ele = str_replace(array('[', ']'), array('_', ''), $parent_ele); // Remove injury characters for ID
             $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
         } 
         // If there are child elements, add javascript that will
@@ -300,6 +311,7 @@
         // is no permission to this item.
         foreach ($option['allchild'] as $cid) {
             $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
+			$child_ele = str_replace(array('[', ']'), array('_', ''), $child_ele); // Remove injury characters for ID
             $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
         } 
         $tree .= '" value="1"';

From minahito ＠ users.sourceforge.jp  Thu Nov  9 19:31:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  9 Nov 2006 19:31:20 +0900
Subject: [xoops-cvslog 5740] CVS update: xoops2jp/html/include
Message-ID: <20061109103120.C50A62AC10E@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.6 xoops2jp/html/include/functions.php:1.2.8.19.2.7
--- xoops2jp/html/include/functions.php:1.2.8.19.2.6	Wed Nov  8 19:14:42 2006
+++ xoops2jp/html/include/functions.php	Thu Nov  9 19:31:20 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.6 2006/11/08 10:14:42 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.7 2006/11/09 10:31:20 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -27,6 +27,9 @@
 
 // ################## Various functions from here ################
 
+/**
+ * @deprecated see RequestObject
+ */
 function xoops_getrequest($name)
 {
 	if (!isset($_REQUEST[$name])) {
@@ -598,9 +601,16 @@
     }
     $name = (!isset($name)) ? $module_dir : trim($name);
     if (!isset($handlers[$module_dir][$name])) {
-        if ( file_exists( $hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/{$name}.php" ) ) {
+		//
+		// Cube Style
+		//
+		if (file_exists($hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/handler/" . ucfirst($name) . ".class.php")) {
+			include_once $hnd_file;
+		}
+		elseif ( file_exists( $hnd_file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/class/{$name}.php" ) ) {
             include_once $hnd_file;
         }
+		
 		$className = ucfirst(strtolower($module_dir)) . "_" . ucfirst($name) . 'Handler';
 		if (class_exists($className)) {
 			$handlers[$module_dir][$name] =& new $className($GLOBALS['xoopsDB']);

From minahito ＠ users.sourceforge.jp  Fri Nov 10 00:55:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 00:55:01 +0900
Subject: [xoops-cvslog 5741] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061109155501.9D0EE2AC0FE@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.9 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.9	Thu Nov  9 18:09:20 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Fri Nov 10 00:55:01 2006
@@ -133,7 +133,7 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		Legacy_ModuleInstallUtils::createUpdater($dirname);
+		return Legacy_ModuleInstallUtils::createUpdater($dirname);
 	}
 	
 	function getDefaultView(&$controller, &$xoopsUser)

From minahito ＠ users.sourceforge.jp  Fri Nov 10 01:00:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 01:00:14 +0900
Subject: [xoops-cvslog 5742] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061109160014.393A72AC019@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.9 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.10
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.9	Wed Nov  8 15:12:10 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Fri Nov 10 01:00:14 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.9 2006/11/08 06:12:10 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.10 2006/11/09 16:00:14 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -207,7 +207,11 @@
 		$this->mRenderTarget->getAttribute($key);
 	}
 
-	function renderBlock(&$target)
+	/**
+	 * @protected
+	 * Assign common variables for the compatibility with X2.
+	 */
+	function _commonPrepareRender()
 	{
 		$themeName = $this->mController->mRoot->mContext->getThemeName();
    		$this->mXoopsTpl->assign('xoops_theme', $themeName);
@@ -217,6 +221,24 @@
 		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
 		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
 		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
+
+		//
+		// Assign module informations.
+		//
+		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
+			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
+			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
+			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
+		}
+		
+		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
+			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
+		}
+	}
+	
+	function renderBlock(&$target)
+	{
+		$this->_commonPrepareRender();
 		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
 			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
@@ -282,14 +304,7 @@
 
 	function renderMain(&$target)
 	{
-		$themeName = $this->mController->mRoot->mContext->getThemeName();
-   		$this->mXoopsTpl->assign('xoops_theme', $themeName);
-   		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
-   		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
-		
-		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
-		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
-		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
+		$this->_commonPrepareRender();
 		
 		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
 			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
@@ -321,27 +336,7 @@
 
 	function renderTheme(&$target)
 	{
-		$themeName = $this->mController->mRoot->mContext->getThemeName();
-   		$this->mXoopsTpl->assign('xoops_theme', $themeName);
-   		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
-   		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
-		
-		$this->mXoopsTpl->assign('xoops_sitename', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_sitename'), ENT_QUOTES));
-		$this->mXoopsTpl->assign('xoops_pagetitle', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_pagetitle'), ENT_QUOTES));
-		$this->mXoopsTpl->assign('xoops_slogan', htmlspecialchars($this->mController->mRoot->mContext->getAttribute('legacy_slogan'), ENT_QUOTES));
-		
-		//
-		// Assign module informations.
-		//
-		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
-			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
-			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
-			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
-		}
-		
-		if (isset($GLOBALS['xoopsUserIsAdmin'])) {
-			$this->mXoopsTpl->assign('xoops_isadmin', $GLOBALS['xoopsUserIsAdmin']);
-		}
+		$this->_commonPrepareRender();
 		
 		//
 		// Assign from attributes of the render-target.

From nobunobu ＠ users.sourceforge.jp  Fri Nov 10 12:30:01 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 10 Nov 2006 12:30:01 +0900
Subject: [xoops-cvslog 5743] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061110033001.116172AC1DD@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.18 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.19
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.18	Thu Nov  9 17:20:11 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Fri Nov 10 12:30:00 2006
@@ -138,6 +138,9 @@
 		//
 		// Decide status. [TEST]
 		//
+
+		$this->_processHostAbstractLayer();
+
 		$urlInfo = $this->_parseUrl();
 		$adminStateFlag = null;
 		
@@ -202,7 +205,7 @@
 
 		$this->_processPreBlockFilter();	// What's !?
 
-		$this->_processHostAbstractLayer();
+//      $this->_processHostAbstractLayer(); // Move it into prepare()
 
 		$this->_setupSession();
 
@@ -458,6 +461,7 @@
 		Legacy_Utils::raiseUserControlEvent();
 	}
 	
+	// @todo change to refer settings ini file for HostAbstractLayer.
 	function _processHostAbstractLayer()
 	{
 		if ( !isset($_SERVER['PATH_TRANSLATED']) && isset($_SERVER['SCRIPT_FILENAME']) ) {

From minahito ＠ users.sourceforge.jp  Fri Nov 10 14:33:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 14:33:58 +0900
Subject: [xoops-cvslog 5744] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061110053358.0BB7C2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.2	Sun Oct 15 00:49:17 2006
+++ xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php	Fri Nov 10 14:33:57 2006
@@ -121,7 +121,6 @@
 	
 	function doApprove($comment)
 	{
-		$comment =& $eventArgs['comment'];
 		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
 		
 		if ($comment_config == false) {

From minahito ＠ users.sourceforge.jp  Fri Nov 10 14:34:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 14:34:05 +0900
Subject: [xoops-cvslog 5745] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061110053405.D1C702AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_list.html	Fri Nov 10 14:34:05 2006
@@ -79,13 +79,11 @@
       <td class="legacy_list_date"><{$obj->getShow('com_created')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_date"><{$obj->getShow('com_modified')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_name">
-        <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&amp;uid=<{$obj->getShow('com_uid')}>">
         <{if $obj->mUser}>
-          <{$obj->mUser->getShow('uname')}>
+          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&amp;uid=<{$obj->getShow('com_uid')}>"><{$obj->mUser->getShow('uname')}></a>
         <{else}>
           <{$smarty.const._GUESTS}>
         <{/if}>
-        </a>
       </td>
       <td class="legacy_list_order"><{$obj->getShow('com_ip')}></td>
       <td class="legacy_list_select"><{$obj->mStatus->getShow('name')}></td>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.4	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_delete.html	Fri Nov 10 14:34:05 2006
@@ -59,7 +59,13 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_COM_UID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mUser->getShow('uname')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mUser != null}>
+          <{$object->mUser->getShow('uname')}>
+        <{else}>
+          Guest
+        <{/if}>
+      </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._MD_LEGACY_LANG_COM_IP}></td>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_view.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.5	Tue Nov  7 22:00:57 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_view.html	Fri Nov 10 14:34:05 2006
@@ -55,7 +55,13 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_COM_UID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mUser->getShow('uname')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mUser != null}>
+          <{$object->mUser->getShow('uname')}>
+        <{else}>
+          Guest
+        <{/if}>
+      </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._MD_LEGACY_LANG_COM_IP}></td>

From minahito ＠ users.sourceforge.jp  Fri Nov 10 14:34:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 14:34:11 +0900
Subject: [xoops-cvslog 5746] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061110053411.6B52C2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/commentstatus.php
diff -u xoops2jp/html/modules/legacy/class/commentstatus.php:1.1.2.2 xoops2jp/html/modules/legacy/class/commentstatus.php:1.1.2.3
--- xoops2jp/html/modules/legacy/class/commentstatus.php:1.1.2.2	Sun Oct 15 01:30:31 2006
+++ xoops2jp/html/modules/legacy/class/commentstatus.php	Fri Nov 10 14:34:11 2006
@@ -42,7 +42,7 @@
 		return $ret;
 	}
 	
-	function get($id)
+	function &get($id)
 	{
 		if (isset($this->_mResults[$id])) {
 			return $this->_mResults[$id];

From minahito ＠ users.sourceforge.jp  Fri Nov 10 14:55:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 14:55:59 +0900
Subject: [xoops-cvslog 5747] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061110055559.2A74A2AC10E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.19 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.20
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.19	Fri Nov 10 12:30:00 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Fri Nov 10 14:55:59 2006
@@ -85,12 +85,6 @@
 	var $mSetupDebugger = null;
 	
 	/**
-	 * @var XCube_Delegate
-	 */
-	
-	var $mIsAdmin = null;
-	
-	/**
 	 * @var XoopsLogger
 	 */
 	var $mLogger = null;
@@ -125,9 +119,6 @@
 		$this->mSetupDebugger =& new XCube_Delegate();
 		$this->mSetupDebugger->add('Legacy_DebuggerManager::createInstance');
 		
-		$this->mIsAdmin =& new XCube_Delegate();
-		$this->mIsAdmin->add(array(&$this, '_isAdmin'));
-
 		set_magic_quotes_runtime(0);	// ^^;
 	}
 	
@@ -138,45 +129,35 @@
 		//
 		// Decide status. [TEST]
 		//
-
 		$this->_processHostAbstractLayer();
 
 		$urlInfo = $this->_parseUrl();
-		$adminStateFlag = null;
-		
-		$this->mIsAdmin->call(new XCube_Ref($adminStateFlag), $urlInfo);
-
-		if ($adminStateFlag) {
-			require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php";
-			$this->_mStrategy =& new Legacy_AdminControllerStrategy($this);
-		}
-		else {
-			$this->_mStrategy =& new Legacy_PublicControllerStrategy($this);
-		}
-	}
-	
-	function _isAdmin(&$flag, $urlInfo)
-	{
-		if ($flag !== null) {
-			return;
-		}
 		
+		$adminStateFlag = false;
 		if (count($urlInfo) >= 3) {
 			if (strtolower($urlInfo[0]) == "modules" && strtolower($urlInfo[2]) == "admin"){
-				$flag = true;
+				$adminStateFlag = true;
 			}
 			elseif ($urlInfo[0] == "modules" && $urlInfo[1] == "legacy" && $urlInfo[2] == "include") {
-				$flag = true;
+				$adminStateFlag = true;
 			}
 			elseif ($urlInfo[0] == "modules" && $urlInfo[1] == "system" && substr($urlInfo[2], 0, 9) == "admin.php") {
-				$flag = true;
+				$adminStateFlag = true;
 			}
 		}
 		elseif (substr($urlInfo[0], 0, 9) == "admin.php") {
-			$flag = true;
+			$adminStateFlag = true;
 		}
-	}
 
+		if ($adminStateFlag) {
+			require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php";
+			$this->_mStrategy =& new Legacy_AdminControllerStrategy($this);
+		}
+		else {
+			$this->_mStrategy =& new Legacy_PublicControllerStrategy($this);
+		}
+	}
+	
 	/**
 	 * @access public
 	 */

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:19:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:19:01 +0900
Subject: [xoops-cvslog 5748] CVS update: xoops2jp/html/modules/user
Message-ID: <20061110061901.E16212AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.2 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.3
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.2	Thu Nov  2 16:40:05 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Fri Nov 10 15:19:01 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.2 2006/11/02 07:40:05 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.3 2006/11/10 06:19:01 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 2.01;
+$modversion['version'] = 2.02;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:19:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:19:11 +0900
Subject: [xoops-cvslog 5749] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061110061911.6310D2AC10E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.3 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.4
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.3	Sun Oct 15 15:07:01 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php	Fri Nov 10 15:19:11 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.3 2006/10/15 06:07:01 minahito Exp $
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.4 2006/11/10 06:19:11 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -152,13 +152,18 @@
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$navi =& new XCube_PageNavigator("index.php?action=AvatarEdit&amp;uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
-		$handler =& xoops_gethandler('avatar');
+		$handler =& xoops_getmodulehandler('avatar');
+		
+		$this->mSystemAvatars[] =& $handler->createNoavatar();
 		
 		$this->mFilter =& new User_AvatarFilterForm($navi, $handler);
 		$this->mFilter->fetch();
 		
 		$criteria = $this->mFilter->getCriteria();
-		$this->mSystemAvatars =& $handler->getObjects($criteria);
+		$t_avatarArr =& $handler->getObjects($criteria);
+		foreach (array_keys($t_avatarArr) as $key) {
+			$this->mSystemAvatars[] =& $t_avatarArr[$key];
+		}
 		
 		$this->mAvatarSelectForm =& new User_AvatarSelectForm();
 		$this->mAvatarSelectForm->prepare();

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:19:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:19:23 +0900
Subject: [xoops-cvslog 5750] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061110061923.14FDD2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/avatar.php
diff -u xoops2jp/html/modules/user/class/avatar.php:1.1.2.5 xoops2jp/html/modules/user/class/avatar.php:1.1.2.5.2.1
--- xoops2jp/html/modules/user/class/avatar.php:1.1.2.5	Sat Aug  5 15:24:07 2006
+++ xoops2jp/html/modules/user/class/avatar.php	Fri Nov 10 15:19:22 2006
@@ -30,6 +30,15 @@
 	var $mPrimary = "avatar_id";
 	var $mClass = "UserAvatarObject";
 
+	function &createNoavatar()
+	{
+		$ret = $this->create();
+		$ret->set('avatar_id', 0);
+		$ret->set('avatar_name', _DELETE);
+		
+		return $ret;
+	}
+	
 	function delete(&$obj)
 	{
 		@unlink(XOOPS_UPLOAD_PATH . "/" . $obj->get('avatar_file'));

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:19:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:19:31 +0900
Subject: [xoops-cvslog 5751] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061110061931.0A6AA2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.2 xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.3
--- xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.2	Fri Sep 29 17:14:45 2006
+++ xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php	Fri Nov 10 15:19:30 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarSelectForm.class.php,v 1.1.2.3.2.2 2006/09/29 08:14:45 minahito Exp $
+ * @version $Id: AvatarSelectForm.class.php,v 1.1.2.3.2.3 2006/11/10 06:19:30 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -35,6 +35,10 @@
 			$this->mSelectedId = $avatar_id;
 		}
 		
+		if ($this->mSelectedId == 0) {
+			return;
+		}
+		
 		//
 		// Check whether specified avatar_id exists. 
 		//
@@ -54,9 +58,14 @@
 	function update(&$obj)
 	{
 		$handler =& xoops_getmodulehandler('avatar');
-		$avatar =& $handler->get($this->mSelectedId);
 		
-		$obj->set('user_avatar', $avatar->get('avatar_file'));
+		if ($this->mSelectedId == 0) {
+			$obj->set('user_avatar', 'blank.gif');
+		}
+		else {
+			$avatar =& $handler->get($this->mSelectedId);
+			$obj->set('user_avatar', $avatar->get('avatar_file'));
+		}
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:19:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:19:37 +0900
Subject: [xoops-cvslog 5752] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061110061937.638A52AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.1
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14	Mon Sep 25 18:42:00 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Fri Nov 10 15:19:37 2006
@@ -63,7 +63,11 @@
     <tr>
       <{foreach item=obj from=$systemAvatars}>
         <td class="<{cycle values="odd,even" name="class"}>" style="text-align:center;">
-          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>"/><br />
+          <{if $obj->get('avatar_id') == 0}>
+            <img src="<{$smarty.const.XOOPS_MODULE_URL}>/user/images/no_avatar.gif" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>"/><br />
+          <{else}>
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>"/><br />
+          <{/if}>
           <{$obj->getShow('avatar_name')}><br />
           <input name="avatar_id[<{$obj->getShow('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
         <{cycle name="table" values="</td>,</td>,</td>,</td></tr><tr>"}>

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:53:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:53:25 +0900
Subject: [xoops-cvslog 5753] CVS update: xoops2jp/html/kernel
Message-ID: <20061110065325.031572AC01A@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.14.2.1 xoops2jp/html/kernel/module.php:1.2.8.14.2.2
--- xoops2jp/html/kernel/module.php:1.2.8.14.2.1	Wed Nov  8 19:11:22 2006
+++ xoops2jp/html/kernel/module.php	Fri Nov 10 15:53:24 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.14.2.1 2006/11/08 10:11:22 minahito Exp $
+// $Id: module.php,v 1.2.8.14.2.2 2006/11/10 06:53:24 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -287,7 +287,7 @@
 	function hasNeedUpdate()
 	{
 		$info =& $this->getInfo();
-		return ($this->get('version') < intval($info['version'] * 100));
+		return ($this->get('version') < Legacy_Utils::convertVersionFromModinfoToInt($info['version']));
 	}
 	
     /**#@+

From minahito ＠ users.sourceforge.jp  Fri Nov 10 15:53:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 15:53:31 +0900
Subject: [xoops-cvslog 5754] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061110065331.08CDE2AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php
diff -u xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.5 xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.5	Thu Nov  2 16:39:21 2006
+++ xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php	Fri Nov 10 15:53:30 2006
@@ -149,6 +149,27 @@
 			}
 		}
 	}
+	
+	/**
+	 * Converts the version of the module from $modversion value to interger
+	 * number.
+	 * @param string $version
+	 * @return int
+	 */
+	function convertVersionFromModinfoToInt($version)
+	{
+		return round(100 * floatval($version));
+	}
+
+	/**
+	 * Converts the version of the module from DB value to float.
+	 * @param int $version
+	 * @return float
+	 */
+	function convertVersionIntToFloat($version)
+	{
+		return round(floatval(intval($version) / 100), 2);
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 10 18:11:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 18:11:26 +0900
Subject: [xoops-cvslog 5755] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061110091126.D2D012AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.1 xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.2
--- xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.1	Fri Sep 29 17:14:33 2006
+++ xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php	Fri Nov 10 18:11:26 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: DelegateFunctions.class.php,v 1.1.2.1.2.1 2006/09/29 08:14:33 minahito Exp $
+ * @version $Id: DelegateFunctions.class.php,v 1.1.2.1.2.2 2006/11/10 09:11:26 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -26,7 +26,12 @@
 					$theme =& new XCube_Theme();
 					$theme->mDirname = $dirname;
 					
-					if ($theme->loadManifesto($themeDir . "/package.ini.php")) {
+					if ($theme->loadManifesto($themeDir . "/manifesto.ini.php")) {
+						if ($theme->mRenderSystemName == 'Legacy_RenderSystem') {
+							$results[] =& $theme;
+						}
+					}
+					elseif ($theme->loadManifesto($themeDir . "/package.ini.php")) {
 						if ($theme->mRenderSystemName == 'Legacy_RenderSystem') {
 							$results[] =& $theme;
 						}

From minahito ＠ users.sourceforge.jp  Fri Nov 10 18:11:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 18:11:33 +0900
Subject: [xoops-cvslog 5756] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20061110091133.154E12AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/theme.php
diff -u xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5 xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5.2.1
--- xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5	Thu Aug  3 23:05:41 2006
+++ xoops2jp/html/modules/legacyRender/class/theme.php	Fri Nov 10 18:11:32 2006
@@ -17,11 +17,19 @@
 	
 	function loadPackage()
 	{
-		$mnfFile = XOOPS_THEME_PATH . "/" . $this->get('name') . "/package.ini.php";
-		
-		if (file_exists($mnfFile)) {
+		$themeDir = XOOPS_THEME_PATH . "/" . $this->get('name');
+
+		if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
 			$this->mPackage = parse_ini_file($mnfFile, true);
-			
+		}
+		elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
+			$this->mPackage = parse_ini_file($mnfFile, true);
+		}
+					
+		if (isset($this->mPackage['Manifesto'])) {
+			//
+			// If this system can use this theme, add this to list.
+			//
 			if (isset($this->mPackage['Manifesto']) && isset($this->mPackage['Manifesto']['Depends'])) {
 				$this->mActiveResource = ($this->mPackage['Manifesto']['Depends'] == "Legacy_RenderSystem");
 			}
@@ -72,10 +80,15 @@
 
 				$themeDir=XOOPS_THEME_PATH."/".$dir;
 				if(is_dir($themeDir)) {
-					$mnfFile=$themeDir."/package.ini.php";
-					if(file_exists($mnfFile)) {
-						$manifesto=parse_ini_file($mnfFile,true);
-						
+					$manifesto = array();
+					if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
+						$manifesto = parse_ini_file($mnfFile, true);
+					}
+					elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
+						$manifesto = parse_ini_file($mnfFile, true);
+					}
+					
+					if(count($manifesto) > 0) {
 						//
 						// If this system can use this theme, add this to list.
 						//

From minahito ＠ users.sourceforge.jp  Fri Nov 10 18:11:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 18:11:40 +0900
Subject: [xoops-cvslog 5757] CVS update:
	xoops2jp/html/modules/legacyRender/admin/class
Message-ID: <20061110091140.6878F2AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php	Fri Nov 10 18:11:40 2006
@@ -42,11 +42,16 @@
 				}
 
 				$themeDir=XOOPS_THEME_PATH."/".$dir;
-				if(is_dir($themeDir)) {
-					$mnfFile=$themeDir."/package.ini.php";
-					if(file_exists($mnfFile)) {
-						$manifesto=parse_ini_file($mnfFile,true);
-						
+				if (is_dir($themeDir)) {
+					$manifesto = array();
+					if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
+						$manifesto = parse_ini_file($mnfFile, true);
+					}
+					elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
+						$manifesto = parse_ini_file($mnfFile, true);
+					}
+					
+					if(count($manifesto) > 0) {
 						//
 						// If this system can use this theme, add this to list.
 						//

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:29:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:29:16 +0900
Subject: [xoops-cvslog 5758] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061110112916.118342AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.4	Fri Nov 10 14:34:05 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_list.html	Fri Nov 10 20:29:15 2006
@@ -80,7 +80,7 @@
       <td class="legacy_list_date"><{$obj->getShow('com_modified')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_name">
         <{if $obj->mUser}>
-          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&amp;uid=<{$obj->getShow('com_uid')}>"><{$obj->mUser->getShow('uname')}></a>
+          <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$obj->getShow('com_uid')}>"><{$obj->mUser->getShow('uname')}></a>
         <{else}>
           <{$smarty.const._GUESTS}>
         <{/if}>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/comment_delete.html:1.1.2.5	Fri Nov 10 14:34:05 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_delete.html	Fri Nov 10 20:29:15 2006
@@ -137,7 +137,7 @@
       <td class="legacy_list_title"><{$obj->getShow('com_title')}></td>
       <td class="legacy_list_date"><{$obj->getShow('com_created')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_date"><{$obj->getShow('com_modified')|xoops_formattimestamp:l}></td>
-      <td class="legacy_list_order"><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
+      <td class="legacy_list_order"><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
       <td class="legacy_list_select"><{$obj->getShow('com_ip')}></td>
       <td class="legacy_list_control">
         <{if $obj->get('com_status') == 2}>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_view.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.6 xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/templates/comment_view.html:1.1.2.6	Fri Nov 10 14:34:05 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_view.html	Fri Nov 10 20:29:15 2006
@@ -122,7 +122,7 @@
       <td class="legacy_list_title"><{$obj->getShow('com_title')}></td>
       <td class="legacy_list_date"><{$obj->get('com_created')|xoops_formattimestamp:l}></td>
       <td class="legacy_list_date"><{$obj->get('com_modified')|xoops_formattimestamp:l}></td>
-      <td class="legacy_list_name"><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&amp;uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
+      <td class="legacy_list_name"><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
       <td class="legacy_list_order"><{$obj->getShow('com_ip')}></td>
       <td class="legacy_list_select">
         <{if $obj->get('com_status') == 2 }>

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:00 +0900
Subject: [xoops-cvslog 5759] CVS update: xoops2jp/html/modules/user
Message-ID: <20061110113000.931072AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.3 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.4
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.3	Fri Nov 10 15:19:01 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Fri Nov 10 20:30:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.3 2006/11/10 06:19:01 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.4 2006/11/10 11:30:00 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 2.02;
+$modversion['version'] = 2.03;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
@@ -298,7 +298,7 @@
 	);
 	
 // Menu
-$modversion['hasMain'] = 1;
+$modversion['hasMain'] = 0;
 $modversion['read_any'] = true;
 
 // Block

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:00 +0900
Subject: [xoops-cvslog 5760] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061110113000.C0E032AC065@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/AvatarEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.5.2.3 xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.5.2.4
--- xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.5.2.3	Sat Oct  7 15:30:10 2006
+++ xoops2jp/html/modules/user/forms/AvatarEditForm.class.php	Fri Nov 10 20:30:00 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarEditForm.class.php,v 1.1.2.5.2.3 2006/10/07 06:30:10 ryuji_amano Exp $
+ * @version $Id: AvatarEditForm.class.php,v 1.1.2.5.2.4 2006/11/10 11:30:00 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -88,7 +88,7 @@
 	{
 		$avatar = null;
 		if ($this->mFormFile != null) {
-			$avatarHandler =& xoops_getmodulehandler('avatar');
+			$avatarHandler =& xoops_getmodulehandler('avatar', 'user');
 			$avatar =& $avatarHandler->create();
 			$avatar->set('avatar_file', $this->mFormFile->getFileName());
 			$avatar->set('avatar_mimetype', $this->mFormFile->getContentType());
Index: xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.3 xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.4
--- xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3.2.3	Fri Nov 10 15:19:30 2006
+++ xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php	Fri Nov 10 20:30:00 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarSelectForm.class.php,v 1.1.2.3.2.3 2006/11/10 06:19:30 minahito Exp $
+ * @version $Id: AvatarSelectForm.class.php,v 1.1.2.3.2.4 2006/11/10 11:30:00 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -42,7 +42,7 @@
 		//
 		// Check whether specified avatar_id exists. 
 		//
-		$handler =& xoops_getmodulehandler('avatar');
+		$handler =& xoops_getmodulehandler('avatar', 'user');
 		$obj =& $handler->get($this->mSelectedId);
 		
 		if (!is_object($obj)) {
@@ -57,7 +57,7 @@
 	
 	function update(&$obj)
 	{
-		$handler =& xoops_getmodulehandler('avatar');
+		$handler =& xoops_getmodulehandler('avatar', 'user');
 		
 		if ($this->mSelectedId == 0) {
 			$obj->set('user_avatar', 'blank.gif');

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:00 +0900
Subject: [xoops-cvslog 5761] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061110113000.F07F72AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8.2.1 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8.2.2
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8.2.1	Thu Oct  5 19:18:12 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Fri Nov 10 20:30:00 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: RegistMailBuilder.class.php,v 1.1.2.8.2.1 2006/10/05 10:18:12 minahito Exp $
+ * @version $Id: RegistMailBuilder.class.php,v 1.1.2.8.2.2 2006/11/10 11:30:00 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -97,7 +97,7 @@
 		$this->mMailer->assign('SITENAME', $xoopsConfig['sitename']);
 		$this->mMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
 		$this->mMailer->assign('SITEURL', XOOPS_URL . '/');
-		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/modules/user/index.php?action=UserActivate&uid=' . $user->getVar('uid') . '&actkey=' . $user->getShow('actkey'));
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/user.php?op=actv&uid=' . $user->getVar('uid') . '&actkey=' . $user->getShow('actkey'));
 	}
 	
 	function &getResult()
@@ -144,7 +144,7 @@
 		parent::setBody($user,$xoopsConfig);
 		$this->mMailer->assign('USERNAME', $user->getVar('uname'));
 		$this->mMailer->assign('USEREMAIL', $user->getVar('email'));
-		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/modules/user/index.php?action=UserActivate&uid=' . $user->getVar('uid') . '&actkey=' . $user->getVar('actkey'));
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/user.php?op=actv&uid=' . $user->getVar('uid') . '&actkey=' . $user->getVar('actkey'));
 	}
 }
 
Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.5.2.1 xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.5.2.2
--- xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.5.2.1	Thu Oct  5 19:18:12 2006
+++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php	Fri Nov 10 20:30:00 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassMailBuilder.class.php,v 1.1.2.5.2.1 2006/10/05 10:18:12 minahito Exp $
+ * @version $Id: LostPassMailBuilder.class.php,v 1.1.2.5.2.2 2006/11/10 11:30:00 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -84,7 +84,7 @@
 		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
 		$this->mMailer->assign("SITEURL", XOOPS_URL . "/");
 		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL . "/modules/user/index.php?action=LostPass&email=" . $user->getShow('email') . "&code=" . substr($user->get("pass"), 0, 5));
+		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL . "/lostpass.php?email=" . $user->getShow('email') . "&code=" . substr($user->get("pass"), 0, 5));
 	}
 		
 	function &getResult()
Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.7 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.8
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.7	Tue Oct 17 01:15:24 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Fri Nov 10 20:30:00 2006
@@ -84,7 +84,7 @@
 		// Create action object by mActionName
 		//
 		$this->mCreateAction->call(new XCube_Ref($this));
-
+		
 		if (!(is_object($this->mAction) && is_a($this->mAction, 'User_Action'))) {
 			die();	//< TODO
 		}

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:01 +0900
Subject: [xoops-cvslog 5762] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061110113001.7D8DE2AC02A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.1 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.2
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.13.2.1	Sun Oct 15 15:09:39 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: EditUserAction.class.php,v 1.1.2.13.2.1 2006/10/15 06:09:39 minahito Exp $
+ * @version $Id: EditUserAction.class.php,v 1.1.2.13.2.2 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -29,12 +29,15 @@
 	
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+		$root =& XCube_Root::getSingleton();
+		$uid = is_object($root->mContext->mXoopsUser) ? $root->mContext->mXoopsUser->get('uid') : 0;
+		
+		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : $uid;
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_getmodulehandler('users');
+		$handler =& xoops_getmodulehandler('users', 'user');
 		return $handler;
 	}
 
@@ -146,7 +149,7 @@
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$render)
 	{
-		$controller->executeForward('./index.php?action=UserInfo&uid=' . $this->mObject->get('uid'));
+		$controller->executeForward(XOOPS_URL . '/userinfo.php?uid=' . $this->mObject->getShow('uid'));
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.2 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.3
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.2	Fri Oct 13 18:21:56 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.2 2006/10/13 09:21:56 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.3 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -80,7 +80,7 @@
 	{
 		$this->mRegistForm =& unserialize($_SESSION['user_register_actionform']);
 		if (!is_object($this->mRegistForm)) {
-			$controller->executeForward('./index.php?action=UserRegister');
+			$controller->executeForward('./register.php?action=UserRegister');
 		}
 	}
 
Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.4 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.5
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.9.2.4	Fri Nov 10 15:19:11 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.4 2006/11/10 06:19:11 minahito Exp $
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.9.2.5 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -94,7 +94,7 @@
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_getmodulehandler('users');
+		$handler =& xoops_getmodulehandler('users', 'user');
 		return $handler;
 	}
 
@@ -151,8 +151,8 @@
 	 */
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$navi =& new XCube_PageNavigator("index.php?action=AvatarEdit&amp;uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
-		$handler =& xoops_getmodulehandler('avatar');
+		$navi =& new XCube_PageNavigator(XOOPS_URL . "/edituser.php?op=avatarform&amp;uid=" . $xoopsUser->get('uid'), XCUBE_PAGENAVI_START);
+		$handler =& xoops_getmodulehandler('avatar', 'user');
 		
 		$this->mSystemAvatars[] =& $handler->createNoavatar();
 		
@@ -178,7 +178,7 @@
 		if ($this->mObject == null) {
 			return USER_FRAME_VIEW_ERROR;
 		}
-	
+		
 		$this->mActionForm->load($this->mObject);
 		
 		$this->mActionForm->fetch();
@@ -208,7 +208,7 @@
 		}
 		
 		if ($this->mActionForm->mOldAvatarFilename != null && $this->mActionForm->mOldAvatarFilename != "blank.gif") {
-			$avatarHandler =& xoops_getmodulehandler('avatar');
+			$avatarHandler =& xoops_getmodulehandler('avatar', 'user');
 			$criteria =& new Criteria('avatar_file', $this->mActionForm->mOldAvatarFilename);
 			$avatarArr =& $avatarHandler->getObjects($criteria);
 			if (count($avatarArr) > 0 && is_object($avatarArr[0]) && $avatarArr[0]->get('avatar_type') == 'C') {
@@ -220,10 +220,10 @@
 			$avatar =& $this->mActionForm->createAvatar();
 			if ($avatar != null) {
 				$avatar->set('avatar_name', $this->mObject->get('uname'));
-				$avatarHandler =& xoops_getmodulehandler('avatar');
+				$avatarHandler =& xoops_getmodulehandler('avatar', 'user');
 				$avatarHandler->insert($avatar);
 				
-				$linkHandler =& xoops_getmodulehandler('avatar_user_link');
+				$linkHandler =& xoops_getmodulehandler('avatar_user_link', 'user');
 				$linkHandler->deleteAllByUser($this->mObject);
 				
 				$link =& $linkHandler->create();
@@ -258,12 +258,12 @@
 	
 	function executeViewSuccess(&$controller, &$xoopsUser, $render)
 	{
-		$controller->executeForward("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'));
+		$controller->executeForward(XOOPS_URL . "/userinfo.php?uid=" . $this->mActionForm->get('uid'));
 	}
 
 	function executeViewError(&$controller,&$xoopsUser,&$render)
 	{
-		$controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect(XOOPS_URL . "/userinfo.php?uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
 	}
 }
 
Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.1 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.2
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.11.2.1	Sun Oct 15 15:43:34 2006
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserRegisterAction.class.php,v 1.1.2.11.2.1 2006/10/15 06:43:34 minahito Exp $
+ * @version $Id: UserRegisterAction.class.php,v 1.1.2.11.2.2 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -46,7 +46,7 @@
 			return USER_FRAME_VIEW_INPUT;
 		} else {
 			$_SESSION['user_register_actionform'] = serialize(&$this->mActionForm);
-			$controller->executeForward('./index.php?action=UserRegister_confirm');
+			$controller->executeForward('./register.php?action=confirm');
 		}
 	}
 
Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.2 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.3
--- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.9.2.2	Sun Oct 15 15:09:31 2006
+++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AvatarSelectAction.class.php,v 1.1.2.9.2.2 2006/10/15 06:09:31 minahito Exp $
+ * @version $Id: AvatarSelectAction.class.php,v 1.1.2.9.2.3 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -23,7 +23,7 @@
 	{
 		parent::prepare($controller, $xoopsUser, $moduleConfig);
 
-		$handler =& xoops_getmodulehandler('avatar');
+		$handler =& xoops_getmodulehandler('avatar', 'user');
 		$criteria =& new Criteria('avatar_file', $xoopsUser->get('user_avatar'));
 		$avatarArr =& $handler->getObjects($criteria);
 		if (count($avatarArr) > 0) {
@@ -38,7 +38,7 @@
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_getmodulehandler('users');
+		$handler =& xoops_getmodulehandler('users', 'user');
 		return $handler;
 	}
 
@@ -91,7 +91,7 @@
 	function _doExecute()
 	{
 		if ($this->mObjectHandler->insert($this->mObject)) {
-			$avatarHandler =& xoops_getmodulehandler('avatar');
+			$avatarHandler =& xoops_getmodulehandler('avatar', 'user');
 
 			//
 			// If old avatar is a cutom avatar, delete it.
@@ -103,7 +103,7 @@
 			//
 			// Delete all of links about this user from avatar_user_link.
 			//
-			$linkHandler =& xoops_getmodulehandler('avatar_user_link');
+			$linkHandler =& xoops_getmodulehandler('avatar_user_link', 'user');
 			$linkHandler->deleteAllByUser($this->mObject);
 			
 			//
@@ -127,17 +127,17 @@
 	 */
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$controller->executeForward("./index.php?action=AvatarUpload&uid=" . $this->mObject->get('uid'));
+		$controller->executeForward(XOOPS_URL . "/edituser.php?op=avatarform&uid=" . $this->mObject->get('uid'));
 	}
 	
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
 	{
-		$controller->executeForward("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'));
+		$controller->executeForward(XOOPS_URL . "/userinfo.php?op=avatarform&uid=" . $this->mActionForm->get('uid'));
 	}
 
 	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
 	{
-		$controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect(XOOPS_URL . "/userinfo.php?op=avatarform&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
 	}
 }
 
Index: xoops2jp/html/modules/user/actions/UserInfoAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.1
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9	Thu Sep 14 17:17:39 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserInfoAction.class.php,v 1.1.2.9 2006/09/14 08:17:39 minahito Exp $
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.1 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -47,7 +47,7 @@
 			return USER_FRAME_VIEW_ERROR;
 		}
 		
-		$rankHandler =& xoops_getmodulehandler('ranks');
+		$rankHandler =& xoops_getmodulehandler('ranks', 'user');
 		$this->mRankObject =& $rankHandler->get($this->mObject->get('rank'));
 		
 		$root =& $controller->mRoot;
@@ -119,7 +119,7 @@
 	
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		$controller->executeForward("./index.php");
+		$controller->executeForward(XOOPS_URL . '/user.php');
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:01 +0900
Subject: [xoops-cvslog 5763] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20061110113001.C1BC22AC065@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.4 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.5
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.4	Mon Oct 23 20:22:10 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Fri Nov 10 20:30:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.11.2.4 2006/10/23 11:22:10 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.11.2.5 2006/11/10 11:30:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -17,22 +17,25 @@
 	 */
 	function userinfo()
 	{
+		//
+		// Boot the action frame of the user module directly.
+		//
 		$root =& XCube_Root::getSingleton();
+		$root->mController->executeHeader();
 		
-		$uid = isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+		$root->mController->setupModuleContext('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
 		
-		$url = XOOPS_URL . '/';
-		if ($uid > 0) {
-			$url = XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=" . $uid;
-		}
-		else {
-			$xoopsUser =& $root->mContext->mXoopsUser;
-			if (is_object($xoopsUser)) {
-				$url = XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=" . $xoopsUser->get('uid');
-			}
-		}
+		require_once XOOPS_MODULE_PATH . "/user/class/ActionFrame.class.php";
+
+		$moduleRunner = new User_ActionFrame(false);
+		$moduleRunner->setActionName("UserInfo");
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
 		
-		$root->mController->executeForward($url);
+		$root->mController->executeView();
 	}
 	
 	/**
@@ -41,21 +44,37 @@
 	 */
 	function edituser()
 	{
+		$actionName = "EditUser";
+		switch (xoops_getrequest('op')) {
+			case 'avatarform':
+			case 'avatarupload':
+				$actionName = "AvatarEdit";
+				break;
+				
+			case 'avatarchoose':
+				$actionName = "AvatarSelect";
+				break;
+		}
+		
+		//
+		// Boot the action frame of the user module directly.
+		//
 		$root =& XCube_Root::getSingleton();
-		$uid = isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+		$root->mController->executeHeader();
+		
+		$root->mController->setupModuleContext('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
+		
+		require_once XOOPS_MODULE_PATH . "/user/class/ActionFrame.class.php";
 
-		$url = XOOPS_URL . '/';
-		if ($uid > 0) {
-			$url = XOOPS_MODULE_URL . "/user/index.php?action=EditUser&uid=" . $uid;
-		}
-		else {
-			$xoopsUser =& $root->mContext->mXoopsUser;
-			if (is_object($xoopsUser)) {
-				$url = XOOPS_MODULE_URL . "/user/index.php?action=EditUser&uid=" . $xoopsUser->get('uid');
-			}
-		}
+		$moduleRunner = new User_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
 
-		$root->mController->executeForward($url);
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 	
 	/**
@@ -70,9 +89,29 @@
 		if (is_object($xoopsUser)) {
 			$root->mController->executeForward(XOOPS_URL);
 		}
-		else {
-			$root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserRegister");
-		}
+		
+		//
+		// Boot the action frame of the user module directly.
+		//
+		$root->mController->executeHeader();
+
+		$root->mController->setupModuleContext('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
+				
+		require_once XOOPS_MODULE_PATH . "/user/class/ActionFrame.class.php";
+
+		$root =& XCube_Root::getSingleton();
+
+		$actionName = isset($_REQUEST['action']) ? "UserRegister_confirm" : "UserRegister";
+
+		$moduleRunner = new User_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 	
 	/**
@@ -88,9 +127,27 @@
 		if (is_object($xoopsUser)) {
 			$root->mController->executeForward(XOOPS_URL);
 		}
-		else {
-			$root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
-		}
+		
+		//
+		// Boot the action frame of the user module directly.
+		//
+		$root->mController->executeHeader();
+
+		$root->mController->setupModuleContext('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
+				
+		require_once XOOPS_MODULE_PATH . "/user/class/ActionFrame.class.php";
+
+		$root =& XCube_Root::getSingleton();
+
+		$moduleRunner = new User_ActionFrame(false);
+		$moduleRunner->setActionName("Lostpass");
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 
 	/**
@@ -103,25 +160,51 @@
 		$op = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "main";
 		$xoopsUser =& $root->mContext->mXoopsUser;
 		
+		$actionName = "default";
+		
 		switch($op) {
-			case "main":
-				$url = is_object($xoopsUser) ? XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid')
-				                               : XOOPS_MODULE_URL . "/user/index.php"; 
-				$root->mController->executeForward($url);
-				break;
-				
-			case "delete":
-				$root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserDelete");
-				break;
-				
 			case "login":
 				$root->mController->checkLogin();
-				break;
+				return;
 			
 			case "logout":
 				$root->mController->logout();
+				return;
+				
+			case "main":
+				if (is_object($xoopsUser)) {
+					$root->mController->executeForward(XOOPS_URL . "/userinfo.php?uid=" . $xoopsUser->get('uid'));
+				}
+				break;
+				
+			case "actv":
+				$actionName = "UserActivate";
+				break;
+				
+			case "delete":
+				$actionName = "UserDelete";
 				break;
 		}
+		
+		//
+		// Boot the action frame of the user module directly.
+		//
+		$root =& XCube_Root::getSingleton();
+		$root->mController->executeHeader();
+		
+		$root->mController->setupModuleContext('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
+		
+		require_once XOOPS_MODULE_PATH . "/user/class/ActionFrame.class.php";
+
+		$moduleRunner = new User_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 	
 	function checkLogin(&$xoopsUser)

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:23 +0900
Subject: [xoops-cvslog 5762] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061110113023.AA5802AC065@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.3 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.4
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.3	Sat Nov  4 17:09:01 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Fri Nov 10 20:30:23 2006
@@ -1,11 +1,11 @@
-<{if $user_ownpage == true && $enableSelfDelete == true}>
+<{if $user_ownpage == true && $enableSelfDelete == true && $xoops_isadmin == false}>
   <div style="text-align:right;">
-      <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserDelete"><{$smarty.const._MD_USER_LANG_DELACCOUNT}></a>
+      <a href="<{$xoops_url}>/user.php?op=delete"><{$smarty.const._MD_USER_LANG_DELACCOUNT}></a>
   </div>
 <{elseif $xoops_isadmin == true}>
   <div style="text-align:right;">
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_EDITPROFILE}></a> - 
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_DELACCOUNT}></a>
+    <a href="<{$xoops_url}>/edituser.php?uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_EDITPROFILE}></a> - 
+    <a href="<{$xoops_url}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_DELACCOUNT}></a>
   </div>
 <{/if}>
 
@@ -22,7 +22,7 @@
       <{if $user_ownpage == true}>
       <tr>
         <td class="head" colspan="2" style="text-align:center;">
-          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_EDITPROFILE}></a>
+          <a href="<{$xoops_url}>/edituser.php?uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_EDITPROFILE}></a>
         </td>
       </tr>
       <{/if}>
@@ -35,7 +35,7 @@
             <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="No Avatar" title="No Avatar" />
           <{/if}>
           <{if $user_ownpage == true}>
-            <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
+            <br /><a href="<{$xoops_url}>/edituser.php?op=avatarform&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
           <{/if}>
         </td>
       </tr>
Index: xoops2jp/html/modules/user/templates/user_delete.html
diff -u xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.2.2.1 xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.2.2.2
--- xoops2jp/html/modules/user/templates/user_delete.html:1.1.2.2.2.1	Sun Oct 15 22:11:33 2006
+++ xoops2jp/html/modules/user/templates/user_delete.html	Fri Nov 10 20:30:23 2006
@@ -10,7 +10,7 @@
 
 <div class='confirmMsg'>
   <h4><{$self_delete_message|nl2br}></h4>
-  <form method="post" action="<{$action|escape}>">
+  <form method="post" action="#">
     <{xoops_token form=$actionForm}>
     <input type="submit" value="<{$smarty.const._DELETE}>" />
     <input type="button" name="confirm_back" value="<{$smarty.const._CANCEL}>"  onclick="javascript:history.go(-1);" />
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.4 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.5
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.4	Sat Nov  4 17:08:45 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Fri Nov 10 20:30:23 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
+<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|escape}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
 &nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._MD_USER_LANG_EDITPROFILE}>
 </div>
 
@@ -13,7 +13,7 @@
 </div>
 <{/if}>
 
-<form action="./index.php?action=EditUser" method="post">
+<form action="#" method="post">
 <{xoops_token form=$actionForm}>
 <{xoops_input name=uid type=hidden value=$actionForm->get('uid')}>
 <table class="outer" cellspacing="1" width="100%">
Index: xoops2jp/html/modules/user/templates/user_default.html
diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5.2.1
--- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.5	Fri Aug 18 14:35:29 2006
+++ xoops2jp/html/modules/user/templates/user_default.html	Fri Nov 10 20:30:23 2006
@@ -1,4 +1,4 @@
-<form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post">
+<form action="<{$xoops_url}>/user.php" method="post">
 <input type="hidden" name="op" value="login" />
 <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" />
 <table class="outer">
Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.1 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.2
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.1	Fri Nov 10 15:19:37 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Fri Nov 10 20:30:23 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')|escape}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
+<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|escape}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
 &nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
 </div>
 
@@ -14,7 +14,7 @@
 </div>
 <{/if}>
 
-<form action="./index.php?action=AvatarEdit" method="post" enctype="multipart/form-data">
+<form action="<{$xoops_url}>/edituser.php?op=avatarupload" method="post" enctype="multipart/form-data">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=uid value=$actionForm->get('uid')}>
   <table class="outer">
@@ -53,7 +53,7 @@
 </form>
 <{/if}>
 
-<form method="post" action="index.php?action=AvatarSelect">
+<form method="post" action="<{$xoops_url}>/edituser.php?op=avatarchoose">
   <{xoops_token form=$avatarSelectForm}>
   <{xoops_input type=hidden name=uid value=$avatarSelectForm->get('uid')}>
   <table class="outer" style="text-align:center;">
Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.1 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.2
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.1	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Fri Nov 10 20:30:23 2006
@@ -8,7 +8,7 @@
 </div>
 <{/if}>
 
-<form action="index.php?action=UserRegister" method="post">
+<form action="#" method="post">
 <{xoops_token form=$actionForm}>
 <table class="outer" width="100%">
   <tr>
Index: xoops2jp/html/modules/user/templates/user_lostpass.html
diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7.2.1
--- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7	Fri Aug 18 14:35:29 2006
+++ xoops2jp/html/modules/user/templates/user_lostpass.html	Fri Nov 10 20:30:23 2006
@@ -8,7 +8,7 @@
 </div>
 <{/if}>
 
-<form action="index.php?action=LostPass" method="post">
+<form action="#" method="post">
 <{xoops_token form=$actionForm}>
 <table class="outer">
   <tr>
Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.7.2.1 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.7.2.2
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.7.2.1	Sun Oct 15 22:11:33 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Fri Nov 10 20:30:23 2006
@@ -1,4 +1,4 @@
-<form action="index.php?action=UserRegister_confirm" method="post">
+<form action="#" method="post">
 <table width="100%" class="outer">
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_NICKNAME}></td>

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:49 +0900
Subject: [xoops-cvslog 5763] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20061110113049.7DBD12AC02A@users.sourceforge.jp>

Index: xoops2jp/html/themes/cube_default/package.ini.php
diff -u xoops2jp/html/themes/cube_default/package.ini.php:1.1.2.2.2.2 xoops2jp/html/themes/cube_default/package.ini.php:removed
--- xoops2jp/html/themes/cube_default/package.ini.php:1.1.2.2.2.2	Sun Oct 15 02:46:20 2006
+++ xoops2jp/html/themes/cube_default/package.ini.php	Fri Nov 10 20:30:49 2006
@@ -1,21 +0,0 @@
-<?php
-/**
-
-[Manifesto]
-Name="Default theme of Cube"
-Depends=Legacy_RenderSystem,legacy
-Url="http://xoopscube.org"
-Version="1.0.0"
-
-[Theme]
-RenderSystem=Legacy_RenderSystem
-Format="XOOPS2 Legacy Style"
-Author=XOOPS Cube Project Team
-ScreenShot="screenshot.png"
-Description="Default theme of XOOPS Cube 2.1"
-W3C=NG
-
-Licence="GPL"
-
-*/
-?>
\ No newline at end of file
Index: xoops2jp/html/themes/cube_default/manifesto.ini.php
diff -u /dev/null xoops2jp/html/themes/cube_default/manifesto.ini.php:1.1.2.1
--- /dev/null	Fri Nov 10 20:30:49 2006
+++ xoops2jp/html/themes/cube_default/manifesto.ini.php	Fri Nov 10 20:30:49 2006
@@ -0,0 +1,21 @@
+<?php
+/**
+
+[Manifesto]
+Name="Default theme of Cube"
+Depends=Legacy_RenderSystem,legacy
+Url="http://xoopscube.org"
+Version="1.0.0"
+
+[Theme]
+RenderSystem=Legacy_RenderSystem
+Format="XOOPS2 Legacy Style"
+Author=XOOPS Cube Project Team
+ScreenShot="screenshot.png"
+Description="Default theme of XOOPS Cube 2.1"
+W3C=NG
+
+Licence="GPL"
+
+*/
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 10 20:30:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 20:30:49 +0900
Subject: [xoops-cvslog 5764] CVS update: xoops2jp/html/themes/default
Message-ID: <20061110113049.A4EDB2AC127@users.sourceforge.jp>

Index: xoops2jp/html/themes/default/package.ini.php
diff -u xoops2jp/html/themes/default/package.ini.php:1.1.2.2.2.1 xoops2jp/html/themes/default/package.ini.php:removed
--- xoops2jp/html/themes/default/package.ini.php:1.1.2.2.2.1	Sun Oct 15 02:47:12 2006
+++ xoops2jp/html/themes/default/package.ini.php	Fri Nov 10 20:30:49 2006
@@ -1,21 +0,0 @@
-<?php
-/**
-
-[Manifesto]
-Name="Default Theme"
-Depends=Legacy_RenderSystem,legacy
-Url="http://www.xoops.org"
-Version="1.0.0"
-
-[Theme]
-RenderSystem=Legacy_RenderSystem
-Format="XOOPS2 Legacy Style"
-Author=XOOPS Project Team
-ScreenShot="screenshot.png"
-Description="This is the theme that was a standard of XOOPS2 once"
-W3C=NG
-
-Licence="GPL"
-
-*/
-?>
\ No newline at end of file
Index: xoops2jp/html/themes/default/manifesto.ini.php
diff -u /dev/null xoops2jp/html/themes/default/manifesto.ini.php:1.1.4.1
--- /dev/null	Fri Nov 10 20:30:49 2006
+++ xoops2jp/html/themes/default/manifesto.ini.php	Fri Nov 10 20:30:49 2006
@@ -0,0 +1,21 @@
+<?php
+/**
+
+[Manifesto]
+Name="Default Theme"
+Depends=Legacy_RenderSystem,legacy
+Url="http://www.xoops.org"
+Version="1.0.0"
+
+[Theme]
+RenderSystem=Legacy_RenderSystem
+Format="XOOPS2 Legacy Style"
+Author=XOOPS Project Team
+ScreenShot="screenshot.png"
+Description="This is the theme that was a standard of XOOPS2 once"
+W3C=NG
+
+Licence="GPL"
+
+*/
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 10 23:21:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 10 Nov 2006 23:21:39 +0900
Subject: [xoops-cvslog 5765] CVS update:
	xoops2jp/html/modules/legacy/admin/theme/icons
Message-ID: <20061110142139.BE3D12AC172@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/icons/upgrade.gif

From nobunobu ＠ users.sourceforge.jp  Fri Nov 10 23:29:36 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 10 Nov 2006 23:29:36 +0900
Subject: [xoops-cvslog 5766] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061110142936.58F302AC172@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.10 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.11
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.10	Fri Nov 10 01:00:14 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Fri Nov 10 23:29:36 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.10 2006/11/09 16:00:14 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.11 2006/11/10 14:29:36 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -61,6 +61,7 @@
 	
 	function &get_template_vars($name = null)
 	{
+		$root =& XCube_Root::getSingleton();
 		if (!isset($name)) {
 			foreach ($this->_mContextReserve as $t_key => $t_value) {
 				$this->_tpl_vars[$t_key] = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$t_value]), ENT_QUOTES);
@@ -68,7 +69,6 @@
 			return parent::get_template_vars($name);
 		}
 		elseif (isset($this->_mContextReserve[$name])) {
-			$root =& XCube_Root::getSingleton();
 			$value = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$name]), ENT_QUOTES);
 		}
 		else {

From nobunobu ＠ users.sourceforge.jp  Fri Nov 10 23:44:27 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 10 Nov 2006 23:44:27 +0900
Subject: [xoops-cvslog 5767] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061110144427.51FFC2AC172@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.11 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.12
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.11	Fri Nov 10 23:29:36 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Fri Nov 10 23:44:27 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.11 2006/11/10 14:29:36 nobunobu Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.12 2006/11/10 14:44:27 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -64,7 +64,9 @@
 		$root =& XCube_Root::getSingleton();
 		if (!isset($name)) {
 			foreach ($this->_mContextReserve as $t_key => $t_value) {
-				$this->_tpl_vars[$t_key] = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$t_value]), ENT_QUOTES);
+			    if (isset($this->_mContextReserve[$t_value])) {
+				    $this->_tpl_vars[$t_key] = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$t_value]), ENT_QUOTES);
+				}
 			}
 			return parent::get_template_vars($name);
 		}

From nobunobu ＠ users.sourceforge.jp  Sat Nov 11 02:13:40 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 11 Nov 2006 02:13:40 +0900
Subject: [xoops-cvslog 5768] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061110171340.356FF2AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php:1.1.2.5	Thu Nov  9 18:09:05 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleInstallAction.class.php	Sat Nov 11 02:13:39 2006
@@ -130,7 +130,8 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		return Legacy_ModuleInstallUtils::createInstaller($dirname);
+		$installer =& Legacy_ModuleInstallUtils::createInstaller($dirname);
+		return $installer;
 	}
 		
 	function _setupActionForm()
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.6	Thu Nov  9 18:09:20 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Sat Nov 11 02:13:40 2006
@@ -121,7 +121,8 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		return Legacy_ModuleInstallUtils::createUninstaller($dirname);
+		$installer =&  Legacy_ModuleInstallUtils::createUninstaller($dirname);
+		return $installer;
 	}
 	
 	function _setupActionForm()
Index: xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.10 xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php:1.1.2.10	Fri Nov 10 00:55:01 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUpdateAction.class.php	Sat Nov 11 02:13:40 2006
@@ -133,7 +133,8 @@
 	function &_getInstaller()
 	{
 		$dirname = $this->mXoopsModule->get('dirname');
-		return Legacy_ModuleInstallUtils::createUpdater($dirname);
+		$installer =& Legacy_ModuleInstallUtils::createUpdater($dirname);
+		return $installer;
 	}
 	
 	function getDefaultView(&$controller, &$xoopsUser)

From nobunobu ＠ users.sourceforge.jp  Sat Nov 11 02:13:40 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 11 Nov 2006 02:13:40 +0900
Subject: [xoops-cvslog 5769] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061110171340.5E2AB2AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.4	Thu Nov  9 18:09:48 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Sat Nov 11 02:13:40 2006
@@ -24,7 +24,8 @@
 	 */
 	function &createInstaller($dirname)
 	{
-		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'installer', 'Legacy_ModuleInstaller');
+		$installer =& Legacy_ModuleInstallUtils::_createInstaller($dirname, 'installer', 'Legacy_ModuleInstaller');
+        return $installer;
 	}
 	
 	/**
@@ -33,7 +34,8 @@
 	 */
 	function &createUpdater($dirname)
 	{
-		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'updater', 'Legacy_ModulePhasedUpgrader');
+		$updater =& Legacy_ModuleInstallUtils::_createInstaller($dirname, 'updater', 'Legacy_ModulePhasedUpgrader');
+		return $updater;
 	}
 	
 	/**
@@ -42,7 +44,8 @@
 	 */
 	function &createUninstaller($dirname)
 	{
-		return Legacy_ModuleInstallUtils::_createInstaller($dirname, 'uninstaller', 'Legacy_ModuleUninstaller');
+		$uninstaller =& Legacy_ModuleInstallUtils::_createInstaller($dirname, 'uninstaller', 'Legacy_ModuleUninstaller');
+		return $uninstaller;
 	}
 	
 	/**

From minahito ＠ users.sourceforge.jp  Sat Nov 11 02:42:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 02:42:04 +0900
Subject: [xoops-cvslog 5770] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061110174204.8D16D2AC016@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.7 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.8
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.7	Thu Nov  9 18:36:41 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Sat Nov 11 02:42:04 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.03;
+$modversion['version'] = 2.04;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Sat Nov 11 02:42:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 02:42:29 +0900
Subject: [xoops-cvslog 5771] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061110174229.46BB32AC016@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_comment.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.2	Thu Nov  9 00:42:45 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment.html	Sat Nov 11 02:42:29 2006
@@ -43,7 +43,7 @@
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
-    <{elseif $xoops_isuser == true || $com_anonpost == true}>
+    <{elseif $xoops_isuser == false || $com_anonpost == true}>
       <td class="even"></td>
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>

From minahito ＠ users.sourceforge.jp  Sat Nov 11 02:42:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 02:42:41 +0900
Subject: [xoops-cvslog 5772] CVS update: xoops2jp/html/include
Message-ID: <20061110174241.4DD042AC0A2@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.2 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.3
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.2	Sun Oct 15 02:23:10 2006
+++ xoops2jp/html/include/comment_reply.php	Sat Nov 11 02:42:41 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.3.2.2 2006/10/14 17:23:10 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.3 2006/11/10 17:42:41 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -129,7 +129,7 @@
 
 $renderTarget->setAttribute("actionForm", $actionForm);
 $renderTarget->setAttribute("subjectIcons", $subjectIcons);
-$renderTarget->setAttribute("xoopsModuleComment", $xoopsModuleConfig);
+$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
 
 //
 // Rendering
Index: xoops2jp/html/include/comment_edit.php
diff -u xoops2jp/html/include/comment_edit.php:1.2.8.2.2.2 xoops2jp/html/include/comment_edit.php:1.2.8.2.2.3
--- xoops2jp/html/include/comment_edit.php:1.2.8.2.2.2	Sun Oct 15 02:23:10 2006
+++ xoops2jp/html/include/comment_edit.php	Sat Nov 11 02:42:41 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_edit.php,v 1.2.8.2.2.2 2006/10/14 17:23:10 minahito Exp $
+// $Id: comment_edit.php,v 1.2.8.2.2.3 2006/11/10 17:42:41 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -110,7 +110,7 @@
 
 	$renderTarget->setAttribute("actionForm", $actionForm);
 	$renderTarget->setAttribute("subjectIcons", $subjectIcons);
-	$renderTarget->setAttribute("xoopsModuleComment", $xoopsModuleConfig);
+	$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
 
 	//
 	// Rendering
Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.2 xoops2jp/html/include/comment_new.php:1.2.8.3.2.3
--- xoops2jp/html/include/comment_new.php:1.2.8.3.2.2	Sun Oct 15 02:23:10 2006
+++ xoops2jp/html/include/comment_new.php	Sat Nov 11 02:42:41 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_new.php,v 1.2.8.3.2.2 2006/10/14 17:23:10 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3.2.3 2006/11/10 17:42:41 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -132,7 +132,7 @@
 
 $renderTarget->setAttribute("actionForm", $actionForm);
 $renderTarget->setAttribute("subjectIcons", $subjectIcons);
-$renderTarget->setAttribute("xoopsModuleComment", $xoopsModuleConfig);
+$renderTarget->setAttribute("xoopsModuleConfig", $xoopsModuleConfig);
 
 //
 // Rendering

From nobunobu ＠ users.sourceforge.jp  Sat Nov 11 10:17:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 11 Nov 2006 10:17:09 +0900
Subject: [xoops-cvslog 5773] CVS update: xoops2jp/html
Message-ID: <20061111011709.820DF2AC08C@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2.2.3 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.4
--- xoops2jp/html/mainfile.dist.php:1.2.8.2.2.3	Sat Nov  4 14:20:46 2006
+++ xoops2jp/html/mainfile.dist.php	Sat Nov 11 10:17:09 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2.2.3 2006/11/04 05:20:46 nobunobu Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.4 2006/11/11 01:17:09 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -74,9 +74,28 @@
     define("XOOPS_GROUP_USERS", "2");
     define("XOOPS_GROUP_ANONYMOUS", "3");
 
-    @include_once XOOPS_ROOT_PATH.'/include/cubecore_init.php';
-    if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
-        include XOOPS_ROOT_PATH.'/include/common.php';
+    // You can select two special module process excuting mode with defining following constants
+    //
+    //  define('_LEGACY_PREVENT_LOAD_CORE_', 1);
+    //    Module process will not load any XOOPS Cube classes.
+    //    You cannot use any XOOPS Cube functions and classes.
+    //    (eg. It'll be used for reffering only MySQL Database definition.)
+    //
+    //  define('_LEGACY_PREVENT_EXEC_COMMON_', 1);
+    //    Module process will load XOOPS Cube Root class and initialize Controller class.
+    //    You can use some XOOPS Cube functions in this mode.
+    //    You can use more XOOPS Cube functions (eg. xoops_gethandler), if you write
+    //       $root=&XCube_Root::getSingleton();
+    //       $root->mController->executeCommonSubset(false);
+    //    after including mainfile.php.
+    //    It is synonym of $xoopsOption['nocommon']=1; 
+    //    But $xoopsOption['nocommon'] is deprecated.
+    //
+    if (!defined('_LEGACY_PREVENT_LOAD_CORE_') && XOOPS_ROOT_PATH != '') {
+        @include_once XOOPS_ROOT_PATH.'/include/cubecore_init.php';
+        if (!isset($xoopsOption['nocommon']) && !defined('_LEGACY_PREVENT_EXEC_COMMON_')) {
+            include XOOPS_ROOT_PATH.'/include/common.php';
+        }
     }
 }
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Nov 11 10:42:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 11 Nov 2006 10:42:48 +0900
Subject: [xoops-cvslog 5774] CVS update: xoops2jp/html
Message-ID: <20061111014248.CE22E2AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2.2.4 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.5
--- xoops2jp/html/mainfile.dist.php:1.2.8.2.2.4	Sat Nov 11 10:17:09 2006
+++ xoops2jp/html/mainfile.dist.php	Sat Nov 11 10:42:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2.2.4 2006/11/11 01:17:09 nobunobu Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.5 2006/11/11 01:42:48 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -86,7 +86,7 @@
     //    You can use some XOOPS Cube functions in this mode.
     //    You can use more XOOPS Cube functions (eg. xoops_gethandler), if you write
     //       $root=&XCube_Root::getSingleton();
-    //       $root->mController->executeCommonSubset(false);
+    //       $root->mController->executeCommonSubset();
     //    after including mainfile.php.
     //    It is synonym of $xoopsOption['nocommon']=1; 
     //    But $xoopsOption['nocommon'] is deprecated.

From minahito ＠ users.sourceforge.jp  Sat Nov 11 12:54:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 12:54:14 +0900
Subject: [xoops-cvslog 5775] CVS update: xoops2jp/html/include
Message-ID: <20061111035414.BF42B2AC12C@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.3 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.4
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.3	Sat Nov 11 02:42:41 2006
+++ xoops2jp/html/include/comment_reply.php	Sat Nov 11 12:54:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.3.2.3 2006/11/10 17:42:41 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.4 2006/11/11 03:54:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -39,6 +39,7 @@
 require_once XOOPS_ROOT_PATH.'/header.php';
 
 require_once XOOPS_MODULE_PATH . "/legacy/forms/CommentEditForm.class.php";
+require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
 
 //
 // Load message resource

From minahito ＠ users.sourceforge.jp  Sat Nov 11 12:56:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 12:56:00 +0900
Subject: [xoops-cvslog 5776] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061111035600.45C522AC1B2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_comment.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.3 xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.4
--- xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.3	Sat Nov 11 02:42:29 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment.html	Sat Nov 11 12:56:00 2006
@@ -43,7 +43,7 @@
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
-    <{elseif $xoops_isuser == false || $com_anonpost == true}>
+    <{elseif $xoops_isuser == false && $com_anonpost == true}>
       <td class="even"></td>
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>

From minahito ＠ users.sourceforge.jp  Sat Nov 11 13:20:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 13:20:13 +0900
Subject: [xoops-cvslog 5777] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061111042013.389B52AC18A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_comment.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.4 xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.5
--- xoops2jp/html/modules/legacy/templates/legacy_comment.html:1.1.2.4	Sat Nov 11 12:56:00 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment.html	Sat Nov 11 13:20:13 2006
@@ -43,7 +43,7 @@
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
-    <{elseif $xoops_isuser == false && $com_anonpost == true}>
+    <{elseif $xoops_isuser == true || ($xoops_isuser == false && $com_anonpost == true)}>
       <td class="even"></td>
       <td class="even" align="right">
         <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>

From minahito ＠ users.sourceforge.jp  Sat Nov 11 13:20:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 13:20:35 +0900
Subject: [xoops-cvslog 5778] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061111042035.559812AC18A@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.8 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.9
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.8	Sat Nov 11 02:42:04 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Sat Nov 11 13:20:35 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.04;
+$modversion['version'] = 2.05;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Sat Nov 11 13:29:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 13:29:48 +0900
Subject: [xoops-cvslog 5779] CVS update: xoops2jp/html/modules/user
Message-ID: <20061111042948.A46A52AC0A0@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.4 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.5
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.4	Fri Nov 10 20:30:00 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sat Nov 11 13:29:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.4 2006/11/10 11:30:00 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.5 2006/11/11 04:29:48 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 2.03;
+$modversion['version'] = 2.04;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Sat Nov 11 13:30:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 13:30:07 +0900
Subject: [xoops-cvslog 5780] CVS update:
	xoops2jp/html/modules/user/templates/blocks
Message-ID: <20061111043007.5C7E82AC0A0@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/blocks/user_block_login.html
diff -u xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.1 xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.2
--- xoops2jp/html/modules/user/templates/blocks/user_block_login.html:1.1.2.1.2.1	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/user/templates/blocks/user_block_login.html	Sat Nov 11 13:30:06 2006
@@ -4,7 +4,7 @@
     <{$smarty.const._MB_USER_PASSWORD}><br />
     <{xoops_input type=password name=pass size=12 maxlength=32 }><br />
 <!--<label><{xoops_input type=checkbox name=rememberme value=On class=formButton}><{$smarty.const._MB_USER_REMEMBERME}></label><br />-->
-    <{xoops_input type=hidden name=xoops_redirect value=$xoops_requesturi}>
+    <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
     <{xoops_input type=hidden name=op value=login}>
     <{xoops_input type=submit name=submit value=$smarty.const._MB_USER_LOGIN}><br />
 </form>

From minahito ＠ users.sourceforge.jp  Sat Nov 11 14:13:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 14:13:56 +0900
Subject: [xoops-cvslog 5781] CVS update: xoops2jp/docs/images
Message-ID: <20061111051356.0E5FD2AC227@users.sourceforge.jp>

Index: xoops2jp/docs/images/title.png

From minahito ＠ users.sourceforge.jp  Sat Nov 11 14:14:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 14:14:03 +0900
Subject: [xoops-cvslog 5782] CVS update: xoops2jp/docs
Message-ID: <20061111051403.60CDF2AC0CA@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.3 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.4
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.3	Wed Nov  8 18:36:42 2006
+++ xoops2jp/docs/INSTALL.ja.html	Sat Nov 11 14:14:03 2006
@@ -2,40 +2,44 @@
 <head>
 <meta http-equiv="content-type" content="text/html;charset=EUC-JP">
 <title>XOOPS Cubeインストールガイド</title>
-  <meta name="keywords" content="XOOPS Cube docs" />
-  <meta name="description" content="XOOPS Cube" />
-  <style>
-    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3; }
-    .error { color: #CC3333; font-weight: bold; }
-    UL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
-    OL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
-    .indent { margin-left: 40px; }
-    FORM { margin: 0px; padding: 0px; }
-    
-    H1, H2, H3, H4, H5 { margin: 0px; padding: 0px; }
-    
-    .additions { color: #008800; }
-    .deletions { color: #880000; }
-    
-	.header { padding: 10px; padding-top: 0px; }
-    .page { background-color: #FFFFFF; padding: 10px; border: 1px inset;}
-	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC; }
-	.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
-
-    .revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
-	
-	.copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
-	.copyright A { color: #AAAAAA; }
+<meta name="keywords" content="XOOPS Cube docs" />
+<meta name="description" content="XOOPS Cube" />
+
+<style type="text/css">
+
+body {margin:0; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%;}
+ul, ol {margin:0; padding:0;}
+li {margin-left:60px;}
+
+h1, h2, h3, h4, h5 {margin:0.5em 0;}
+h1 {font-size:150%;}
+h2 {font-size:140%;}
+h3 {font-size:130%;}
+h4 {font-size:120%; padding:5px; padding-left:26px; background:transparent url(images/title.png) no-repeat center left; border-bottom:1px solid #cccccc;}
+h5 {font-size:110%:}
+
+
+.error {color:#CC3333; font-weight:bold;}
+.indent {margin-left:40px;}
+.additions {color:#008800;}
+.deletions {color:#880000;}
+
+.page {background:#FFFFFF; padding:15px 20px; margin:15px; border:1px solid #cccccc;}
+.page p {margin-left:20px;}
+
+.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
+
+.revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
+
+.copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
+.copyright A { color: #AAAAAA; }
 </style>
 </head>
 
-<body bgcolor="#F8F8F8" text="#000000">
+<body>
 <div class="page">
-<h3>XOOPS Cube Legacy のインストール方法</h3>
+<h2>XOOPS Cube Legacy のインストール方法</h2>
 <hr noshade size="1" />
-<br />
-<h4>はじめてのインストール</h4>
-<br /><br />
 <h4>はじめに</h4>
 <p>
 XOOPS Cube Legacy のインストールを始める前に、サーバ上で稼動・運用するソフトウエアのインストールや管理についての知識を習得されるよう、おすすめします。
@@ -52,25 +56,23 @@
 はじめてXOOPS Cubeをインストールする場合、
 少なくとも以下のソフトウエアをサーバコンピュータにインストールしておく必要があります。
 </p>
-<div class="indent">
-* HTTPサーバ (<a href="http://www.apache.org">Apache</a> または IIS) 注：XOOPS Cube公式サポートHTTPサーバはApache<br />
-* <a href="http://www.php.net">PHP</a> 4.3.2 以上<br />
-* <a href="http://www.mysql.com">MySQL</a> データベース 3.23.XX<br />
-</div>
+
+<ul>
+<li>HTTPサーバ (<a href="http://www.apache.org">Apache</a> または IIS) 注：XOOPS Cube公式サポートHTTPサーバはApache</li>
+<li><a href="http://www.php.net">PHP</a> 4.3.2 以上</li>
+<li><a href="http://www.mysql.com">MySQL</a> データベース 3.23.XX</li>
+</ul>
 
 <p>インストールを始める前に次の準備をしてください</p>
-<div class="indent">
-* HTTPサーバ、PHP、データベースサーバを適切にセットアップする。<br />
-*  <a href="http://xoopscube.org">XOOPS Cube Legacy</a> をインストールするデータベースを作成する。<br />
-<div class="indent">
-（もし、作成する権限がない場合は、サーバ管理者かサーバホスティング会社に依頼してください。）<br />
-</div>
-* 上記のデータベースにアクセスできる、データベースサーバのユーザアカウントを準備する。<br />
-* XOOPS Cube Legacy のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、
-および「mainfile.php」ファイルのパーミッションをPHPから書き込み可能に設定する。
-<br />
-* ブラウザのクッキーと<span class="missingpage">JavaScript</span>を有効にする。<br />
-</div>
+
+<ul>
+<li>HTTPサーバ、PHP、データベースサーバを適切にセットアップする。</li>
+<li><a href="http://xoopscube.org">XOOPS Cube Legacy</a> をインストールするデータベースを作成する。<br />
+（もし、作成する権限がない場合は、サーバ管理者かサーバホスティング会社に依頼してください。）</li>
+<li>上記のデータベースにアクセスできる、データベースサーバのユーザアカウントを準備する。</li>
+<li>XOOPS Cube Legacy のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、および「mainfile.php」ファイルのパーミッションをPHPから書き込み可能に設定する。</li>
+<li>ブラウザのクッキーと<span class="missingpage">JavaScript</span>を有効にする。</li>
+</ul>
 <br />
 
 <h4>ローカル環境へのインストール</h4>
Index: xoops2jp/docs/INSTALL.html
diff -u xoops2jp/docs/INSTALL.html:1.1.8.1.2.1 xoops2jp/docs/INSTALL.html:1.1.8.1.2.2
--- xoops2jp/docs/INSTALL.html:1.1.8.1.2.1	Wed Nov  8 18:36:42 2006
+++ xoops2jp/docs/INSTALL.html	Sat Nov 11 14:14:03 2006
@@ -3,118 +3,150 @@
   <title>Xoops Cube Install Guide</title>
   <meta name="keywords" content="XOOPS docs" />
   <meta name="description" content="XOOPS" />
-  <style>
-    P, TD, LI, INPUT, BODY, SELECT, TEXTAREA { font-family: Verdana; font-size: 13px; line-height: 1.3; }
-    .error { color: #CC3333; font-weight: bold; }
-    UL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
-    OL { margin-top: 0px; margin-bottom: 0px; padding-top: 0px; padding-bottom: 0px; }
-    .indent { margin-left: 40px; }
-    FORM { margin: 0px; padding: 0px; }
-    
-    H1, H2, H3, H4, H5 { margin: 0px; padding: 0px; }
-    
-    .additions { color: #008800; }
-    .deletions { color: #880000; }
-    
-	.header { padding: 10px; padding-top: 0px; }
-    .page { background-color: #FFFFFF; padding: 10px; border: 1px inset;}
-	.footer { background-color: #DDDDDD; padding: 5px 10px; border: 1px inset; border-top: none; border-top: 1px solid #CCCCCC; }
-	.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
-
-    .revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
-	
-	.copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
-	.copyright A { color: #AAAAAA; }
+<style type="text/css">
+
+body {margin:0; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%;}
+ul, ol {margin:0; padding:0;}
+li {margin-left:60px;}
+
+h1, h2, h3, h4, h5 {margin:0.5em 0;}
+h1 {font-size:150%;}
+h2 {font-size:140%;}
+h3 {font-size:140%;}
+h4 {font-size:120%; padding:5px; padding-left:26px; background:transparent url(images/title.png) no-repeat center left; border-bottom:1px solid #cccccc;}
+h5 {font-size:110%:}
+
+
+.error {color:#CC3333; font-weight:bold;}
+.indent {margin-left:40px;}
+.additions {color:#008800;}
+.deletions {color:#880000;}
+
+.page {background:#FFFFFF; padding:15px 20px; margin:15px; border:1px solid #cccccc;}
+.page p {margin-left:20px;}
+
+.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
+
+.revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
+
+.copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
+.copyright A { color: #AAAAAA; }
 </style>
 </head>
 
-<body
-	bgcolor="#F8F8F8" text="#000000">
+<body>
 
 <div class="page">
-<h3>Installing XOOPS</h3>
+<h3>Installing XOOPS Cube</h3>
 <hr noshade size="1" />
-<br />
-<h4>First time installation</h4>
-<br />
 <h4>Preface:</h4>
-Before begining the install process, we (the XOOPS Cube team) ask that you have a good understanding of how to install and support server/hosted based software.  As with anything in life, there's no easy answer or way.  Sinice XOOPS is server based, it's not as easy to install as normal desktop software which in itself can be daunting to install so, please be familiar with setting up and installing the software listed below.  Be familiar with how to configure CGI scripts and HTTP server software.  It can easily be demonstrated that 80% of our support questions wind up being improper configurations with the server componenets or two pieces of software conflict. No two servers are configured alike.<br />
-<br />
-<br />
-To install XOOPS for the first time, you'll need to have the minimum following server software pre-installed:<br />
-<div class="indent">* HTTP Server (<a href="http://www.apache.org">Apache</a> or IIS)  "Note, XOOPS only officially supports Apache"<br />
-* <a href="http://www.php.net">PHP</a> 4.3.2 and higher<br />
-* <a href="http://www.mysql.com">MySQL</a> Database 3.23.XX</div>
-<br />
-Before starting the install, be sure to have:<br />
-<div class="indent">* Setup the HTTP, PHP and database server properly.<br />
-* Create a database for your <a href="http://xoopscube.org">XOOPS Cube Legacy</a> installation <br />
-<div class="indent">(Have your hosting company create one if you can't. The install script does provide this capability with the proper privileges).<br />
-</div>* A user account with the proper database permissions.<br />
-* The ability to set the following directories and files world writeable: uploads/, cache/ and templates_c/ and the file mainfile.php<br />
-* Turn cookie and <span class="missingpage">JavaScript</span><a href="http://wiki.xoops.org/wakka.php?wakka=JavaScript/edit">?</a> support in your browser on.</div>
-<br />
-<br />
+
+<p>
+Before begining the install process, we (the XOOPS Cube team) ask that you have a good understanding of how to install and support server/hosted based software.  As with anything in life, there's no easy answer or way.  Sinice XOOPS is server based, it's not as easy to install as normal desktop software which in itself can be daunting to install so, please be familiar with setting up and installing the software listed below.  Be familiar with how to configure CGI scripts and HTTP server software.  It can easily be demonstrated that 80% of our support questions wind up being improper configurations with the server componenets or two pieces of software conflict. No two servers are configured alike.</p>
+
+<p>
+To install XOOPS for the first time, you'll need to have the minimum following server software pre-installed:
+</p>
+<ul>
+<li>HTTP Server (<a href="http://www.apache.org">Apache</a> or IIS)  "Note, XOOPS only officially supports Apache"</li>
+<li><a href="http://www.php.net">PHP</a> 4.3.2 and higher</li>
+<li><a href="http://www.mysql.com">MySQL</a> Database 3.23.XX</li>
+</ul>
+
+<p>
+Before starting the install, be sure to have:
+</p>
+
+<ul>
+<li>Setup the HTTP, PHP and database server properly.</li>
+<li>Create a database for your <a href="http://xoopscube.org">XOOPS Cube Legacy</a> installation <br />
+(Have your hosting company create one if you can't. The install script does provide this capability with the proper privileges).</li>
+<li>A user account with the proper database permissions.</li>
+<li>The ability to set the following directories and files world writeable: uploads/, cache/ and templates_c/ and the file mainfile.php</li>
+<li>Turn cookie and <span class="missingpage">JavaScript</span><a href="http://wiki.xoops.org/wakka.php?wakka=JavaScript/edit">?</a> support in your browser on.</li>
+</ul>
+</p>
+
 <h4>Installing locally</h4>
-If your running a local environment for development or testing, make sure that you have the previous requirements met.  Once this is done, copy the contents of the HTML directory (from the XOOPS Cube Legacy distribution file or CVS) to the root document path of your web environment. Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
-<br />
+<p>
+If your running a local environment for development or testing, make sure that you have the previous requirements met.  Once this is done, copy the contents of the HTML directory (from the XOOPS Cube Legacy distribution file or CVS) to the root document path of your web environment. Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.
+</p>
+
 <h4>Installing on a hosted platform</h4>
-If your running in a hosted environment, unpack the XOOPS Cube Legacy files locally or on the server if you have telnet or SSH access. Once you done this, make sure to move or copy all XOOPS Cube Legacy files from the HTML directory to your root web directory (your provider usually provides this location with directions).  Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.<br />
-<br />
+<p>
+If your running in a hosted environment, unpack the XOOPS Cube Legacy files locally or on the server if you have telnet or SSH access. Once you done this, make sure to move or copy all XOOPS Cube Legacy files from the HTML directory to your root web directory (your provider usually provides this location with directions).  Once the files are copied there, you can start the install by typing <a href="http://yoursite.com">http://yoursite.com</a>.  This will start the install process.</p>
+
 <h4>Continuing the install</h4>
-<img src="images/install001.gif" /><br />
-<br />
-After performing the above procedures, your ready to continue installing XOOPS Cube Legacy with the Install Wizard.  The first screen in the install Wizard takes you to will be the welcome screen. <br />
-<br />
-<img src="images/install002.gif" /><br />
-<br />
-Click the Next button to continue on to the next screen.  <br />
-<br />
-The next part of the install Wizard is designed to check your file and directory permissions. If your running in a <span class="missingpage">Win32</span><a href="http://wiki.xoops.org/wakka.php?wakka=Win32/edit">?</a> environment, this should be a pretty painless install.  If you running in a UNIX environment, the Wizard will display any problems and the corrective actions to take if there are problems.  <br />
-<br />
-<img src="images/install003.gif" /><br />
-<br />
-If all lights are green on the Wizard, click Next to continue. If not, please read the screen and perform the necessary actions recommended by the Wizard<br />
-<br />
-The next part of the Wizard is for writing the settings to the mainfile.php file. <br />
-<br />
-<img src="images/install004.gif" /><br />
-<br />
-The General Settings screen is self explanatory so, input the required information into the files and click next. <br />
-<br />
-The next four Wizard screens are informational displaying the settings from the General Settings screen for your confirmation and to show that the values were written correctly. <br />
-<br />
-<img src="images/install005.gif" /><br />
-<br />
-<img src="images/install006.gif" /><br />
-<br />
-<img src="images/install007.gif" /><br />
-<br />
-<img src="images/install008.gif" /><br />
-<br />
-If you seen any Red lights, please click the Back button to make the proper corrections.<br />
-<br />
+<p><img src="images/install001.gif" /></p>
+
+<p>
+After performing the above procedures, your ready to continue installing XOOPS Cube Legacy with the Install Wizard.  The first screen in the install Wizard takes you to will be the welcome screen. 
+</p>
+
+<p><img src="images/install002.gif" /></p>
+
+<p>Click the Next button to continue on to the next screen. </p>
+
+<p>
+The next part of the install Wizard is designed to check your file and directory permissions. If your running in a <span class="missingpage">Win32</span><a href="http://wiki.xoops.org/wakka.php?wakka=Win32/edit">?</a> environment, this should be a pretty painless install.  If you running in a UNIX environment, the Wizard will display any problems and the corrective actions to take if there are problems. 
+</p>
+
+<p><img src="images/install003.gif" /></p>
+
+<p>
+If all lights are green on the Wizard, click Next to continue. If not, please read the screen and perform the necessary actions recommended by the Wizard</p>
+
+<p>
+The next part of the Wizard is for writing the settings to the mainfile.php file.
+</p>
+
+<p><img src="images/install004.gif" /></p>
+
+<p>
+The General Settings screen is self explanatory so, input the required information into the files and click next.
+</p>
+
+<p>
+The next four Wizard screens are informational displaying the settings from the General Settings screen for your confirmation and to show that the values were written correctly.
+</p>
+
+<p><img src="images/install005.gif" /></p>
+<p><img src="images/install006.gif" /></p>
+<p><img src="images/install007.gif" /></p>
+<p><img src="images/install008.gif" /></p>
+
+<p>If you seen any Red lights, please click the Back button to make the proper corrections.<br />
 The next Wizard screen is will be to show the progress for accessing the database.<br />
- <br />
-<img src="images/install009.gif" /><br />
-<br />
-If your in a hosted environment with out the proper access to create databases, please check with your provider for help in getting a database.  If your provider (or you) created the database, all  lights should be green.  If you get a red light stating the DB does not exist and your user name has the ability to create databases, then click next and the install Wizard will attempt to create the database for you.  If your user id does not have the rights to create a database, please correct this and continue the install.  The next two screens are informational on trying to create and access the database.  Click Next or Back depending on the Wizard screen.<br />
-<br />
-After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">FAQ</a> or <a href="http://www.xoopscube.org">XOOPS Cube Forums</a> for further assistance. <br />
-<br />
-<img src="images/install011.gif" /><br />
-<br />
- If all lights are green, your ready to proceed by clicking Next.<br />
-<br />
+</p>
+
+<p><img src="images/install009.gif" /></p>
+
+<p>
+If your in a hosted environment with out the proper access to create databases, please check with your provider for help in getting a database.  If your provider (or you) created the database, all  lights should be green.  If you get a red light stating the DB does not exist and your user name has the ability to create databases, then click next and the install Wizard will attempt to create the database for you.  If your user id does not have the rights to create a database, please correct this and continue the install.  The next two screens are informational on trying to create and access the database.  Click Next or Back depending on the Wizard screen.
+</p>
+
+<p>
+After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">FAQ</a> or <a href="http://www.xoopscube.org">XOOPS Cube Forums</a> for further assistance.
+</p>
+
+<p><img src="images/install011.gif" /></p>
+
+<p>If all lights are green, your ready to proceed by clicking Next.<br />
 The next Wizard screen is for inputting site administrative information. <br />
-<br />
-<img src="images/install024.gif" /><br />
-<br />
+</p>
+
+<p><img src="images/install024.gif" /></p>
+
+<p>
 Please be careful here and write down or remember your administrative password. You'll need this after the install to continue setting up your XOOPS Cube site.  Once you have completed inputting the correct information, click Next to continue.   * Note, try to refrain from using names with spaces for the Admin name. *<br />
 <br />
-The next screen is informational. If all the lights are green, click Next to continue.
-<br /><br />
+The next screen is informational. If all the lights are green, click Next to continue.<br />
+</p>
+
 <h4>Congratulations!</h4>
-Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Cube Forums</a> for further assistance.</div>
+<p>
+Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Cube Forums</a> for further assistance.</p>
+
+</div>
 </body>
 </html>

From minahito ＠ users.sourceforge.jp  Sat Nov 11 16:06:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 16:06:23 +0900
Subject: [xoops-cvslog 5783] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061111070623.38D002AC123@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/CommentDeleteAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/CommentDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/CommentDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/CommentDeleteAction.class.php:1.1.2.2	Sun Oct 15 00:48:54 2006
+++ xoops2jp/html/modules/legacy/admin/actions/CommentDeleteAction.class.php	Sat Nov 11 16:06:23 2006
@@ -87,10 +87,12 @@
 			// We think we should not use getUser() and updateUserByField in XCube 2.1.
 			//
 			$user =& $handler->getUser($comment->get('com_uid'));
-			$count = $user->get('posts');
+			if (is_object($user)) {
+				$count = $user->get('posts');
 			
-			if($count > 0) {
-				$handler->updateUserByField($user, 'posts', $count - 1);
+				if($count > 0) {
+					$handler->updateUserByField($user, 'posts', $count - 1);
+				}
 			}
 		}
 		
Index: xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.3	Fri Nov 10 14:33:57 2006
+++ xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php	Sat Nov 11 16:06:23 2006
@@ -140,7 +140,9 @@
 		// We think we should not use getUser() and updateUserByField in XCube 2.1.
 		//
 		$user =& $handler->getUser($comment->get('com_uid'));
-		$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
+		if (is_obejct($user)) {
+			$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
+		}
 	}
 	
 	function doUpdate($comment)
@@ -156,7 +158,9 @@
 			// We think we should not use getUser() and updateUserByField in XCube 2.1.
 			//
 			$user =& $handler->getUser($comment->get('com_uid'));
-			$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
+			if (is_obejct($user)) {
+				$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
+			}
 		}
 		
 		//

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:37:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:37:04 +0900
Subject: [xoops-cvslog 5784] CVS update: xoops2jp/html/class/database
Message-ID: <20061111083704.501912AC02B@users.sourceforge.jp>

Index: xoops2jp/html/class/database/oldsqlutility.php
diff -u xoops2jp/html/class/database/oldsqlutility.php:1.1.2.1 xoops2jp/html/class/database/oldsqlutility.php:removed
--- xoops2jp/html/class/database/oldsqlutility.php:1.1.2.1	Tue Dec 27 00:17:58 2005
+++ xoops2jp/html/class/database/oldsqlutility.php	Sat Nov 11 17:37:04 2006
@@ -1,160 +0,0 @@
-<?php
-// $Id: oldsqlutility.php,v 1.1.2.1 2005/12/26 15:17:58 minahito Exp $
-// sqlutility.php - defines utility class for MySQL database
-/**
- * @package     kernel
- * @subpackage  database
- * 
- * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
- * @copyright	copyright (c) 2000-2003 XOOPS.org
- */
-
-/**
- * provide some utility methods for databases
- * 
- * @author Kazumi Ono <onokazu ＠ xoops.org>
- * @copyright copyright (c) 2000-2003 XOOPS.org
- * 
- * @package kernel
- * @subpackage  database
- */
-class OldSqlUtility
-{
-	/**
-	* Function from phpMyAdmin (http://phpwizard.net/projects/phpMyAdmin/)
-	*
- 	* Removes comment and splits large sql files into individual queries
- 	*
-	* Last revision: September 23, 2001 - gandon
- 	*
- 	* @param   array    the splitted sql commands
- 	* @param   string   the sql commands
- 	* @return  boolean  always true
- 	* @access  public
- 	*/
-	function splitMySqlFile(&$ret, $sql)
-	{
-		$sql               = trim($sql);
-		$sql_len           = strlen($sql);
-		$char              = '';
-    	$string_start      = '';
-    	$in_string         = false;
-
-    	for ($i = 0; $i < $sql_len; ++$i) {
-        	$char = $sql[$i];
-
-           // We are in a string, check for not escaped end of
-		   // strings except for backquotes that can't be escaped
-           if ($in_string) {
-           		for (;;) {
-               		$i         = strpos($sql, $string_start, $i);
-					// No end of string found -> add the current
-					// substring to the returned array
-                	if (!$i) {
-						$ret[] = $sql;
-                    	return true;
-                	}
-					// Backquotes or no backslashes before 
-					// quotes: it's indeed the end of the 
-					// string -> exit the loop
-                	else if ($string_start == '`' || $sql[$i-1] != '\\') {
-						$string_start      = '';
-                   		$in_string         = false;
-                    	break;
-                	}
-                	// one or more Backslashes before the presumed 
-					// end of string...
-                	else {
-						// first checks for escaped backslashes
-                    	$j                     = 2;
-                    	$escaped_backslash     = false;
-						while ($i-$j > 0 && $sql[$i-$j] == '\\') {
-							$escaped_backslash = !$escaped_backslash;
-                        	$j++;
-                    	}
-                    	// ... if escaped backslashes: it's really the 
-						// end of the string -> exit the loop
-                    	if ($escaped_backslash) {
-							$string_start  = '';
-                        	$in_string     = false;
-							break;
-                    	}
-                    	// ... else loop
-                    	else {
-							$i++;
-                    	}
-                	} // end if...elseif...else
-            	} // end for
-        	} // end if (in string)
-        	// We are not in a string, first check for delimiter...
-        	else if ($char == ';') {
-				// if delimiter found, add the parsed part to the returned array
-            	$ret[]    = substr($sql, 0, $i);
-            	$sql      = ltrim(substr($sql, min($i + 1, $sql_len)));
-           		$sql_len  = strlen($sql);
-            	if ($sql_len) {
-					$i      = -1;
-            	} else {
-                	// The submited statement(s) end(s) here
-                	return true;
-				}
-        	} // end else if (is delimiter)
-        	// ... then check for start of a string,...
-        	else if (($char == '"') || ($char == '\'') || ($char == '`')) {
-				$in_string    = true;
-				$string_start = $char;
-        	} // end else if (is start of string)
-
-        	// for start of a comment (and remove this comment if found)...
-        	else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
-            	// starting position of the comment depends on the comment type
-           		$start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
-            	// if no "\n" exits in the remaining string, checks for "\r"
-            	// (Mac eol style)
-           		$end_of_comment   = (strpos(' ' . $sql, "\012", $i+2))
-                              ? strpos(' ' . $sql, "\012", $i+2)
-                              : strpos(' ' . $sql, "\015", $i+2);
-           		if (!$end_of_comment) {
-                // no eol found after '#', add the parsed part to the returned
-                // array and exit
-					// RMV fix for comments at end of file
-               		$last = trim(substr($sql, 0, $i-1));
-					if (!empty($last)) {
-						$ret[] = $last;
-					}
-               		return true;
-				} else {
-                	$sql     = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
-                	$sql_len = strlen($sql);
-                	$i--;
-            	} // end if...else
-        	} // end else if (is comment)
-    	} // end for
-
-    	// add any rest to the returned array
-    	if (!empty($sql) && trim($sql) != '') {
-			$ret[] = $sql;
-    	}
-    	return true;
-	}
-
-	/**
-	 * add a prefix.'_' to all tablenames in a query
-     * 
-     * @param   string  $query  valid SQL query string
-     * @param   string  $prefix prefix to add to all table names
-	 * @return  mixed   FALSE on failure
-	 */
-	function prefixQuery($query, $prefix)
-	{
-		$pattern = "/^(INSERT INTO|CREATE TABLE|ALTER TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
-		$pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
-		if (preg_match($pattern, $query, $matches) || preg_match($pattern2, $query, $matches)) {
-			$replace = "\\1 ".$prefix."_\\4\\5";
-			$matches[0] = preg_replace($pattern, $replace, $query);
-			return $matches;
-		}
-		return false;
-	}
-}
-?>
Index: xoops2jp/html/class/database/sqlutility.php
diff -u xoops2jp/html/class/database/sqlutility.php:1.2.8.5 xoops2jp/html/class/database/sqlutility.php:1.2.8.5.2.1
--- xoops2jp/html/class/database/sqlutility.php:1.2.8.5	Thu Jun  1 11:41:48 2006
+++ xoops2jp/html/class/database/sqlutility.php	Sat Nov 11 17:37:04 2006
@@ -1,122 +1,160 @@
 <?php
-
+// $Id: sqlutility.php,v 1.2.8.5.2.1 2006/11/11 08:37:04 minahito Exp $
+// sqlutility.php - defines utility class for MySQL database
+/**
+ * @package     kernel
+ * @subpackage  database
+ * 
+ * @author	    Kazumi Ono	<onokazu ＠ xoops.org>
+ * @copyright	copyright (c) 2000-2003 XOOPS.org
+ */
 
 /**
- * @author Marijuana
+ * provide some utility methods for databases
+ * 
+ * @author Kazumi Ono <onokazu ＠ xoops.org>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * 
+ * @package kernel
+ * @subpackage  database
  */
-class sqlutility
+class SqlUtility
 {
-  var $sql = array();
-  var $create = array();
-  var $dirname;
-  var $safetables = array(
-    'avatar',
-    'avatar_user_link',
-    'block_module_link',
-    'config',
-    'configcategory',
-    'configoption',
-    'group_permission',
-    'groups',
-    'groups_users_link',
-    'modules',
-    'newblocks',
-    'users');
-  
-  
-  function sqlutility($dirname,$file)
-  {
-    $this->dirname = $dirname;
-    $i = 0;
-
-	//
-	// If sql file is created in Mac OS, file() can not detect the line end.
-	//    
-    ini_set("auto_detect_line_endings" ,true);
-    $sql_query = file(XOOPS_MODULE_PATH.'/'.$dirname.'/'.$file);
-
-    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+/siU";
-    foreach ( $sql_query as $fline ) {
-      $fline=trim($fline);
-      if ( preg_match($pattern,$fline) ) {
-        $i++;
-        $this->sql[$i] = trim($fline)."\n";
-      } elseif (strlen($fline)>0 && strpos($fline,"#")===false) {
-		if(isset($this->sql[$i])) {
-			$this->sql[$i] .= trim($fline)."\n";
-		}
-		else {
-			$this->sql[$i] = trim($fline)."\n";
+	/**
+	* Function from phpMyAdmin (http://phpwizard.net/projects/phpMyAdmin/)
+	*
+ 	* Removes comment and splits large sql files into individual queries
+ 	*
+	* Last revision: September 23, 2001 - gandon
+ 	*
+ 	* @param   array    the splitted sql commands
+ 	* @param   string   the sql commands
+ 	* @return  boolean  always true
+ 	* @access  public
+ 	*/
+	function splitMySqlFile(&$ret, $sql)
+	{
+		$sql               = trim($sql);
+		$sql_len           = strlen($sql);
+		$char              = '';
+    	$string_start      = '';
+    	$in_string         = false;
+
+    	for ($i = 0; $i < $sql_len; ++$i) {
+        	$char = $sql[$i];
+
+           // We are in a string, check for not escaped end of
+		   // strings except for backquotes that can't be escaped
+           if ($in_string) {
+           		for (;;) {
+               		$i         = strpos($sql, $string_start, $i);
+					// No end of string found -> add the current
+					// substring to the returned array
+                	if (!$i) {
+						$ret[] = $sql;
+                    	return true;
+                	}
+					// Backquotes or no backslashes before 
+					// quotes: it's indeed the end of the 
+					// string -> exit the loop
+                	else if ($string_start == '`' || $sql[$i-1] != '\\') {
+						$string_start      = '';
+                   		$in_string         = false;
+                    	break;
+                	}
+                	// one or more Backslashes before the presumed 
+					// end of string...
+                	else {
+						// first checks for escaped backslashes
+                    	$j                     = 2;
+                    	$escaped_backslash     = false;
+						while ($i-$j > 0 && $sql[$i-$j] == '\\') {
+							$escaped_backslash = !$escaped_backslash;
+                        	$j++;
+                    	}
+                    	// ... if escaped backslashes: it's really the 
+						// end of the string -> exit the loop
+                    	if ($escaped_backslash) {
+							$string_start  = '';
+                        	$in_string     = false;
+							break;
+                    	}
+                    	// ... else loop
+                    	else {
+							$i++;
+                    	}
+                	} // end if...elseif...else
+            	} // end for
+        	} // end if (in string)
+        	// We are not in a string, first check for delimiter...
+        	else if ($char == ';') {
+				// if delimiter found, add the parsed part to the returned array
+            	$ret[]    = substr($sql, 0, $i);
+            	$sql      = ltrim(substr($sql, min($i + 1, $sql_len)));
+           		$sql_len  = strlen($sql);
+            	if ($sql_len) {
+					$i      = -1;
+            	} else {
+                	// The submited statement(s) end(s) here
+                	return true;
+				}
+        	} // end else if (is delimiter)
+        	// ... then check for start of a string,...
+        	else if (($char == '"') || ($char == '\'') || ($char == '`')) {
+				$in_string    = true;
+				$string_start = $char;
+        	} // end else if (is start of string)
+
+        	// for start of a comment (and remove this comment if found)...
+        	else if ($char == '#' || ($char == ' ' && $i > 1 && $sql[$i-2] . $sql[$i-1] == '--')) {
+            	// starting position of the comment depends on the comment type
+           		$start_of_comment = (($sql[$i] == '#') ? $i : $i-2);
+            	// if no "\n" exits in the remaining string, checks for "\r"
+            	// (Mac eol style)
+           		$end_of_comment   = (strpos(' ' . $sql, "\012", $i+2))
+                              ? strpos(' ' . $sql, "\012", $i+2)
+                              : strpos(' ' . $sql, "\015", $i+2);
+           		if (!$end_of_comment) {
+                // no eol found after '#', add the parsed part to the returned
+                // array and exit
+					// RMV fix for comments at end of file
+               		$last = trim(substr($sql, 0, $i-1));
+					if (!empty($last)) {
+						$ret[] = $last;
+					}
+               		return true;
+				} else {
+                	$sql     = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
+                	$sql_len = strlen($sql);
+                	$i--;
+            	} // end if...else
+        	} // end else if (is comment)
+    	} // end for
+
+    	// add any rest to the returned array
+    	if (!empty($sql) && trim($sql) != '') {
+			$ret[] = $sql;
+    	}
+    	return true;
+	}
+
+	/**
+	 * add a prefix.'_' to all tablenames in a query
+     * 
+     * @param   string  $query  valid SQL query string
+     * @param   string  $prefix prefix to add to all table names
+	 * @return  mixed   FALSE on failure
+	 */
+	function prefixQuery($query, $prefix)
+	{
+		$pattern = "/^(INSERT INTO|CREATE TABLE|ALTER TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
+		$pattern2 = "/^(DROP TABLE)(\s)+([`]?)([^`\s]+)\\3(\s)?$/siU";
+		if (preg_match($pattern, $query, $matches) || preg_match($pattern2, $query, $matches)) {
+			$replace = "\\1 ".$prefix."_\\4\\5";
+			$matches[0] = preg_replace($pattern, $replace, $query);
+			return $matches;
 		}
-      }
-    }
-    
-    foreach ( $this->sql as $i => $sql ) {
-      $sql = $this->prefix($sql);
-      $this->sql[$i] = $this->etcchange($sql);
-    }
-  }
-  
-  function prefix($sql)
-  {
-    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
-    if ( preg_match($pattern, $sql, $matches) ) {
-      $replace = "\\1 ".XOOPS_DB_PREFIX."_\\4\\5";
-      $sql = preg_replace($pattern, $replace, $sql);
-      if ( preg_match("/^CREATE TABLE/siU", $sql) && !in_array($matches[4],$this->safetables) ) {
-        $this->create[] = $matches[4];
-      }
-    }
-    return $sql;
-  }
-  
-  function etcchange($sql)
-  {
-    $patterns[] = '{dirname}';
-    $replacements[] = $this->dirname;
-    $sql = str_replace($patterns,$replacements,$sql);
-    $sql = preg_replace('/;\s*$/s','',$sql);
-    return $sql;
-  }
-  
-  function get_sql()
-  {
-    return $this->sql;
-  }
-  
-  function get_create()
-  {
-    return $this->create;
-  }
-  
-  /*
-  function changesql($dirname,$file)
-  {
-    $sql = array();
-    $i = 0;
-    $sql_query = file(ORETEKI_ROOT_PATH.'/modules/'.$dirname.'/'.$file);
-    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)/siU";
-    foreach ( $sql_query as $fline ) {
-      if ( preg_match($pattern,$fline) ) {
-        $i++;
-        $sql[$i] = trim($fline)."\n";
-      } else {
-        $sql[$i].= trim($fline)."\n";
-      }
-    }
-    
-    $pattern = "/^(INSERT INTO|CREATE TABLE|UPDATE)(\s)+([`]?)([^`\s]+)\\3(\s)+/siU";
-    foreach ( $sql as $i => $query ) {
-      if ( preg_match($pattern, $query, $matches) ) {
-        $replace = "\\1 ".ORETEKI_DB_PREFIX."_\\4\\5";
-        $sql[$i] = preg_replace($pattern, $replace, $query);
-      }
-    }
-    $patterns[] = '{dirname}';
-    $replacements[] = $dirname;
-    $sql = str_replace($patterns,$replacements,$sql);
-    return $sql;
-  }
-  */
+		return false;
+	}
 }
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/class/database/mysqldatabase.php
diff -u xoops2jp/html/class/database/mysqldatabase.php:1.2.8.5 xoops2jp/html/class/database/mysqldatabase.php:1.2.8.5.2.1
--- xoops2jp/html/class/database/mysqldatabase.php:1.2.8.5	Fri Apr 21 12:03:19 2006
+++ xoops2jp/html/class/database/mysqldatabase.php	Sat Nov 11 17:37:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysqldatabase.php,v 1.2.8.5 2006/04/21 03:03:19 minahito Exp $
+// $Id: mysqldatabase.php,v 1.2.8.5.2.1 2006/11/11 08:37:04 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -276,13 +276,13 @@
 	 */
 	function queryFromFile($file){
         if (false !== ($fp = fopen($file, 'r'))) {
-			include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php';
+			include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
             $sql_queries = trim(fread($fp, filesize($file)));
-            OldSqlUtility::splitMySqlFile($pieces, $sql_queries);
+            SqlUtility::splitMySqlFile($pieces, $sql_queries);
             foreach ($pieces as $query) {
                 // [0] contains the prefixed query
                 // [4] contains unprefixed table name
-                $prefixed_query = OldSqlUtility::prefixQuery(trim($query), $this->prefix());
+                $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
                 if ($prefixed_query != false) {
                     $this->query($prefixed_query[0]);
                 }

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:37:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:37:14 +0900
Subject: [xoops-cvslog 5785] CVS update: xoops2jp/html/install/class
Message-ID: <20061111083714.7FF5B2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/install/class/dbmanager.php
diff -u xoops2jp/html/install/class/dbmanager.php:1.2.8.4 xoops2jp/html/install/class/dbmanager.php:1.2.8.4.2.1
--- xoops2jp/html/install/class/dbmanager.php:1.2.8.4	Thu Sep 14 19:23:15 2006
+++ xoops2jp/html/install/class/dbmanager.php	Sat Nov 11 17:37:14 2006
@@ -26,13 +26,13 @@
 include_once XOOPS_ROOT_PATH.'/class/logger.php';
 include_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
 include_once XOOPS_ROOT_PATH.'/class/database/'.XOOPS_DB_TYPE.'database.php';
-include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php';
+include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
 
 /**
 * database manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: dbmanager.php,v 1.2.8.4 2006/09/14 10:23:15 minahito Exp $
+* @version $Id: dbmanager.php,v 1.2.8.4.2.1 2006/11/11 08:37:14 minahito Exp $
 * @access public
 **/
 class db_manager {
@@ -82,13 +82,13 @@
             return false;
         }
         $sql_query = trim(fread(fopen($sql_file_path, 'r'), filesize($sql_file_path)));
-        OldSqlUtility::splitMySqlFile($pieces, $sql_query);
+        SqlUtility::splitMySqlFile($pieces, $sql_query);
         $this->connectDB();
         foreach ($pieces as $piece) {
             $piece = trim($piece);
             // [0] contains the prefixed query
             // [4] contains unprefixed table name
-            $prefixed_query = OldSqlUtility::prefixQuery($piece, $this->db->prefix());
+            $prefixed_query = SqlUtility::prefixQuery($piece, $this->db->prefix());
             if ($prefixed_query != false ) {
                 $table = $this->db->prefix($prefixed_query[4]);
                 if($prefixed_query[1] == 'CREATE TABLE'){

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:37:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:37:38 +0900
Subject: [xoops-cvslog 5786] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061111083738.1EE862AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.5	Sat Nov 11 02:13:40 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Sat Nov 11 17:37:37 2006
@@ -110,33 +110,85 @@
 			return;
 		}
 		
-		require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
-		$scanner =& new Legacy_SQLScanner();
-		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
-		
 		$sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
-		if (!$scanner->loadFile(XOOPS_MODULE_PATH . "/${dirname}/" . $sqlfile)) {
-			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
-			return false;
+		$sqlfilepath = XOOPS_MODULE_PATH . "/${dirname}/${sqlfile}";
+		
+		if (isset($module->modinfo['cube_style']) && $module->modinfo['cube_style'] == true) {
+			require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
+			$scanner =& new Legacy_CubeStyleSQLScanner();
+			$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
+			$scanner->setDirname($module->get('dirname'));
+			
+			if (!$scanner->loadFile($sqlfilepath)) {
+				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
+				return false;
+			}
+	
+			$scanner->parse();
+			$sqls = $scanner->getSQL();
+			
+			$root =& XCube_Root::getSingleton();
+			$db =& $root->mController->getDB();
+			
+			//
+			// TODO The following variable exists for rollback, but it is not implemented.
+			//
+			foreach ($sqls as $sql) {
+				if (!$db->query($sql)) {
+					$log->addError($db->error());
+					return;
+				}
+			}
+			
+			$log->addReport(_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED);
 		}
+		else {
+			require_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php';
+			
+			$reservedTables = array('avatar', 'avatar_users_link', 'block_module_link', 'xoopscomments', 'config', 'configcategory', 'configoption', 'image', 'imagebody', 'imagecategory', 'imgset', 'imgset_tplset_link', 'imgsetimg', 'groups','groups_users_link','group_permission', 'online', 'bannerclient', 'banner', 'bannerfinish', 'priv_msgs', 'ranks', 'session', 'smiles', 'users', 'newblocks', 'modules', 'tplfile', 'tplset', 'tplsource', 'xoopsnotifications', 'banner', 'bannerclient', 'bannerfinish');
 
-		$scanner->parse();
-		$sqls = $scanner->getSQL();
-		
-		$root =& XCube_Root::getSingleton();
-		$db =& $root->mController->getDB();
-		
-		//
-		// TODO The following variable exists for rollback, but it is not implemented.
-		//
-		foreach ($sqls as $sql) {
-			if (!$db->query($sql)) {
-				$log->addError($db->error());
-				return;
+			$root =& XCube_Root::getSingleton();
+			$db =& $root->mController->mDB;
+			
+			$sql_query = fread(fopen($sqlfilepath, 'r'), filesize($sqlfilepath));
+			$sql_query = trim($sql_query);
+			SqlUtility::splitMySqlFile($pieces, $sql_query);
+			$created_tables = array();
+			foreach ($pieces as $piece) {
+				// [0] contains the prefixed query
+				// [4] contains unprefixed table name
+				$prefixed_query = SqlUtility::prefixQuery($piece, $db->prefix());
+				if (!$prefixed_query) {
+					$log->addError("${piece} is not a valid SQL!");
+					return;
+				}
+				
+				// check if the table name is reserved
+				if (!in_array($prefixed_query[4], $reservedTables)) {
+					// not reserved, so try to create one
+					if (!$db->query($prefixed_query[0])) {
+						foreach ($db->error() as $error) {
+							$log->addError($error);
+						}
+						return;
+					}
+					else {
+						if (!in_array($prefixed_query[4], $created_tables)) {
+							$log->addReport('  Table ' . $db->prefix($prefixed_query[4]) . ' created.');
+							$created_tables[] = $prefixed_query[4];
+						}
+						else {
+							$log->addReport('  Data inserted to table ' . $db->prefix($prefixed_query[4]));
+						}
+					}
+				}
+				else {
+					// the table name is reserved, so halt the installation
+					$log->addError($prefixed_query[4] . " is a reserved table!");
+					return;
+				}
 			}
 		}
-		
-		$log->addReport(_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED);
 	}
 	
 	/**

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:37:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:37:45 +0900
Subject: [xoops-cvslog 5787] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061111083745.9CDAE2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.5	Thu Nov  2 00:02:35 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Sat Nov 11 17:37:45 2006
@@ -75,18 +75,31 @@
 		$root =& XCube_Root::getSingleton();
 		$db =& $root->mController->getDB();
 
+		$dirname = $this->_mXoopsModule->get('dirname');
+		$t_search = array('{prefix}', '{dirname}', '{Dirname}', '{_dirname_}');
+		$t_replace = array(XOOPS_DB_PREFIX, strtolower($dirname), ucfirst(strtolower($dirname)), $dirname);
+		
 		$tables = $this->_mXoopsModule->getInfo('tables');
 		if ($tables != false && is_array($tables)) {
 			foreach($tables as $table) {
 				//
 				// TODO Do we need to check reserved core tables?
 				//
-				$sql = "DROP TABLE " . $db->prefix($table);
+				$t_tableName = $table;
+				if (isset($this->_mXoopsModule->modinfo['cube_style']) && $this->_mXoopsModule->modinfo['cube_style'] == true) {
+					$t_tableName = str_replace($t_search, $t_replace, $table);
+				}
+				else {
+					$t_tableName = $db->prefix($table);
+				}
+				
+				$sql = "DROP TABLE " . $t_tableName;
+				
 				if ($db->query($sql)) {
-					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($table)));
+					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($t_tableName)));
 				}
 				else {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($table)));
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($t_tableName)));
 				}
 			}
 		}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:38:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:38:00 +0900
Subject: [xoops-cvslog 5788] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061111083800.427742AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.5 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.5	Thu Nov  9 16:21:27 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Sat Nov 11 17:38:00 2006
@@ -66,6 +66,7 @@
 								$xoopsModule->loadInfoAsVar($module);
 								
 								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
+								$installer->setForceMode(true);
 								$installer->setCurrentXoopsModule($xoopsModule);
 								$installer->executeInstall();
 							}
@@ -103,6 +104,7 @@
 								$xoopsModule->loadInfoAsVar($module);
 								
 								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
+								$installer->setForceMode(true);
 								$installer->setCurrentXoopsModule($xoopsModule);
 								$installer->executeInstall();
 							}
@@ -135,6 +137,7 @@
 						$xoopsModule =& $handler->getByDirname($module);
 						
 						$uninstaller =& Legacy_ModuleInstallUtils::createUninstaller($xoopsModule->get('dirname'));
+						$uninstaller->setForceMode(true);
 						$uninstaller->setCurrentXoopsModule($xoopsModule);
 						$uninstaller->executeUninstall();
 					}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:38:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:38:10 +0900
Subject: [xoops-cvslog 5789] CVS update: xoops2jp/html/modules/legacyRender/sql
Message-ID: <20061111083810.6DB262AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/sql/index.html
diff -u xoops2jp/html/modules/legacyRender/sql/index.html:1.1.2.1 xoops2jp/html/modules/legacyRender/sql/index.html:removed
--- xoops2jp/html/modules/legacyRender/sql/index.html:1.1.2.1	Fri Mar 24 22:02:31 2006
+++ xoops2jp/html/modules/legacyRender/sql/index.html	Sat Nov 11 17:38:10 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:38:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:38:26 +0900
Subject: [xoops-cvslog 5790] CVS update: xoops2jp/html/modules/user/sql
Message-ID: <20061111083826.A24D02AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/sql/mysql.sql
diff -u xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.3.2.1 xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.3.2.2
--- xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.3.2.1	Sat Oct 14 20:25:18 2006
+++ xoops2jp/html/modules/user/sql/mysql.sql	Sat Nov 11 17:38:26 2006
@@ -1,4 +1,4 @@
-CREATE TABLE user_mailjob (
+CREATE TABLE {prefix}_{dirname}_mailjob (
   mailjob_id int(10) NOT NULL auto_increment,
   title varchar(255) NOT NULL default '',
   body text NOT NULL,
@@ -10,7 +10,7 @@
   PRIMARY KEY (mailjob_id)
 ) TYPE=MyISAM;
 
-CREATE TABLE user_mailjob_link (
+CREATE TABLE {prefix}_{dirname}_mailjob_link (
   mailjob_id int(10) NOT NULL default '0',
   uid mediumint(8) NOT NULL default '0',
   retry tinyint(3) NOT NULL default '0',

From minahito ＠ users.sourceforge.jp  Sat Nov 11 17:38:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 17:38:26 +0900
Subject: [xoops-cvslog 5791] CVS update: xoops2jp/html/modules/user
Message-ID: <20061111083826.CB90C2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.5 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.6
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.5	Sat Nov 11 13:29:48 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sat Nov 11 17:38:26 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.5 2006/11/11 04:29:48 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.6 2006/11/11 08:38:26 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -42,8 +42,8 @@
 $modversion['sqlfile']['mysql'] = "sql/mysql.sql";
 
 // Tables created by sql file (without prefix!)
-$modversion['tables'][0] = "user_mailjob";
-$modversion['tables'][1] = "user_mailjob_link";
+$modversion['tables'][0] = "{prefix}_{dirname}_mailjob";
+$modversion['tables'][1] = "{prefix}_{dirname}_mailjob_link";
 
// Admin things
 $modversion['hasAdmin'] = 1;
 $modversion['adminindex'] = "admin/index.php";

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:17:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:17:45 +0900
Subject: [xoops-cvslog 5792] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061111091745.C6C0F2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/handler.php
diff -u xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.2 xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.3
--- xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.2	Sun Oct 15 01:37:52 2006
+++ xoops2jp/html/modules/legacy/kernel/handler.php	Sat Nov 11 18:17:45 2006
@@ -199,11 +199,11 @@
 		$arr = $this->_makeVars4sql($obj);
 
 		foreach($arr as $_name => $_value) {
-			$fields[]=$_name;
-			$values[]=$_value;
+			$fields[] = "`${_name}`";
+			$values[] = $_value;
 		}
 
-		$sql = @sprintf("INSERT INTO " . $this->mTable . " ( %s ) VALUES ( %s )", implode(",", $fields), implode(",", $values));
+		$sql = @sprintf("INSERT INTO `" . $this->mTable . "` ( %s ) VALUES ( %s )", implode(",", $fields), implode(",", $values));
 
 		return $sql;
 	}
@@ -219,14 +219,14 @@
 
 		foreach ($arr as $_name => $_value) {
 			if ($_name == $this->mPrimary) {
-				$where = "${_name}=${_value}";
+				$where = "`${_name}`=${_value}";
 			}
 			else {
-				$set_lists[] = "${_name}=${_value}";
+				$set_lists[] = "`${_name}`=${_value}";
 			}
 		}
 
-		$sql = @sprintf("UPDATE " . $this->mTable . " SET %s WHERE %s", implode(",",$set_lists), $where);
+		$sql = @sprintf("UPDATE `" . $this->mTable . "` SET %s WHERE %s", implode(",",$set_lists), $where);
 
 		return $sql;
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:33:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:33:33 +0900
Subject: [xoops-cvslog 5793] CVS update: xoops2jp/html/core
Message-ID: <20061111093333.AAA6A2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_RenderSystem.class.php
diff -u xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.2 xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.2	Wed Oct 11 17:17:43 2006
+++ xoops2jp/html/core/XCube_RenderSystem.class.php	Sat Nov 11 18:33:33 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.2 2006/10/11 08:17:43 minahito Exp $
+ * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.3 2006/11/11 09:33:33 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -91,26 +91,6 @@
 		return $this->mAttributes;
 	}
 	
-	function setRenderBuffer($buf)
-	{
-		$this->mRenderBuffer = $buf;
-	}
-	
-	function getRenderBuffer()
-	{
-		return $this->mRenderBuffer;
-	}
-	
-	function setResult(&$result)
-	{
-		$this->mRenderBuffer = $result;
-	}
-	
-	function getResult()
-	{
-		return $this->mRenderBuffer;
-	}
-	
 	/**
 	 * Set render-target type.
 	 * @param $type int Use constants that are defined by us.

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:33:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:33:49 +0900
Subject: [xoops-cvslog 5794] CVS update: xoops2jp/html/include
Message-ID: <20061111093349.F29DB2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.4 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.5
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.4	Sat Nov 11 12:54:14 2006
+++ xoops2jp/html/include/comment_reply.php	Sat Nov 11 18:33:49 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.3.2.4 2006/11/11 03:54:14 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.5 2006/11/11 09:33:49 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -70,6 +70,7 @@
 }
 $comment_handler =& xoops_gethandler('comment');
 $comment =& $comment_handler->get($com_id);
+
 $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid'));
 $r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
 if (!preg_match("/^re:/i", $com_title)) {
@@ -136,7 +137,7 @@
 // Rendering
 //
 $renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-$renderer->renderWithTarget($renderTarget);
+$renderer->render($renderTarget);
 
 //
 // Display now.
Index: xoops2jp/html/include/comment_edit.php
diff -u xoops2jp/html/include/comment_edit.php:1.2.8.2.2.3 xoops2jp/html/include/comment_edit.php:1.2.8.2.2.4
--- xoops2jp/html/include/comment_edit.php:1.2.8.2.2.3	Sat Nov 11 02:42:41 2006
+++ xoops2jp/html/include/comment_edit.php	Sat Nov 11 18:33:49 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_edit.php,v 1.2.8.2.2.3 2006/11/10 17:42:41 minahito Exp $
+// $Id: comment_edit.php,v 1.2.8.2.2.4 2006/11/11 09:33:49 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -116,7 +116,7 @@
 	// Rendering
 	//
 	$renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-	$renderer->renderWithTarget($renderTarget);
+	$renderer->render($renderTarget);
 
 	//
 	// Display now.
Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.3 xoops2jp/html/include/comment_new.php:1.2.8.3.2.4
--- xoops2jp/html/include/comment_new.php:1.2.8.3.2.3	Sat Nov 11 02:42:41 2006
+++ xoops2jp/html/include/comment_new.php	Sat Nov 11 18:33:49 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_new.php,v 1.2.8.3.2.3 2006/11/10 17:42:41 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3.2.4 2006/11/11 09:33:49 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -138,7 +138,7 @@
 // Rendering
 //
 $renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-$renderer->renderWithTarget($renderTarget);
+$renderer->render($renderTarget);
 
 //
 // Display now.

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:33:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:33:55 +0900
Subject: [xoops-cvslog 5795] CVS update: xoops2jp/html/include
Message-ID: <20061111093355.4883E2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.5 xoops2jp/html/include/comment_view.php:1.2.8.5.2.1
--- xoops2jp/html/include/comment_view.php:1.2.8.5	Wed Aug  9 18:32:31 2006
+++ xoops2jp/html/include/comment_view.php	Sat Nov 11 18:33:55 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.5 2006/08/09 09:32:31 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.5.2.1 2006/11/11 09:33:55 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -207,7 +207,7 @@
 		$renderTarget->setAttribute("postcomment_link", $postcomment_link);
 		
 		$renderer =& $root->getRenderSystem('Legacy_RenderSystem');
-		$renderer->renderWithTarget($renderTarget);
+		$renderer->render($renderTarget);
 		
 		//
 		// TODO We change raw string data, we must change template for guarding XSS.

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:07 +0900
Subject: [xoops-cvslog 5796] CVS update: xoops2jp/html/include
Message-ID: <20061111093407.703EC2AC0D9@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.7 xoops2jp/html/include/functions.php:1.2.8.19.2.8
--- xoops2jp/html/include/functions.php:1.2.8.19.2.7	Thu Nov  9 19:31:20 2006
+++ xoops2jp/html/include/functions.php	Sat Nov 11 18:34:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.7 2006/11/09 10:31:20 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.8 2006/11/11 09:34:07 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -91,7 +91,7 @@
 	$renderTarget->setAttribute("title", $title);
 	$renderTarget->setAttribute("message", $message);
 
-	$renderSystem->renderWithTarget($renderTarget);
+	$renderSystem->render($renderTarget);
 	
 	print $renderTarget->getResult();
 }
@@ -112,7 +112,7 @@
 	$renderTarget->setAttribute("title", $title);
 	$renderTarget->setAttribute("message", $message);
 
-	$renderSystem->renderWithTarget($renderTarget);
+	$renderSystem->render($renderTarget);
 	
 	print $renderTarget->getResult();
 }
@@ -145,7 +145,7 @@
 	$renderTarget->setAttribute("tokenName", $token->getTokenName());
 	$renderTarget->setAttribute("tokenValue", $token->getTokenValue());
 
-	$renderSystem->renderWithTarget($renderTarget);
+	$renderSystem->render($renderTarget);
 	
 	print $renderTarget->getResult();
 }

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:14 +0900
Subject: [xoops-cvslog 5797] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061111093414.EAC602AC02B@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formhidden.php
diff -u xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2.2.2	Sun Oct 15 00:34:21 2006
+++ xoops2jp/html/class/xoopsform/formhidden.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formhidden.php,v 1.2.8.2.2.2 2006/10/14 15:34:21 minahito Exp $
+// $Id: formhidden.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,7 +99,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_hidden.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/themeform.php
diff -u xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3.2.2 xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3.2.3
--- xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3.2.2	Sun Oct 15 00:36:16 2006
+++ xoops2jp/html/class/xoopsform/themeform.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: themeform.php,v 1.2.8.3.2.2 2006/10/14 15:36:16 minahito Exp $
+// $Id: themeform.php,v 1.2.8.3.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -83,7 +83,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_themeform.html");
 		$renderTarget->setAttribute("form", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		$ret = $renderTarget->getResult();
 		$ret .= $this->renderValidationJS( true );
Index: xoops2jp/html/class/xoopsform/formbutton.php
diff -u xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2.2.2	Sun Oct 15 00:33:19 2006
+++ xoops2jp/html/class/xoopsform/formbutton.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formbutton.php,v 1.2.8.2.2.2 2006/10/14 15:33:19 minahito Exp $
+// $Id: formbutton.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -120,7 +120,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_button.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php
diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6.2.2 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6.2.3
--- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6.2.2	Sun Oct 15 00:33:53 2006
+++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formdhtmltextarea.php,v 1.2.8.6.2.2 2006/10/14 15:33:53 minahito Exp $
+// $Id: formdhtmltextarea.php,v 1.2.8.6.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -94,7 +94,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_dhtmltextarea.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		$ret = $renderTarget->getResult();
         $ret .= $this->_renderSmileys();
@@ -121,7 +121,7 @@
 		$renderTarget->setAttribute("element", $this);
 		$renderTarget->setAttribute("smilesArr", $smilesArr);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 		
 		return $renderTarget->getResult();
     }
Index: xoops2jp/html/class/xoopsform/formselect.php
diff -u xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3.2.2 xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3.2.3
--- xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3.2.2	Sun Oct 15 00:35:00 2006
+++ xoops2jp/html/class/xoopsform/formselect.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formselect.php,v 1.2.8.3.2.2 2006/10/14 15:35:00 minahito Exp $
+// $Id: formselect.php,v 1.2.8.3.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -187,7 +187,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_select.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.3 xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.4
--- xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.3	Sun Nov  5 15:34:37 2006
+++ xoops2jp/html/class/xoopsform/form.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: form.php,v 1.2.8.4.2.3 2006/11/05 06:34:37 minahito Exp $
+// $Id: form.php,v 1.2.8.4.2.4 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -397,7 +397,7 @@
 		$renderTarget->setAttribute('required', $required);
 		$renderTarget->setAttribute('required_count', $reqcount);
 		
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 		
Index: xoops2jp/html/class/xoopsform/formfile.php
diff -u xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.3 xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.4
--- xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.3	Sun Oct 15 00:34:12 2006
+++ xoops2jp/html/class/xoopsform/formfile.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formfile.php,v 1.2.8.2.2.3 2006/10/14 15:34:12 minahito Exp $
+// $Id: formfile.php,v 1.2.8.2.2.4 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -92,7 +92,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_file.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formlabel.php
diff -u xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2.2.2	Sun Oct 15 00:34:31 2006
+++ xoops2jp/html/class/xoopsform/formlabel.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formlabel.php,v 1.2.8.2.2.2 2006/10/14 15:34:31 minahito Exp $
+// $Id: formlabel.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -88,7 +88,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_label.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formtextarea.php
diff -u xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2.2.2	Sun Oct 15 00:35:18 2006
+++ xoops2jp/html/class/xoopsform/formtextarea.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formtextarea.php,v 1.2.8.2.2.2 2006/10/14 15:35:18 minahito Exp $
+// $Id: formtextarea.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -136,7 +136,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_textarea.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/tableform.php
diff -u xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2.2.2	Sun Oct 15 00:36:04 2006
+++ xoops2jp/html/class/xoopsform/tableform.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: tableform.php,v 1.2.8.2.2.2 2006/10/14 15:36:04 minahito Exp $
+// $Id: tableform.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -72,7 +72,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_tableform.html");
 		$renderTarget->setAttribute("form", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formcheckbox.php
diff -u xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2.2.2	Sun Oct 15 00:33:32 2006
+++ xoops2jp/html/class/xoopsform/formcheckbox.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formcheckbox.php,v 1.2.8.2.2.2 2006/10/14 15:33:32 minahito Exp $
+// $Id: formcheckbox.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -157,7 +157,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_checkbox.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 		
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formtext.php
diff -u xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2.2.2	Sun Oct 15 00:35:09 2006
+++ xoops2jp/html/class/xoopsform/formtext.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formtext.php,v 1.2.8.2.2.2 2006/10/14 15:35:09 minahito Exp $
+// $Id: formtext.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -136,7 +136,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_text.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/simpleform.php
diff -u xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2.2.2	Sun Oct 15 00:35:54 2006
+++ xoops2jp/html/class/xoopsform/simpleform.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: simpleform.php,v 1.2.8.2.2.2 2006/10/14 15:35:54 minahito Exp $
+// $Id: simpleform.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -70,7 +70,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_simpleform.html");
 		$renderTarget->setAttribute("form", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formpassword.php
diff -u xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2.2.2	Sun Oct 15 00:34:40 2006
+++ xoops2jp/html/class/xoopsform/formpassword.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formpassword.php,v 1.2.8.2.2.2 2006/10/14 15:34:40 minahito Exp $
+// $Id: formpassword.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -138,7 +138,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_password.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/formradio.php
diff -u xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2.2.2	Sun Oct 15 00:34:48 2006
+++ xoops2jp/html/class/xoopsform/formradio.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formradio.php,v 1.2.8.2.2.2 2006/10/14 15:34:48 minahito Exp $
+// $Id: formradio.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -146,7 +146,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_radio.html");
 		$renderTarget->setAttribute("element", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}
Index: xoops2jp/html/class/xoopsform/grouppermform.php
diff -u xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.3 xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.4
--- xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.3	Thu Nov  9 19:08:43 2006
+++ xoops2jp/html/class/xoopsform/grouppermform.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php 
-// $Id: grouppermform.php,v 1.2.8.3.2.3 2006/11/09 10:08:43 minahito Exp $
+// $Id: grouppermform.php,v 1.2.8.3.2.4 2006/11/11 09:34:14 minahito Exp $
 // ------------------------------------------------------------------------ //
 // XOOPS - PHP Content Management System                      //
 // Copyright (c) 2000-2003 XOOPS.org                           //
@@ -162,7 +162,7 @@
 		
 		$renderTarget->setAttribute("form", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
     }
Index: xoops2jp/html/class/xoopsform/formtextdateselect.php
diff -u xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4.2.2 xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4.2.3
--- xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4.2.2	Sun Oct 15 00:35:27 2006
+++ xoops2jp/html/class/xoopsform/formtextdateselect.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formtextdateselect.php,v 1.2.8.4.2.2 2006/10/14 15:35:27 minahito Exp $
+// $Id: formtextdateselect.php,v 1.2.8.4.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -70,7 +70,7 @@
         $jstime = formatTimestamp($this->getValue(), '"F j, Y H:i:s"');
         include_once XOOPS_ROOT_PATH.'/include/calendarjs.php';	//< FIXME
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
     }
Index: xoops2jp/html/class/xoopsform/formelementtray.php
diff -u xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2.2.2 xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2.2.3
--- xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2.2.2	Sun Oct 15 00:34:03 2006
+++ xoops2jp/html/class/xoopsform/formelementtray.php	Sat Nov 11 18:34:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formelementtray.php,v 1.2.8.2.2.2 2006/10/14 15:34:03 minahito Exp $
+// $Id: formelementtray.php,v 1.2.8.2.2.3 2006/11/11 09:34:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -173,7 +173,7 @@
 		$renderTarget->setTemplateName("legacy_xoopsform_elementtray.html");
 		$renderTarget->setAttribute("tray", $this);
 
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 	
 		return $renderTarget->getResult();
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:25 +0900
Subject: [xoops-cvslog 5798] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061111093425.378A42AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/BackendAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/BackendAction.class.php:1.1.2.1 xoops2jp/html/modules/legacy/actions/BackendAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/actions/BackendAction.class.php:1.1.2.1	Sat Oct 14 23:55:21 2006
+++ xoops2jp/html/modules/legacy/actions/BackendAction.class.php	Sat Nov 11 18:34:25 2006
@@ -94,7 +94,7 @@
 		//
 		// Rendering
 		//
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 		
 		if (function_exists('mb_http_output')) {
 			mb_http_output('pass');

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:33 +0900
Subject: [xoops-cvslog 5799] CVS update:
	xoops2jp/html/modules/legacy/admin/blocks
Message-ID: <20061111093433.6B7842AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php
diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.2	Sun Oct 15 00:58:43 2006
+++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php	Sat Nov 11 18:34:33 2006
@@ -49,7 +49,7 @@
 		
 		$controller =& $root->mController;
 		$user =& $root->mController->mRoot->mContext->mXoopsUser;
-		$render =& $this->getRenderBuffer();
+		$render =& $this->getRenderTarget();
 		
 		$this->mCurrentModule =& $controller->mRoot->mContext->mXoopsModule;
 		
Index: xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php
diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.1	Sat Oct 14 23:55:28 2006
+++ xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php	Sat Nov 11 18:34:33 2006
@@ -34,7 +34,7 @@
 
 	function execute()
 	{
-		$render =& $this->getRenderBuffer();
+		$render =& $this->getRenderTarget();
 		$render->setTemplateName('legacy_admin_block_actionsearch.html');
 		
 		$root =& XCube_Root::getSingleton();

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:33 +0900
Subject: [xoops-cvslog 5800] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061111093433.944EB2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacy/class/ActionFrame.class.php:1.1.2.7 xoops2jp/html/modules/legacy/class/ActionFrame.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/class/ActionFrame.class.php:1.1.2.7	Mon Oct 30 18:54:23 2006
+++ xoops2jp/html/modules/legacy/class/ActionFrame.class.php	Sat Nov 11 18:34:33 2006
@@ -150,27 +150,27 @@
 	
 		switch($viewStatus) {
 			case LEGACY_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACY_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACY_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACY_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 
 			case LEGACY_FRAME_VIEW_PREVIEW:
-				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 
 			case LEGACY_FRAME_VIEW_CANCEL:
-				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		}
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:44 +0900
Subject: [xoops-cvslog 5801] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20061111093444.7794C2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.6 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.7
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.6.2.6	Tue Oct 17 01:16:19 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Sat Nov 11 18:34:44 2006
@@ -112,27 +112,27 @@
 	
 		switch($viewStatus) {
 			case LEGACYRENDER_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACYRENDER_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACYRENDER_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACYRENDER_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACYRENDER_FRAME_VIEW_PREVIEW:
-				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case LEGACYRENDER_FRAME_VIEW_CANCEL:
-				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		}
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:44 +0900
Subject: [xoops-cvslog 5802] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061111093444.A54B42AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.5 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.5	Mon Nov  6 18:25:19 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Sat Nov 11 18:34:44 2006
@@ -34,10 +34,10 @@
 	/**
 	 * @var XCube_RenderTarget
 	 */
-	function &getRenderBuffer()
+	function &getRenderTarget()
 	{
 		if (!is_object($this->mRender)) {
-			$this->_createRenderBuffer();
+			$this->_createRenderTarget();
 		}
 		
 		return $this->mRender;
@@ -58,7 +58,7 @@
 	 * This is a helper function for sub-classes.
 	 * @access protected
 	 */
-	function &_createRenderBuffer()
+	function &_createRenderTarget()
 	{
 		$this->mRender =& new XCube_RenderTarget();
 		$this->mRender->setType(XCUBE_RENDER_TARGET_TYPE_BLOCK);
@@ -232,7 +232,7 @@
 			return;
 		}
 		
-		$render =& $this->getRenderBuffer();
+		$render =& $this->getRenderTarget();
 		$render->setAttribute("mid", $this->getId());
 		
 		if ($this->_mBlock->get('template') == null) {
Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.10 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.10	Thu Nov  9 14:46:39 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Sat Nov 11 18:34:44 2006
@@ -42,7 +42,7 @@
 	 * [READ ONLY] The render target instance for this module.
 	 * @access public
 	 * @var XCube_RenderTarget
-	 * @see Legacy_Module::getRenderBuffer()
+	 * @see Legacy_Module::getRenderTarget()
 	 */
 	var $mRender = null;
 	
@@ -170,12 +170,12 @@
 	 * Gets the render target instance.
 	 * @access public
 	 * @return XCube_RenderTarget
-	 * @see Legacy_Module::_createRenderBuffer()
+	 * @see Legacy_Module::_createRenderTarget()
 	 */
-	function &getRenderBuffer()
+	function &getRenderTarget()
 	{
 		if ($this->mRender == null) {
-			$this->_createRenderBuffer();
+			$this->_createRenderTarget();
 		}
 		
 		return $this->mRender;
@@ -187,9 +187,9 @@
 	 * the instance for many callbacks.
 	 * @access protected
 	 * @return XCube_RenderTarget
-	 * @see Legacy_Module::getRenderBuffer()
+	 * @see Legacy_Module::getRenderTarget()
 	 */	
-	function _createRenderBuffer()
+	function _createRenderTarget()
 	{
 		$root =& XCube_Root::getSingleton();
 		$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.20 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.21
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.20	Fri Nov 10 14:55:59 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Sat Nov 11 18:34:44 2006
@@ -343,7 +343,7 @@
 
 				$renderBuffer = null;
 				if ($blockProcedure->isDisplay()) {
-					$renderBuffer =& $blockProcedure->getRenderBuffer();
+					$renderBuffer =& $blockProcedure->getRenderTarget();
 					
 					$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
 					$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
@@ -762,7 +762,7 @@
 	{
 		if ($this->mRoot->mContext->mModule != null) {
 			$renderSystem =& $this->mRoot->getRenderSystem($this->mRoot->mContext->mModule->getRenderSystemName());
-			$renderTarget =& $this->mRoot->mContext->mModule->getRenderBuffer();
+			$renderTarget =& $this->mRoot->mContext->mModule->getRenderTarget();
 		
 			//
 			//  Buffering handling of standard output for main render target is responsibility
@@ -785,7 +785,7 @@
 			ob_end_clean();
 			
 			if (is_object($renderTarget)) {
-				$renderSystem->renderWithTarget($renderTarget);
+				$renderSystem->render($renderTarget);
 	
 				//
 				// Cache Control
@@ -826,7 +826,7 @@
 		//
 		// Rendering.
 		//
-		$renderSystem->renderWithTarget($screenTarget);
+		$renderSystem->render($screenTarget);
 
 		//
 		// Debug Process

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:44 +0900
Subject: [xoops-cvslog 5803] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061111093444.CFE482AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.12 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.13
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.12	Fri Nov 10 23:44:27 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Sat Nov 11 18:34:44 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.12 2006/11/10 14:44:27 nobunobu Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.13 2006/11/11 09:34:44 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -280,7 +280,7 @@
 		}
 	}
 	
-	function renderWithTarget(&$target)
+	function render(&$target)
 	{
 		//
 		// The following lines are temporary until we will finish changing the style!
@@ -536,7 +536,7 @@
 
 	XCube_DelegateUtils::call('Legacyfunction.Notifications.Select', new XCube_Ref($renderTarget));
 
-	$renderSystem->renderWithTarget($renderTarget);
+	$renderSystem->render($renderTarget);
 	
 	return $renderTarget->getResult();
 }

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:54 +0900
Subject: [xoops-cvslog 5804] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20061111093454.88E8D2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.4 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.5
--- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.6.2.4	Tue Oct 17 19:22:52 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php	Sat Nov 11 18:34:54 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: ActionFrame.class.php,v 1.1.2.6.2.4 2006/10/17 10:22:52 minahito Exp $
+ * @version $Id: ActionFrame.class.php,v 1.1.2.6.2.5 2006/11/11 09:34:54 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -93,27 +93,27 @@
 	
 		switch($viewStatus) {
 			case PM_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case PM_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case PM_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case PM_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 
 			case PM_FRAME_VIEW_PREVIEW:
-				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 
 			case PM_FRAME_VIEW_CANCEL:
-				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		}
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:34:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:34:54 +0900
Subject: [xoops-cvslog 5805] CVS update: xoops2jp/html/modules/stdCache/blocks
Message-ID: <20061111093454.B1F4B2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/blocks/cacheclear.php
diff -u xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.4 xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.5
--- xoops2jp/html/modules/stdCache/blocks/cacheclear.php:1.1.2.1.2.4	Tue Nov  7 16:31:46 2006
+++ xoops2jp/html/modules/stdCache/blocks/cacheclear.php	Sat Nov 11 18:34:54 2006
@@ -65,10 +65,7 @@
 		$renderTarget->setTemplateName('block_cacheclear_option.html');
 		$renderTarget->setAttribute('timer', $options[0]);
 
-		//
-		// renderWithTarget() will be renamed to render() in the near future.
-		//		
-		$renderSystem->renderWithTarget($renderTarget);
+		$renderSystem->render($renderTarget);
 		return $renderTarget->getResult();
 	}
 }

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:35:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:35:07 +0900
Subject: [xoops-cvslog 5806] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061111093507.052262AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.8 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.9
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.9.2.8	Fri Nov 10 20:30:00 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Sat Nov 11 18:35:07 2006
@@ -116,27 +116,27 @@
 		
 		switch($viewStatus) {
 			case USER_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewSuccess($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case USER_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewError($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case USER_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewIndex($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		
 			case USER_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewInput($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 				
 			case USER_FRAME_VIEW_PREVIEW:
-				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewPreview($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 				
 			case USER_FRAME_VIEW_CANCEL:
-				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderBuffer());
+				$this->mAction->executeViewCancel($controller, $controller->mRoot->mContext->mXoopsUser, $controller->mRoot->mContext->mModule->getRenderTarget());
 				break;
 		}
 	}

From minahito ＠ users.sourceforge.jp  Sat Nov 11 18:37:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 18:37:24 +0900
Subject: [xoops-cvslog 5807] CVS update: xoops2jp/html/core
Message-ID: <20061111093724.5D4CE2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_RenderSystem.class.php
diff -u xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.3 xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.3	Sat Nov 11 18:33:33 2006
+++ xoops2jp/html/core/XCube_RenderSystem.class.php	Sat Nov 11 18:37:24 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.3 2006/11/11 09:33:33 minahito Exp $
+ * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.4 2006/11/11 09:37:24 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -113,6 +113,16 @@
 		//return $this->mType;
 	}
 	
+	function setResult(&$result)
+	{
+		$this->mRenderBuffer = $result;
+	}
+	
+	function getResult()
+	{
+		return $this->mRenderBuffer;
+	}
+	
 	/**
 	 * Reset a template name and attributes in own properties.
 	 */

From minahito ＠ users.sourceforge.jp  Sat Nov 11 19:33:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 19:33:42 +0900
Subject: [xoops-cvslog 5808] CVS update: xoops2jp/docs/images
Message-ID: <20061111103342.15F2F2AC028@users.sourceforge.jp>

Index: xoops2jp/docs/images/install018.gif

From minahito ＠ users.sourceforge.jp  Sat Nov 11 19:33:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 19:33:42 +0900
Subject: [xoops-cvslog 5809] CVS update: xoops2jp/docs
Message-ID: <20061111103342.575272AC08F@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.4 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.5
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.4	Sat Nov 11 14:14:03 2006
+++ xoops2jp/docs/INSTALL.ja.html	Sat Nov 11 19:33:42 2006
@@ -7,11 +7,11 @@
 
 <style type="text/css">
 
-body {margin:0; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%;}
+body {margin:15px; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%; text-align:center;}
 ul, ol {margin:0; padding:0;}
 li {margin-left:60px;}
 
-h1, h2, h3, h4, h5 {margin:0.5em 0;}
+h1, h2, h3, h4, h5 {margin:0.5em;}
 h1 {font-size:150%;}
 h2 {font-size:140%;}
 h3 {font-size:130%;}
@@ -24,12 +24,10 @@
 .additions {color:#008800;}
 .deletions {color:#880000;}
 
-.page {background:#FFFFFF; padding:15px 20px; margin:15px; border:1px solid #cccccc;}
-.page p {margin-left:20px;}
+.page {background:#FFFFFF; padding:15px; margin:0 auto; border:1px solid #cccccc; text-align:left;}
+.page p {padding:0 10px; margin-left:20px;}
 
-.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
-
-.revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
+.info { color:#666666; padding:10px 20px; }
 
 .copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
 .copyright A { color: #AAAAAA; }
@@ -73,7 +71,6 @@
 <li>XOOPS Cube Legacy のファイルをサーバにアップロードし、「uploads/」、「cache/」、「templates_c/」ディレクトリ、および「mainfile.php」ファイルのパーミッションをPHPから書き込み可能に設定する。</li>
 <li>ブラウザのクッキーと<span class="missingpage">JavaScript</span>を有効にする。</li>
 </ul>
-<br />
 
 <h4>ローカル環境へのインストール</h4>
 <p>
@@ -102,17 +99,17 @@
 これまでに述べた通りに作業すると、インストールウィザード画面が表示されます。
 最初のウィザード画面ではインストーラの言語表示の種類を選択します。
 日本語表示にするには、リストボックスから「japanese」を選択して、「Next」ボタンをクリックします。
-<br /><br />
-<img src="images/japanese/install001.gif" border="0" />
 </p>
 
+<p><img src="images/japanese/install001.gif" border="0" /></p>
+
 <p>
 「XOOPS Cube Legacy 2.1 インストールウィザードへようこそ」画面が表示されますので、内容をよく読み「次へ」ボタンをクリックして進みます。
 （特に<b><u>準備</u></b>をもう一度よく読んで、インストールの準備ができているかどうか確認してください。）
-<br /><br />
-<img src="images/japanese/install002.gif" border="0" />
 </p>
 
+<p><img src="images/japanese/install002.gif" border="0" /></p>
+
 <p>
 次のウィザード画面には、パーミッションが正しく設定されているかどうかの確認結果が表示されます。
 先頭に緑色の信号が付いたディレクトリとファイルは、パーミッションが正しく設定されているものです。
@@ -122,66 +119,78 @@
 Win32環境でインストールを実行している場合には通常パーミッションを設定する必要はありませんので、
 すべてのディレクトリとファイルに緑色の信号が表示されるはずです。
 Unix環境でインストールを実行している場合には、各ディレクトリとファイルに正しいパーミッションを設定する必要があります。
-画面のようにすべてが緑色の信号で表示されたら、「次へ」ボタンをクリックして進みます。 <br />
-<br />
-<img src="images/japanese/install003.gif" border="0" />
+画面のようにすべてが緑色の信号で表示されたら、「次へ」ボタンをクリックして進みます。
 </p>
 
+<p><img src="images/japanese/install003.gif" border="0" /></p>
+
 <p>
 次のウィザード画面には、XOOPS CubeをインストールするディレクトリやブラウザでアクセスするためのURLなど、
 「データベース、およびパス・URLの設定」の入力フォームが表示されます。
-<br /><br />
-「データベースサーバ」には、使用するデータベースサーバの種類を指定します。
-<br /><br />
-「データベースサーバのホスト名」には、データベースサーバのホスト名を入力します。
+</p>
+
+<ul>
+<li>「データベースサーバ」には、使用するデータベースサーバの種類を指定します。</li>
+<li>「データベースサーバのホスト名」には、データベースサーバのホスト名を入力します。<br />
+<div class="info">
 ほとんどの場合、localhostという名前ですが、
 必ずサイト管理者やサーバのホスティング会社に問い合わせて、正しいデータベースホスト名を入力します。
-<br /><br />
-「データベースユーザ名」と「データベースパスワード」には、
-XOOPS Cubeがデータベースに接続する際に使用するユーザ名とパスワードを入力します。
+</div>
+</li>
+
+<li>「データベースユーザ名」と「データベースパスワード」には、
+XOOPS Cubeがデータベースに接続する際に使用するユーザ名とパスワードを入力します。<br />
+<div class="info">
 （テスト用のローカル環境以外では、セキュリティー上rootユーザとすべきではありません。
 また、ホスティングサービスを利用の場合は、ホスティング会社からあなたが使用できるユーザ名が知らされているはずです。）
-<br />
-「データベース名」には、XOOPS Cube Legacy で使うデータベースの名前を入力します。
+</div>
+</li>
+<li>「データベース名」には、XOOPS Cube Legacy で使うデータベースの名前を入力します。<br />
+<div class="info">
 上記のデータベースユーザは、このデータベースのアクセス・操作権限を持つ必要があります。
 ホスティングサービスを利用の場合は、ホスティング会社から使用できるデータベース名が指定されている場合があります。
-<br /><br />
-「テーブル接頭語」にはXOOPS Cubeが使うテーブル名の先頭に付ける接頭語を入力します。
+</div>
+</li>
+<li>「テーブル接頭語」にはXOOPS Cubeが使うテーブル名の先頭に付ける接頭語を入力します。<br />
+<div class="info">
 テーブル接頭語は、ほかのソフトウエアが使用するテーブル名との重複をさけるためのものです。
 あまり長いものにしないようにすることが望ましいです。
-<br /><br />
-「データベースへ持続的接続」は、よく分からない場合は、初期設定のまま「いいえ」を選択します。
-<br /><br />
-「XOOPS Cubeへのパス」には、ホストコンピュータにおける、XOOPS Cubeまでのフルパスを入力します。<br />
-「XOOPS CubeへのURL」には、ブラウザでXOOPS CubeにアクセスするためのURLを入力します。<br />
+</div>
+</li>
+<li>「データベースへ持続的接続」は、よく分からない場合は、初期設定のまま「いいえ」を選択します。</li>
+<li>「XOOPS Cubeへのパス」には、ホストコンピュータにおける、XOOPS Cubeまでのフルパスを入力します。</li>
+<li>「XOOPS CubeへのURL」には、ブラウザでXOOPS CubeにアクセスするためのURLを入力します。<br />
+<div class="info">
 入力フォームには自動で認識された値が入っていますが、必ず正しいかどうか確認してください。
 不明な場合は、サーバ管理者やホスティング会社に問い合わせて、正しく入力してください。
 また、Windowsではパスの区切り記号に「￥」を使いますが、ここでは「/」を使ってください。
 また、最後へ「.../htdocs/」のように「/」を入力しないでください。
-<br /><br />
-すべての項目を入力したら「次へ」ボタンをクリックして進みます。
-<br /><br />
-<img src="images/japanese/install004.gif" border="0" />
-</p>
+</div>
+</li>
+</ul>
+
+<p>すべての項目を入力したら「次へ」ボタンをクリックして進みます。</p>
+
+<p><img src="images/japanese/install004.gif" border="0" /></p>
 
 <p>
 次のウィザード画面には、前のフォームで入力した「データベース、およびパス・URLの設定」の内容が一覧形式で表示されます。
 インストールが失敗する原因のほとんどは、設定内容を注意深く確認していないことによるものです。
 もし、間違っていたら「戻る」ボタンをクリックして入力をやり直します。
 一覧が正しければ「次へ」ボタンをクリックして進みます。
-<br /><br />
-<img src="images/japanese/install005.gif" border="0" />
 </p>
 
+<p><img src="images/japanese/install005.gif" border="0" /></p>
+
 <p>
 入力した「データベース、およびパス・URLの設定」の内容がXOOPS Cubeの設定ファイル「mainfile.php」に書き込まれ、
 次のウィザード画面に書き込み処理の結果が表示されます。
 先頭に緑色の信号が付いた書き込み処理は正常に実行できています。
 すべてが正常に書き込み処理できたことを確認したら、「次へ」ボタンをクリックして進みます。
-<br /><br />
-<img src="images/japanese/install006.gif" border="0" />
 </p>
 
+<p><img src="images/japanese/install006.gif" border="0" /></p>
+
 <p>
 mainfile.phpに書き込まれたXOOPS CubeディレクトリへのパスとXOOPS CubeへのURLがウィザードによって検証され、
 次のウィザード画面にその検証結果が表示されます。
@@ -191,17 +200,15 @@
 間違っていた場合は、インストールをはじめからやり直してください。
 （サーバの設定によっては、まれに、設定が正しくてもエラーとなる場合があります。その際は、無視して次に進んでください。）
 「次へ」ボタンをクリックして進みます。
-<br /><br />
-<img src="images/japanese/install007.gif" border="0" />
 </p>
+<p><img src="images/japanese/install007.gif" border="0" /></p>
 
 <p>
 次のウィザード画面には、「データベース、およびパス・URLの設定」でフォームに入力したデータベースの内容が一覧で表示されます。
 設定が正しければ「次へ」ボタンをクリックして進みます。
 間違っている場合は、インストールをはじめからやり直してください。
-<br /><br />
-<img src="images/japanese/install008.gif" border="0" />
 </p>
+<p><img src="images/japanese/install008.gif" border="0" /></p>
 
 <p>
 次のウィザード画面には、データベースへの接続と「データベース、およびパス・URLの設定」で入力したデータベースが存在するかどうかの確認画面が表示されます。
@@ -210,23 +217,19 @@
 「データベースサーバへ...」の先頭に赤色の信号がある場合は、
 「データベース、およびパス・URLの設定」で入力したデータベースユーザー名・パスワードまたはデータベース名が間違っているか、
 PHP・データベースサーバの設定が間違っています。
-インストールをはじめからやり直してください。<br />
- <br />
-<img src="images/japanese/install009.gif" border="0" />
-<br /><br />
-<img src="images/japanese/install010.gif" border="0" />
-<br /><br />
-<img src="images/japanese/install011.gif" border="0" />
+インストールをはじめからやり直してください。
 </p>
+<p><img src="images/japanese/install009.gif" border="0" /></p>
+<p><img src="images/japanese/install010.gif" border="0" /></p>
+<p><img src="images/japanese/install011.gif" border="0" /></p>
 
 <p>
 データベースにXOOPS Cubeのテーブルが作成され、次のウィザード画面に作成結果が一覧表示されます。
 先頭に緑色の付いたテーブルは正常に作成されています。
 先頭に赤色の付いたテーブルは作成に失敗しています。
-すべてのテーブルが正しく作成できていたら、「次へ」ボタンをクリックして進みます。<br />
-<br />
-<img src="images/japanese/install012.gif" border="0" />
+すべてのテーブルが正しく作成できていたら、「次へ」ボタンをクリックして進みます。
 </p>
+<p><img src="images/japanese/install012.gif" border="0" /></p>
 
 <p>
 次のウィザード画面には、管理者ユーザを作成するためのフォームが表示されます。
@@ -234,27 +237,21 @@
 ユーザ名とパスワードは、忘れないようにしてください。
 また、「管理者ユーザー名」「パスワード」とも、半角英数字とし、スペースを含めないことを推奨します。
 フォームのすべてに入力が済んだら「次へ」ボタンをクリックして進みます。
-<br /><br />
-<img src="images/japanese/install013.gif" border="0" />
 </p>
+<p><img src="images/japanese/install013.gif" border="0" /></p>
 
 <p>
 XOOPS Cubeで使うアイコンや初期データが各テーブルに作成され、次のウィザード画面にその結果が表示されます。
 すべてのデータの作成や書き込みの先頭に緑色の信号が付いていることを確認し、
 「次へ」ボタンをクリックしてインストールを完了します。
-<br /><br />
-<img src="images/japanese/install014.gif" border="0" />
 </p>
+<p><img src="images/japanese/install014.gif" border="0" /></p>
 
 <h4>STEP1 インストール成功！</h4>
-<br />
-<img src="images/japanese/install015.gif" border="0" />
-<br /><br />
-<img src="images/japanese/install016.gif" border="0" />
-<br /><br />
-<img src="images/japanese/install017.gif" border="0" />
-<br /><br />
-<img src="images/japanese/install018.gif" border="0" />
+<p><img src="images/japanese/install015.gif" border="0" /></p>
+<p><img src="images/japanese/install016.gif" border="0" /></p>
+<p><img src="images/japanese/install017.gif" border="0" /></p>
+<p><img src="images/japanese/install018.gif" border="0" /></p>
 <p>
 お疲れさまでした、これでXOOPS Cubeのインストール作業はすべて完了しました。
 <u><b>サイト</b></u>に貼られた「ここ」リンクをクリックして、インストールしたXOOPS Cubeのサイトにアクセスし、この管理者ユーザ名でログインし、洗練されたポータルサイトを構築してください。
Index: xoops2jp/docs/INSTALL.html
diff -u xoops2jp/docs/INSTALL.html:1.1.8.1.2.2 xoops2jp/docs/INSTALL.html:1.1.8.1.2.3
--- xoops2jp/docs/INSTALL.html:1.1.8.1.2.2	Sat Nov 11 14:14:03 2006
+++ xoops2jp/docs/INSTALL.html	Sat Nov 11 19:33:42 2006
@@ -3,16 +3,16 @@
   <title>Xoops Cube Install Guide</title>
   <meta name="keywords" content="XOOPS docs" />
   <meta name="description" content="XOOPS" />
-<style type="text/css">
 
-body {margin:0; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%;}
+<style type="text/css">
+body {margin:15px; padding:0; background:#f8f8f8; color:#000; font-family:font-family:Verdana, Helvetica, Tahoma, Arial, sans-serif; font-size:13px; line-height:140%; text-align:center;}
 ul, ol {margin:0; padding:0;}
 li {margin-left:60px;}
 
-h1, h2, h3, h4, h5 {margin:0.5em 0;}
+h1, h2, h3, h4, h5 {margin:0.5em;}
 h1 {font-size:150%;}
 h2 {font-size:140%;}
-h3 {font-size:140%;}
+h3 {font-size:130%;}
 h4 {font-size:120%; padding:5px; padding-left:26px; background:transparent url(images/title.png) no-repeat center left; border-bottom:1px solid #cccccc;}
 h5 {font-size:110%:}
 
@@ -22,12 +22,10 @@
 .additions {color:#008800;}
 .deletions {color:#880000;}
 
-.page {background:#FFFFFF; padding:15px 20px; margin:15px; border:1px solid #cccccc;}
-.page p {margin-left:20px;}
-
-.code { background: #FFFFFF; border: solid #888888 2px; font-family: "Courier New"; color: black; font-size: 10pt; width: 100%; height: 400px; overflow: scroll; padding: 3px; }
+.page {background:#FFFFFF; padding:15px; margin:0 auto; border:1px solid #cccccc; text-align:left;}
+.page p {padding:0 10px; margin-left:20px;}
 
-.revisioninfo { color: #AAAAAA; padding-bottom: 20px; }
+.info { color:#666666; padding:10px 20px; }
 
 .copyright { font-size: 11px; color: #AAAAAA; text-align: right; }
 .copyright A { color: #AAAAAA; }
@@ -37,7 +35,7 @@
 <body>
 
 <div class="page">
-<h3>Installing XOOPS Cube</h3>
+<h3>XOOPS Cube Legacy Install Guide</h3>
 <hr noshade size="1" />
 <h4>Preface:</h4>
 
@@ -65,7 +63,7 @@
 <li>The ability to set the following directories and files world writeable: uploads/, cache/ and templates_c/ and the file mainfile.php</li>
 <li>Turn cookie and <span class="missingpage">JavaScript</span><a href="http://wiki.xoops.org/wakka.php?wakka=JavaScript/edit">?</a> support in your browser on.</li>
 </ul>
-</p>
+<br />
 
 <h4>Installing locally</h4>
 <p>
@@ -135,7 +133,7 @@
 The next Wizard screen is for inputting site administrative information. <br />
 </p>
 
-<p><img src="images/install024.gif" /></p>
+<p><img src="images/install018.gif" /></p>
 
 <p>
 Please be careful here and write down or remember your administrative password. You'll need this after the install to continue setting up your XOOPS Cube site.  Once you have completed inputting the correct information, click Next to continue.   * Note, try to refrain from using names with spaces for the Admin name. *<br />

From minahito ＠ users.sourceforge.jp  Sat Nov 11 19:33:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 11 Nov 2006 19:33:42 +0900
Subject: [xoops-cvslog 5810] CVS update: xoops2jp/docs/images/japanese
Message-ID: <20061111103342.8304C2AC028@users.sourceforge.jp>

Index: xoops2jp/docs/images/japanese/install018.gif
Index: xoops2jp/docs/images/japanese/install017.gif

From minahito ＠ users.sourceforge.jp  Sun Nov 12 01:13:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 01:13:44 +0900
Subject: [xoops-cvslog 5811] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061111161344.C16A32AC130@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php:1.1.2.4	Sat Nov 11 16:06:23 2006
+++ xoops2jp/html/modules/legacy/admin/actions/CommentEditAction.class.php	Sun Nov 12 01:13:44 2006
@@ -140,7 +140,7 @@
 		// We think we should not use getUser() and updateUserByField in XCube 2.1.
 		//
 		$user =& $handler->getUser($comment->get('com_uid'));
-		if (is_obejct($user)) {
+		if (is_object($user)) {
 			$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
 		}
 	}
@@ -158,7 +158,7 @@
 			// We think we should not use getUser() and updateUserByField in XCube 2.1.
 			//
 			$user =& $handler->getUser($comment->get('com_uid'));
-			if (is_obejct($user)) {
+			if (is_object($user)) {
 				$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
 			}
 		}

From minahito ＠ users.sourceforge.jp  Sun Nov 12 02:49:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 02:49:30 +0900
Subject: [xoops-cvslog 5812] CVS update: xoops2jp/html/kernel
Message-ID: <20061111174930.958CA2AC147@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.10 xoops2jp/html/kernel/block.php:1.2.8.10.2.1
--- xoops2jp/html/kernel/block.php:1.2.8.10	Tue Aug 22 11:30:26 2006
+++ xoops2jp/html/kernel/block.php	Sun Nov 12 02:49:30 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.10 2006/08/22 02:30:26 nobunobu Exp $
+// $Id: block.php,v 1.2.8.10.2.1 2006/11/11 17:49:30 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -81,7 +81,7 @@
         $this->initVar('edit_func', XOBJ_DTYPE_TXTBOX, null, false, 50);
         $this->initVar('template', XOBJ_DTYPE_OTHER, null, false);
         $this->initVar('bcachetime', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('last_modified', XOBJ_DTYPE_INT, 0, false);
+        $this->initVar('last_modified', XOBJ_DTYPE_INT, time(), false);
 
         // for backward compatibility
         if (isset($id)) {

From minahito ＠ users.sourceforge.jp  Sun Nov 12 02:50:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 02:50:38 +0900
Subject: [xoops-cvslog 5813] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061111175038.1D94D2AC163@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.6	Sat Nov 11 17:37:37 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Sun Nov 12 02:50:37 2006
@@ -463,9 +463,7 @@
 
 			$tplHandler =& xoops_gethandler('tplfile');
 
-			if (!Legacy_ModuleInstallUtils::installAllOfBlockTemplates($module, $blockObj)) {
-				$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->getVar('name')));
-			}
+			Legacy_ModuleInstallUtils::installBlockTemplate($blockObj, $module, $log);
 			
 			//
 			// Process of a permission.
@@ -542,7 +540,7 @@
 	 * to database.
 	 * @return bool
 	 */
-	function installAllOfBlockTemplates(&$module, &$block)
+	function installBlockTemplate(&$block, &$module, &$log)
 	{
 		if ($block->get('template') == null) {
 			return true;
@@ -553,8 +551,8 @@
 		$criteria =& new CriteriaCompo();
 		$criteria->add(new Criteria('tpl_type', 'block'));
 		$criteria->add(new Criteria('tpl_tplset', 'default'));
-		$criteria->add(new Criteria('tpl_module', $module->getVar('dirname')));
-		$criteria->add(new Criteria('tpl_file', $block->getVar('template')));
+		$criteria->add(new Criteria('tpl_module', $module->get('dirname')));
+		$criteria->add(new Criteria('tpl_file', $block->get('template')));
 		$tplfiles =& $tplHandler->getObjects($criteria);
 
 		if (count($tplfiles) > 0) {
@@ -562,20 +560,26 @@
 		}
 		else {
 			$tplfile =& $tplHandler->create();
-			$tplfile->setVar('tpl_refid', $block->getVar('bid'));
-			$tplfile->setVar('tpl_tplset', 'default');
-			$tplfile->setVar('tpl_file', $block->getVar('template'));
-			$tplfile->setVar('tpl_module', $module->getVar('dirname'));
-			$tplfile->setVar('tpl_type', 'block');
+			$tplfile->set('tpl_refid', $block->get('bid'));
+			$tplfile->set('tpl_tplset', 'default');
+			$tplfile->set('tpl_file', $block->get('template'));
+			$tplfile->set('tpl_module', $module->get('dirname'));
+			$tplfile->set('tpl_type', 'block');
 			// $tplfile->setVar('tpl_desc', $tpl_desc);
-			$tplfile->setVar('tpl_lastimported', 0);
+			$tplfile->set('tpl_lastimported', 0);
 		}
 		
-		$tplSource = Legacy_ModuleInstallUtils::readTemplateFile($module->getVar('dirname'), $block->getVar('template'), true);
-		$tplfile->setVar('tpl_source', $tplSource);
-		$tplfile->setVar('tpl_lastmodified', time());
+		$tplSource = Legacy_ModuleInstallUtils::readTemplateFile($module->get('dirname'), $block->get('template'), true);
+		$tplfile->set('tpl_source', $tplSource);
+		$tplfile->set('tpl_lastmodified', time());
 
-		return $tplHandler->insert($tplfile);
+		if ($tplHandler->insert($tplfile)) {
+			return true;
+		}
+		else {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->get('name')));
+			return false;
+		}
 	}
 	
 	/**
@@ -751,6 +755,148 @@
 		}
 	}
 	
+	function smartUpdateAllOfBlock(&$module, &$log)
+	{
+		$dirname = $module->get('dirname');
+		
+		$fileReader =& new Legacy_ModinfoX2FileReader($dirname);
+		$latestBlocks =& $fileReader->loadBlockInformations();
+		
+		$dbReader =& new Legacy_ModinfoX2DBReader($dirname);
+		$currentBlocks =& $dbReader->loadBlockInformations();
+		
+		$currentBlocks->update($latestBlocks);
+
+		foreach (array_keys($currentBlocks->mBlocks) as $idx) {
+			switch ($currentBlocks->mBlocks[$idx]->mStatus) {
+				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+					Legacy_ModuleInstallUtils::updateBlockTemplateByInfo($currentBlocks->mBlocks[$idx], $module, $log);
+					break;
+				
+				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updateBlockByInfo($currentBlocks->mBlocks[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+					Legacy_ModuleInstallUtils::installBlockByInfo($currentBlocks->mBlocks[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+					Legacy_ModuleInstallUtils::uninstallBlockByFuncNum($currentBlocks->mBlocks[$idx]->mFuncNum, $module, $log);
+					break;
+			}
+		}
+	}
+	
+	function updateBlockTemplateByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('dirname', $module->get('dirname')));
+		$criteria->add(new Criteria('func_num', $info->mFuncNum));
+		
+		$blockArr =& $handler->getObjects($criteria);
+		foreach (array_keys($blockArr) as $idx) {
+			Legacy_ModuleInstallUtils::uninstallBlockTemplate($blockArr[$idx], $module, $log);
+			Legacy_ModuleInstallUtils::installBlockTemplate($blockArr[$idx], $module, $log);
+		}
+	}
+	
+	function updateBlockByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('dirname', $module->get('dirname')));
+		$criteria->add(new Criteria('func_num', $info->mFuncNum));
+		
+		$blockArr =& $handler->getObjects($criteria);
+		foreach (array_keys($blockArr) as $idx) {
+			$blockArr[$idx]->set('options', $info->mOptions);
+			$blockArr[$idx]->set('name', $info->mName);
+			$blockArr[$idx]->set('func_file', $info->mFuncFile);
+			$blockArr[$idx]->set('show_func', $info->mShowFunc);
+			$blockArr[$idx]->set('edit_func', $info->mEditFunc);
+			$blockArr[$idx]->set('template', $info->mTemplate);
+			
+			if ($handler->insert($blockArr[$idx])) {
+				$log->addReport(XCube_Utils::formatMessage('Update {0} block successfully.', $blockArr[$idx]->get('name')));
+			}
+			else {
+				$log->addError(XCube_Utils::formatMessage('Could not update {0} block.', $blockArr[$idx]->get('name')));
+			}
+			
+			Legacy_ModuleInstallUtils::uninstallBlockTemplate($blockArr[$idx], $module, $log);
+			Legacy_ModuleInstallUtils::installBlockTemplate($blockArr[$idx], $module, $log);
+		}
+	}
+	
+	function installBlockByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('block');
+		$block =& $handler->create();
+		
+		$block->set('mid', $module->get('mid'));
+		$block->set('func_num', $info->mFuncNum);
+		$block->set('options', $info->mOptions);
+		$block->set('name', $info->mName);
+		$block->set('title', $info->mName);
+		$block->set('dirname', $module->get('dirname'));
+		$block->set('func_file', $info->mFuncFile);
+		$block->set('show_func', $info->mShowFunc);
+		$block->set('edit_func', $info->mEditFunc);
+		$block->set('template', $info->mTemplate);
+		
+		if (!$handler->insert($block)) {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK, $block->get('name')));
+			return false;
+		}
+		else {
+			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_INSTALLED, $block->get('name')));
+
+			Legacy_ModuleInstallUtils::installBlockTemplate($block, $module, $log);
+			
+			return true;
+		}
+	}
+	
+	/**
+	 * @todo Need a message in the fail case.
+	 */
+	function uninstallBlockByFuncNum($func_num, &$module, &$log)
+	{
+		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('dirname', $module->get('dirname')));
+		$criteria->add(new Criteria('func_num', $func_num));
+		
+		$blockArr =& $handler->getObjects($criteria);
+		foreach (array_keys($blockArr) as $idx) {
+			if ($handler->delete($blockArr[$idx])) {
+				$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_UNINSTALLATION_BLOCK_SUCCESSFUL, $blockArr[$idx]->get('name')));
+			}
+			else {
+				// Uninstall fail
+			}
+			
+			Legacy_ModuleInstallUtils::uninstallBlockTemplate($blockArr[$idx], $module, $log);
+		}
+	}
+	
+	function uninstallBlockTemplate(&$block, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('tplfile');
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('tpl_refid', $block->get('bid')));
+		$criteria->add(new Criteria('tpl_file', $block->get('template')));
+		$criteria->add(new Criteria('tpl_module', $module->get('dirname')));
+		$criteria->add(new Criteria('tpl_type', 'block'));
+		
+		$handler->deleteAll($criteria);
+	}
+	
 	/**
 	 * Executes SQL query as cube style.
 	 */
@@ -784,4 +930,306 @@
 	}
 }
 
+define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");
+define('LEGACY_BLOCKINFOMATION_STATUS_UPDATED', "updated");
+define('LEGACY_BLOCKINFOMATION_STATUS_NEW', "new");
+define('LEGACY_BLOCKINFOMATION_STATUS_DELETED', "deleted");
+
+/**
+ * The structure which is able to keep block's informations without DB. THis
+ * is installer only.
+ */
+class Legacy_BlockInformation
+{
+	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	
+	var $mFuncNum = 0;
+	
+	var $mName = "";
+	
+	var $mOptions = "";
+	
+	var $mFuncFile = "";
+	var $mShowFunc = "";
+	var $mEditFunc = "";
+	var $mTemplate = "";
+	
+	function Legacy_BlockInformation($funcNum, $name, $funcFile, $showFunc, $editFunc, $template, $options = null)
+	{
+		$this->mFuncNum = intval($funcNum);
+		$this->mName = $name;
+		$this->mFuncFile = $funcFile;
+		$this->mShowFunc = $showFunc;
+		$this->mEditFunc = $editFunc;
+		$this->mTemplate = $template;
+		$this->mOptions = $options;
+	}
+	
+	/**
+	 * @return bool
+	 */
+	function isEqual(&$block)
+	{
+		if ($this->mFuncNum != $block->mFuncNum) {
+			return false;
+		}
+		
+		if ($this->mName != $block->mName) {
+			return false;
+		}
+		
+		if ($this->mFuncFile != $block->mFuncFile) {
+			return false;
+		}
+		
+		if ($this->mShowFunc != $block->mShowFunc) {
+			return false;
+		}
+		
+		if ($this->mEditFunc != $block->mEditFunc) {
+			return false;
+		}
+		
+		if ($this->mTemplate != $block->mTemplate) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	function update(&$block)
+	{
+		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		
+		$this->mName = $block->mName;
+		$this->mFuncFile = $block->mFuncFile;
+		$this->mShowFunc = $block->mShowFunc;
+		$this->mEditFunc = $block->mEditFunc;
+		$this->mTemplate = $block->mTemplate;
+	}
+}
+
+class Legacy_BlockInfoCollection
+{
+	var $mBlocks = array();
+	
+	function add(&$info)
+	{
+		if (isset($this->mBlocks[$info->mFuncNum])) {
+			return false;
+		}
+		
+		$this->mBlocks[$info->mFuncNum] =& $info;
+		
+		ksort($this->mBlocks);
+		
+		return true;
+	}
+	
+	function &get($funcNum)
+	{
+		if (isset($this->mBlocks[$funcNum])) {
+			return $this->mBlocks[$funcNum];
+		}
+		
+		$ret = null;
+		return $ret;
+	}
+	
+	/**
+	 * Updates the list of blocks by comparing with $collection.
+	 */
+	function update(&$collection)
+	{
+		foreach (array_keys($this->mBlocks) as $idx) {
+			$t_block =& $collection->get($this->mBlocks[$idx]->mFuncNum);
+			if ($t_block == null) {
+				$this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+			elseif (!$this->mBlocks[$idx]->isEqual($t_block)) {
+				$this->mBlocks[$idx]->update($t_block);
+			}
+		}
+		
+		foreach (array_keys($collection->mBlocks) as $idx) {
+			$func_num = $collection->mBlocks[$idx]->mFuncNum;
+			if (!isset($this->mBlocks[$func_num])) {
+				$this->add($collection->mBlocks[$idx]);
+				$this->mBlocks[$func_num]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+	}
+	
+	function reset()
+	{
+		unset($this->mBlocks);
+		$this->mBlocks = array();
+	}
+}
+
+class Legacy_AbstractModinfoReader
+{
+	function Legacy_AbstractModinfoReader()
+	{
+	}
+
+	/**
+	 * @return Legacy_BlockInfoCollection
+	 */	
+	function &loadBlockInformations()
+	{
+	}
+}
+
+/**
+ * @note final class
+ */
+class Legacy_ModinfoX2FileReader extends Legacy_AbstractModinfoReader
+{
+	/**
+	 * @protected
+	 */
+	var $_mDirname = null;
+	
+	function Legacy_ModinfoX2FileReader($dirname)
+	{
+		$this->_mDirname = $dirname;
+	}
+	
+	/**
+	 * @private
+	 */
+	function &_createBlockInformation($funcNum, $arr)
+	{
+		$showFunc = "";
+		if (isset($arr['class'])) {
+			$showFunc = 'cl::' . $arr['class'];
+		}
+		else {
+			$showFunc = $arr['show_func'];
+		}
+		
+		$editFunc = isset($arr['edit_func']) ? $arr['edit_func'] : null;
+		$template = isset($arr['template']) ? $arr['template'] : null;
+		$options = isset($arr['options']) ? $arr['options'] : null;
+		
+		$info =& new Legacy_BlockInformation($funcNum, $arr['name'], $arr['file'], $arr['show_func'], $editFunc, $template, $options);
+		
+		return $info;
+	}
+	
+	/**
+	 * @todo Need guarantee of global variables.
+	 */
+	function &loadBlockInformations()
+	{
+		$collection =& new Legacy_BlockInfoCollection();
+		
+		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
+		if (!file_exists($t_filePath)) {
+			return $collection;
+		}
+		
+		include $t_filePath;
+		
+		if (!isset($modversion['blocks'])) {
+			return $collection;
+		}
+		
+		$blockArr = $modversion['blocks'];
+		
+		//
+		// Try (1) --- func_num
+		//
+		$successFlag = true;
+		foreach ($blockArr as $idx => $block) {
+			if (isset($block['func_num'])) {
+				$info =& $this->_createBlockInformation($block['func_num'], $block);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if ($successFlag) {
+			return $collection;
+		}
+		
+		//
+		// Try (2) --- index pattern
+		//
+		$collection->reset();
+		
+		$successFlag = true;
+		foreach ($blockArr as $idx => $block) {
+			if (is_int($idx)) {
+				$info =& $this->_createBlockInformation($idx, $block);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if ($successFlag) {
+			return $collection;
+		}
+		
+		//
+		// Try (3) --- automatic
+		//
+		$collection->reset();
+		
+		$idx = 1;
+		foreach ($blockArr as $block) {
+			$info =& $this->_createBlockInformation($idx++, $block);
+			$successFlag &= $collection->add($info);
+			unset($info);
+		}
+		
+		return $collection;
+	}
+}
+
+class Legacy_ModinfoX2DBReader extends Legacy_AbstractModinfoReader
+{
+	/**
+	 * @protected
+	 */
+	var $_mDirname = null;
+	
+	function Legacy_ModinfoX2DBReader($dirname)
+	{
+		$this->_mDirname = $dirname;
+	}
+	
+	function &_createBlockInformation(&$block)
+	{
+		$info =& new Legacy_BlockInformation($block->get('func_num'), $block->get('name'), $block->get('func_file'), $block->get('show_func'), $block->get('edit_func'), $block->get('template'), $block->get('options'));
+		return $info;
+	}
+	
+	function &loadBlockInformations()
+	{
+		$collection =& new Legacy_BlockInfoCollection();
+		
+		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
+		$criteria =& new Criteria('dirname', $this->_mDirname);
+		$blockArr =& $handler->getObjects($criteria);
+		
+		foreach (array_keys($blockArr) as $idx) {
+			$info =& $this->_createBlockInformation($blockArr[$idx]);
+			$collection->add($info);
+		}
+		
+		return $collection;
+	}
+}
+
+
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sun Nov 12 02:50:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 02:50:44 +0900
Subject: [xoops-cvslog 5814] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061111175044.684192AC163@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.11 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.12
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.11	Thu Nov  2 19:54:39 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Sun Nov 12 02:50:44 2006
@@ -306,8 +306,7 @@
 	 */
 	function _updateBlocks()
 	{
-		Legacy_ModuleInstallUtils::uninstallAllOfBlocks($this->_mTargetXoopsModule, $this->mLog);
-		Legacy_ModuleInstallUtils::installAllOfBlocks($this->_mTargetXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::smartUpdateAllOfBlock($this->_mTargetXoopsModule, $this->mLog);
 	}
 	
 	/**

From minahito ＠ users.sourceforge.jp  Sun Nov 12 02:50:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 02:50:54 +0900
Subject: [xoops-cvslog 5815] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061111175054.3405D2AC147@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/newblocks.php
diff -u xoops2jp/html/modules/legacy/class/newblocks.php:1.1.2.2 xoops2jp/html/modules/legacy/class/newblocks.php:1.1.2.3
--- xoops2jp/html/modules/legacy/class/newblocks.php:1.1.2.2	Sun Oct 15 01:33:59 2006
+++ xoops2jp/html/modules/legacy/class/newblocks.php	Sun Nov 12 02:50:54 2006
@@ -20,7 +20,7 @@
 
 	function LegacyNewblocksObject()
 	{
-		$this->initVar('bid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('bid', XOBJ_DTYPE_INT, '0', true);
 		$this->initVar('mid', XOBJ_DTYPE_INT, '0', true);
 		$this->initVar('func_num', XOBJ_DTYPE_INT, '0', true);
 		$this->initVar('options', XOBJ_DTYPE_STRING, '', true, 255);
@@ -39,7 +39,7 @@
 		$this->initVar('edit_func', XOBJ_DTYPE_STRING, '', true, 50);
 		$this->initVar('template', XOBJ_DTYPE_STRING, '', true, 50);
 		$this->initVar('bcachetime', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('last_modified', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('last_modified', XOBJ_DTYPE_INT, time(), true);
 	}
 	
 	function loadModule()

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:11:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:11:24 +0900
Subject: [xoops-cvslog 5816] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061112051124.5C09C2AC08B@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_input.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9	Fri Aug 25 20:03:32 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php	Sun Nov 12 14:11:24 2006
@@ -8,7 +8,7 @@
  *    $params['script']... This function have not impletented that yet. At
  *    implementing, we will have to define the rule about sanitizing.
  *
- * @version $Id: function.xoops_input.php,v 1.1.2.9 2006/08/25 11:03:32 tom_g3x Exp $
+ * @version $Id: function.xoops_input.php,v 1.1.2.9.2.1 2006/11/12 05:11:24 tom_g3x Exp $
  */
 
 /*
@@ -70,7 +70,11 @@
 			$string .= " class=\"${class}\"";
 		}
 
-		$string .= " id=\"{$id}\"";
+		if ($type == "checkbox" || $type == "radio") {
+			$string .= " id=\"{$id}_{$value}\"";
+		}else {
+			$string .= " id=\"{$id}\"";
+		}
 		
 		if ($type) {
 			$string .= " type=\"${type}\"";
@@ -91,7 +95,7 @@
 		if (isset($params['default'])) {
 			$default = trim($params['default']);
 			if ($value == $default) {
-				if ($type = "checkbox" || $type == "radio") {
+				if ($type == "checkbox" || $type == "radio") {
 					$string .= " checked=\"checked\"";
 				}
 			}
Index: xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.1	Thu Nov  9 18:35:42 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Sun Nov 12 14:11:24 2006
@@ -17,6 +17,10 @@
  * 
  * -------------------------------------------------------------
  */
+
+// This overlaps with "xoops_input".
+//define ("XOOPS_INPUT_DEFID_PREFIX", "legacy_xoopsform_");
+
 function smarty_function_xoops_optionsArray($params, &$smarty)
 {
 	//
@@ -40,7 +44,7 @@
 		}
 		
 		if ($id) {
-			$t_id = "${id}_${value}";
+			$t_id = XOOPS_INPUT_DEFID_PREFIX . $id."_".$value;
 			$tags .= "<option id=\"${t_id}\" value=\"${value}\"${selected}>${label}</option>\n";
 		}
 		else {

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:23 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:23 +0900
Subject: [xoops-cvslog 5817] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061112051223.CBEE52AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_image_list.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_image_list.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_image_list.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_image_list.html:1.1.2.2	Sun Oct 15 01:44:53 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_image_list.html	Sun Nov 12 14:12:23 2006
@@ -19,8 +19,8 @@
 
 <form method="get" action="./index.php?action=ImageList" style="margin:10px;">
   <select name="imgcat_id" onchange="location='<{$smarty.const.XOOPS_URL}>/imagemanager.php?target=<{$target}>&amp;imgcat_id='+this.options[this.selectedIndex].value">
-    <option value="0">---</option>
-    <{xoops_optionsArray from=$categoryArr value=imgcat_id label=imgcat_name default=$imgcatId}>
+    <option id="imgcat_id_0" value="0">---</option>
+    <{xoops_optionsArray id=imgcat_id from=$categoryArr value=imgcat_id label=imgcat_name default=$imgcatId}>
   </select>
   <input type="submit" value="<{$smarty.const._SUBMIT}>" />
 </form>
Index: xoops2jp/html/modules/legacy/templates/legacy_search_form.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_search_form.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_search_form.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_search_form.html:1.1.2.2	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_search_form.html	Sun Nov 12 14:12:23 2006
@@ -21,9 +21,9 @@
       <td class="head"><{$smarty.const._SR_TYPE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="andor">
-          <option value="AND" <{if $actionForm->get('andor') == 'AND'}>selected="selected"<{/if}>><{$smarty.const._SR_ALL}></option>
-          <option value="OR" <{if $actionForm->get('andor') == 'OR'}>selected="selected"<{/if}>><{$smarty.const._SR_ANY}></option>
-          <option value="exact" <{if $actionForm->get('andor') == 'exact'}>selected="selected"<{/if}>><{$smarty.const._SR_EXACT}></option>
+          <option id="andor_AND" value="AND" <{if $actionForm->get('andor') == 'AND'}>selected="selected"<{/if}>><{$smarty.const._SR_ALL}></option>
+          <option id="andor_OR" value="OR" <{if $actionForm->get('andor') == 'OR'}>selected="selected"<{/if}>><{$smarty.const._SR_ANY}></option>
+          <option id="andor_exact" value="exact" <{if $actionForm->get('andor') == 'exact'}>selected="selected"<{/if}>><{$smarty.const._SR_EXACT}></option>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:23 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:23 +0900
Subject: [xoops-cvslog 5818] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20061112051223.F02F22AC104@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.2 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.3
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.2	Mon Nov  6 19:20:19 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Sun Nov 12 14:12:23 2006
@@ -71,7 +71,7 @@
       <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="timezone_offset">
-          <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
+          <{xoops_optionsArray id=timezone_offset label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
         </select>
       </td>
     </tr>
@@ -159,8 +159,8 @@
       <td class="head"><{$smarty.const._MD_USER_LANG_RANK}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="rank">
-          <option value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option>
-          <{xoops_optionsArray value=rank_id label=rank_title from=$ranks default=$actionForm->get('rank')}>
+          <option id="rank_0" value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option>
+          <{xoops_optionsArray id=rank value=rank_id label=rank_title from=$ranks default=$actionForm->get('rank')}>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:24 +0900
Subject: [xoops-cvslog 5819] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061112051224.31C022AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/preference_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.5	Sun Nov  5 23:01:42 2006
+++ xoops2jp/html/modules/legacy/admin/templates/preference_edit.html	Sun Nov 12 14:12:23 2006
@@ -87,25 +87,25 @@
 
           <{elseif $config->get('conf_formtype') == 'theme'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
-              <{xoops_optionsArray value=dirname label=dirname from=$themeArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=dirname label=dirname from=$themeArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
 
             
           <{elseif $config->get('conf_formtype') == 'theme_multi'}>
             <select name='<{$config->getVar('conf_name')}>[]' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='5' multiple="multiple">
-              <{xoops_optionsArray value=dirname label=dirname from=$themeArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=dirname label=dirname from=$themeArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
             
             
           <{elseif $config->get('conf_formtype') == 'tplset'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
-              <{xoops_optionsArray value=tplset_name label=tplset_name from=$tplsetArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=tplset_name label=tplset_name from=$tplsetArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
             
             
           <{elseif $config->get('conf_formtype') == 'timezone'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
-              <{xoops_optionsArray value=offset label=zone_name from=$timezoneArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=offset label=zone_name from=$timezoneArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
 
 
@@ -120,13 +120,13 @@
           <{elseif $config->get('conf_formtype') == 'startpage'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <option value="--"><{$smarty.const._AD_LEGACY_LANG_NONE}></option>
-              <{xoops_optionsArray value=mid label=name from=$moduleArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=mid label=name from=$moduleArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
             
             
           <{elseif $config->get('conf_formtype') == 'group'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
-              <{xoops_optionsArray value=groupid label=name from=$groupArr default=$actionForm->get($config->get('conf_name'))}>
+              <{xoops_optionsArray id=$config->getVar('conf_name') value=groupid label=name from=$groupArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
 
 
Index: xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html	Sun Nov 12 14:12:24 2006
@@ -61,7 +61,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
-          <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
+          <{xoops_optionsArray id=side from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
         </select>
       </td>
     </tr>
@@ -81,7 +81,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_C_TYPE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='c_type'>
-          <{xoops_optionsArray from=$ctypeArr value=type label=label default=$actionForm->get('c_type')}>
+          <{xoops_optionsArray id=c_type from=$ctypeArr value=type label=label default=$actionForm->get('c_type')}>
         </select>
       </td>
     </tr>
@@ -89,7 +89,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
-          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+          <{xoops_optionsArray id=bcachetime from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
         </select>
       </td>
     </tr>
@@ -98,9 +98,9 @@
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
           <{if $actionForm->get('bmodule')}>
-            <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
+            <{xoops_optionsArray id=bmodule[] from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
           <{else}>
-            <{xoops_optionsArray from=$moduleArr value=mid label=name default=-1}>
+            <{xoops_optionsArray id=bmodule[] from=$moduleArr value=mid label=name default=-1}>
           <{/if}>
         </select>
       </td>
@@ -110,9 +110,9 @@
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
           <{if $actionForm->get('groupid')}>
-            <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
+            <{xoops_optionsArray id=groupid[] from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
           <{else}>
-            <{xoops_optionsArray from=$groupArr value=groupid label=name default=1}>
+            <{xoops_optionsArray id=groupid[] from=$groupArr value=groupid label=name default=1}>
           <{/if}>
         </select>
       </td>
Index: xoops2jp/html/modules/legacy/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_edit.html	Sun Nov 12 14:12:24 2006
@@ -33,7 +33,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
-          <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
+          <{xoops_optionsArray id=side from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
         </select>
       </td>
     </tr>
@@ -47,7 +47,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
-          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+          <{xoops_optionsArray id=bcachetime from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
         </select>
       </td>
     </tr>
@@ -55,7 +55,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_TARGET_MODULES}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
-          <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
+          <{xoops_optionsArray id=bmodule[] from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
         </select>
       </td>
     </tr>
@@ -63,7 +63,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_TARGET_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
-          <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
+          <{xoops_optionsArray id=groupid[] from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
         </select>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacy/admin/templates/image_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/image_edit.html	Sun Nov 12 14:12:24 2006
@@ -77,7 +77,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_IMGCAT_ID}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="imgcat_id">
-          <{xoops_optionsArray from=$categoryArr value=imgcat_id label=imgcat_name default=$actionForm->get('imgcat_id')}>
+          <{xoops_optionsArray id=imgcat_id from=$categoryArr value=imgcat_id label=imgcat_name default=$actionForm->get('imgcat_id')}>
         </select>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html	Sun Nov 12 14:12:24 2006
@@ -33,7 +33,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
-          <{xoops_optionsArray from=$columnSideArr value=id label=name default=$actionForm->get('side')}>
+          <{xoops_optionsArray id=side from=$columnSideArr value=id label=name default=$actionForm->get('side')}>
         </select>
       </td>
     </tr>
@@ -47,7 +47,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
-          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+          <{xoops_optionsArray id=bcachetime from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
         </select>
       </td>
     </tr>
@@ -55,7 +55,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_TARGET_MODULES}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
-          <{xoops_optionsArray label=name value=mid from=$moduleArr default=$actionForm->get('bmodule')}>
+          <{xoops_optionsArray id=bmodule[] label=name value=mid from=$moduleArr default=$actionForm->get('bmodule')}>
         </select>
       </td>
     </tr>
@@ -63,7 +63,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_TARGET_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
-          <{xoops_optionsArray label=name value=groupid from=$groupArr default=$actionForm->get('groupid')}>
+          <{xoops_optionsArray id=groupid[] label=name value=groupid from=$groupArr default=$actionForm->get('groupid')}>
         </select>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.3	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html	Sun Nov 12 14:12:24 2006
@@ -47,7 +47,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_IMGCAT_READ_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='readgroups[]' multiple='multiple'>
-          <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('readgroups')}>
+          <{xoops_optionsArray id=readgroups[] from=$groupArr value=groupid label=name default=$actionForm->get('readgroups')}>
         </select>
       </td>
     </tr>
@@ -55,7 +55,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_IMGCAT_UPLOAD_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='uploadgroups[]' multiple='multiple'>
-          <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('uploadgroups')}>
+          <{xoops_optionsArray id=uploadgroups[] from=$groupArr value=groupid label=name default=$actionForm->get('uploadgroups')}>
         </select>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacy/admin/templates/block_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_list.html	Sun Nov 12 14:12:24 2006
@@ -105,7 +105,8 @@
         </td>
         <td class="legacy_list_select">
           <select name="bcachetime[<{$obj->getShow('bid')}>]">
-            <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}>
+            <{assign var="bid" value=$obj->getShow('bid') }>
+            <{xoops_optionsArray id="bcachetime[`$bid`]" from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}>
           </select>
         </td>
         <td class="legacy_list_date"><{$obj->getShow('last_modified')|xoops_formattimestamp:l}></td>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.3	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_edit.html	Sun Nov 12 14:12:24 2006
@@ -61,7 +61,7 @@
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_COM_STATUS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="com_status">
-          <{xoops_optionsArray label=name value=id from=$statusArr default=$actionForm->get('com_status')}>
+          <{xoops_optionsArray id=com_status label=name value=id from=$statusArr default=$actionForm->get('com_status')}>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:24 +0900
Subject: [xoops-cvslog 5820] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20061112051224.5A9A62AC104@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/pmlite.html
diff -u xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10 xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10.2.1
--- xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10	Wed Sep 27 13:09:06 2006
+++ xoops2jp/html/modules/pm/templates/pmlite.html	Sun Nov 12 14:12:24 2006
@@ -20,7 +20,7 @@
             <{xoops_input type=hidden name=to_userid value=$actionForm->get('to_userid')}>
           <{else}>
             <select name="to_userid">
-              <{xoops_optionsArray value=uid label=uname from=$userList default=$actionForm->get('to_userid')}>
+              <{xoops_optionsArray id=to_userid value=uid label=uname from=$userList default=$actionForm->get('to_userid')}>
             </select>
           <{/if}>
         <{else}>

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:24 +0900
Subject: [xoops-cvslog 5821] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20061112051224.8190B2AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13.2.1 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13.2.1	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Sun Nov 12 14:12:24 2006
@@ -52,7 +52,7 @@
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="cid">
-        <{xoops_optionsArray from=$bannerclientArr label=name value=cid default=$actionForm->get('cid')}>
+        <{xoops_optionsArray id=cid from=$bannerclientArr label=name value=cid default=$actionForm->get('cid')}>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Sun Nov 12 14:12:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 12 Nov 2006 14:12:24 +0900
Subject: [xoops-cvslog 5822] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061112051224.AB3972AC104@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.2 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.3
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.11.2.2	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Sun Nov 12 14:12:24 2006
@@ -33,7 +33,7 @@
     <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
       <select name="timezone_offset">
-        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
+        <{xoops_optionsArray id=timezone_offset label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
       </select>
     </td>
   </tr>
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.5 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.6
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.5	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Sun Nov 12 14:12:24 2006
@@ -51,7 +51,7 @@
     <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
       <select name="timezone_offset">
-        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
+        <{xoops_optionsArray id=timezone_offset label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
       </select>
     </td>
   </tr>

From minahito ＠ users.sourceforge.jp  Sun Nov 12 14:18:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 14:18:43 +0900
Subject: [xoops-cvslog 5823] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061112051843.7C7FD2AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.21 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.22
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.21	Sat Nov 11 18:34:44 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Sun Nov 12 14:18:43 2006
@@ -428,7 +428,7 @@
 			
 			if (!$this->_mStrategy->enableAccess()) {
 				XCube_DelegateUtils::call('Legacy.Event.Exception.ModuleSecurity', $module);
-				$this->executeRedirect(XOOPS_URL . '/',1,_NOPERM);	// TODO Depens on const message catalog.
+				$this->executeRedirect(XOOPS_URL . '/user.php', 1, _NOPERM);	// TODO Depens on const message catalog.
 				die();
 			}
 			

From minahito ＠ users.sourceforge.jp  Sun Nov 12 14:19:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 12 Nov 2006 14:19:13 +0900
Subject: [xoops-cvslog 5824] CVS update: xoops2jp/html/modules/legacy/preload
Message-ID: <20061112051913.A67A72AC104@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/IndexRedirector.class.php
diff -u xoops2jp/html/modules/legacy/preload/IndexRedirector.class.php:1.1.2.2 xoops2jp/html/modules/legacy/preload/IndexRedirector.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/preload/IndexRedirector.class.php:1.1.2.2	Sun Oct 15 01:42:26 2006
+++ xoops2jp/html/modules/legacy/preload/IndexRedirector.class.php	Sun Nov 12 14:19:13 2006
@@ -18,7 +18,7 @@
 		if ($startPage != null && $startPage != "--") {
 			$handler =& xoops_gethandler('module');
 			$module =& $handler->get($startPage);
-			if (is_object($module)) {
+			if (is_object($module) && $module->get('isactive')) {
 				$this->mController->executeForward(XOOPS_URL . '/modules/' . $module->getShow('dirname') . '/');
 			}
 		}

From nobunobu ＠ users.sourceforge.jp  Mon Nov 13 15:11:19 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 13 Nov 2006 15:11:19 +0900
Subject: [xoops-cvslog 5825] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061113061119.42D012AC086@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_waiting.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_waiting.php:1.1.2.1 xoops2jp/html/modules/legacy/blocks/legacy_waiting.php:1.1.2.2
--- xoops2jp/html/modules/legacy/blocks/legacy_waiting.php:1.1.2.1	Sat Oct 14 23:55:26 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_waiting.php	Mon Nov 13 15:11:19 2006
@@ -1,7 +1,7 @@
 <?php
 function b_legacy_waiting_show() {
     $modules = array();
-    XCube_DelegateUtils::call('Legacyblock.Wating.Show', new XCube_Ref(&$modules));
+    XCube_DelegateUtils::call('Legacyblock.Wating.Show', new XCube_Ref($modules));
     $block['modules'] = $modules;
     return $block;
 }

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:20:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:20:08 +0900
Subject: [xoops-cvslog 5826] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061113102008.96DC92AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_mainmenu.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_mainmenu.php:1.1.2.1 xoops2jp/html/modules/legacy/blocks/legacy_mainmenu.php:1.1.2.2
--- xoops2jp/html/modules/legacy/blocks/legacy_mainmenu.php:1.1.2.1	Sat Oct 14 23:55:26 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_mainmenu.php	Mon Nov 13 19:20:08 2006
@@ -5,6 +5,7 @@
     $xoopsUser =& $root->mController->mRoot->mContext->mXoopsUser;
     
     $block = array();
+	$block['_display_'] = true;
 
     $module_handler =& xoops_gethandler('module');
     $criteria = new CriteriaCompo(new Criteria('hasmain', 1));

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:41:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:41:27 +0900
Subject: [xoops-cvslog 5827] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061113104127.1B5A22AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/NotifyListAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/NotifyListAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/NotifyListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/NotifyListAction.class.php:1.1.2.2	Sun Oct 15 00:43:08 2006
+++ xoops2jp/html/modules/legacy/actions/NotifyListAction.class.php	Mon Nov 13 19:41:26 2006
@@ -49,12 +49,17 @@
 		$prev_item = -1;
 		foreach ($notificationArr as $notify) {
 			$t_modid = $notify->get('not_modid');
+			
+			$module =& $moduleHandler->get($t_modid);
+			if (!is_object($module)) {
+				continue;
+			}
+			
 			if ($t_modid != $prev_modid) {
 				$prev_modid = $t_modid;
 				$prev_category = -1;
 				$prev_item = -1;
 				
-				$module =& $moduleHandler->get($t_modid);
 				$this->mModules[$t_modid] = array (
 					'id' => $t_modid,
 					'name' => $module->getShow('name'),

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:41:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:41:33 +0900
Subject: [xoops-cvslog 5828] CVS update: xoops2jp/html/include
Message-ID: <20061113104133.3F3AA2AC03B@users.sourceforge.jp>

Index: xoops2jp/html/include/notification_functions.php
diff -u xoops2jp/html/include/notification_functions.php:1.2.8.3 xoops2jp/html/include/notification_functions.php:1.2.8.3.2.1
--- xoops2jp/html/include/notification_functions.php:1.2.8.3	Wed Jul 26 19:51:37 2006
+++ xoops2jp/html/include/notification_functions.php	Mon Nov 13 19:41:33 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification_functions.php,v 1.2.8.3 2006/07/26 10:51:37 minahito Exp $
+// $Id: notification_functions.php,v 1.2.8.3.2.1 2006/11/13 10:41:33 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -92,6 +92,12 @@
 		$module_handler =& xoops_gethandler('module');
 		$module =& $module_handler->get($module_id);
 	}
+	
+	if (!is_object($module)) {
+		$ret = false;
+		return $ret;
+	}
+	
 	$not_config =& $module->getInfo('notification');
 	if ($category_name == null) {
 		return $not_config['category'];
@@ -101,7 +107,9 @@
 			return $category;
 		}
 	}
-	return false;
+	
+	$ret = false;
+	return $ret;
 }
 
 /**
@@ -158,6 +166,12 @@
 		$module_handler =& xoops_gethandler('module');
 		$module =& $module_handler->get($module_id);
 	}
+	
+	if (!is_object($module)) {
+		$ret = false;
+		return $ret;
+	}
+	
 	$not_config =& $module->getInfo('notification');
 	$config_handler =& xoops_gethandler('config');
 	$mod_config = $config_handler->getConfigsByCat(0,$module_id);
@@ -301,12 +315,16 @@
 function &notificationEventInfo ($category_name, $event_name, $module_id=null)
 {
 	$all_events =& notificationEvents ($category_name, false, $module_id);
-	foreach ($all_events as $event) {
-		if ($event['name'] == $event_name) {
-			return $event;
+	if (is_array($all_events)) {
+		foreach ($all_events as $event) {
+			if ($event['name'] == $event_name) {
+				return $event;
+			}
 		}
 	}
-	return false;
+	
+	$ret = false;
+	return $ret;
 }
 
 

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:48:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:48:30 +0900
Subject: [xoops-cvslog 5829] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113104830.70FCB2AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.7 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.7	Sun Nov 12 02:50:37 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Mon Nov 13 19:48:30 2006
@@ -928,6 +928,13 @@
 		
 		return $successFlag;
 	}
+	
+	function uninstallAllOfNotifications(&$module, &$log)
+	{
+		$handler =& xoops_gethandler('notification');
+		$criteria =& new Criteria('not_modid', $module->get('mid'));
+		$handler->deleteAll($criteria);
+	}
 }
 
 define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:48:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:48:37 +0900
Subject: [xoops-cvslog 5830] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113104837.1A8F62AC07C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.6	Sat Nov 11 17:37:45 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Mon Nov 13 19:48:36 2006
@@ -136,6 +136,7 @@
 	function _uninstallPreferences()
 	{
 		Legacy_ModuleInstallUtils::uninstallAllOfConfigs($this->_mXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::uninstallAllOfNotifications($this->_mXoopsModule, $this->mLog);
 	}
 
 	function _processScript()

From minahito ＠ users.sourceforge.jp  Mon Nov 13 19:53:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 19:53:44 +0900
Subject: [xoops-cvslog 5831] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113105344.C72A62AC0AF@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.7 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.7	Mon Nov 13 19:48:36 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Mon Nov 13 19:53:44 2006
@@ -136,7 +136,8 @@
 	function _uninstallPreferences()
 	{
 		Legacy_ModuleInstallUtils::uninstallAllOfConfigs($this->_mXoopsModule, $this->mLog);
-		Legacy_ModuleInstallUtils::uninstallAllOfNotifications($this->_mXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::deleteAllOfNotifications($this->_mXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::deleteAllOfComments($this->_mXoopsModule, $this->mLog);
 	}
 
 	function _processScript()
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.8 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.8	Mon Nov 13 19:48:30 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Mon Nov 13 19:53:44 2006
@@ -929,12 +929,19 @@
 		return $successFlag;
 	}
 	
-	function uninstallAllOfNotifications(&$module, &$log)
+	function deleteAllOfNotifications(&$module, &$log)
 	{
 		$handler =& xoops_gethandler('notification');
 		$criteria =& new Criteria('not_modid', $module->get('mid'));
 		$handler->deleteAll($criteria);
 	}
+
+	function deleteAllOfComments(&$module, &$log)
+	{
+		$handler =& xoops_gethandler('comment');
+		$criteria =& new Criteria('com_modid', $module->get('mid'));
+		$handler->deleteAll($criteria);
+	}
 }
 
 define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");

From minahito ＠ users.sourceforge.jp  Mon Nov 13 20:10:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 20:10:35 +0900
Subject: [xoops-cvslog 5832] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113111035.A667D2AC09D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/AbstractModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/AbstractModuleInstaller.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/class/AbstractModuleInstaller.class.php:removed
--- xoops2jp/html/modules/legacy/admin/class/AbstractModuleInstaller.class.php:1.1.2.2	Sun Oct 15 00:59:25 2006
+++ xoops2jp/html/modules/legacy/admin/class/AbstractModuleInstaller.class.php	Mon Nov 13 20:10:35 2006
@@ -1,205 +0,0 @@
-<?php
-/**
- * @version
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_LEGACY_PATH."/admin/class/ModuleUtils.class.php";
-
-/**
- * This is a abstract class for the process of install, update and uninstall.
- */
-class Legacy_AbstractModuleInstaller
-{
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mProcessScript = null;
-	
-	/**
-	 * Install or uninstall templates of this target module, this function is
-	 * called by own execute().
-	 *
-	 * @var XCube_Delegate
-	 */
-	var $mInstallTemplate = null;
-	
-	/**
-	 * Create or drop tables, this function is called by own execute().
-	 * 
-	 * @var XCube_Delegate
-	 */
-	var $mInstallTable = null;
-	
-	var $mDirname = null;
-
-	/**
-	 * XoopsModule
-	 */
-	var $mModule = null;
-
-	/**
-	 * Legacy_ModuleUtilsSimpleLog
-	 */
-	var $mLog = null;
-
-	/**
-	 * If this flag is true, never stop processing.
-	 */
-	var $mForceMode = false;
-
-	function Legacy_AbstractModuleInstaller($dirname)
-	{
-		$this->mDirname = $dirname;
-		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
-		
-		//
-		// Load message catalog for the required module installer of 'common'
-		// process.
-		//
-		$root =& XCube_Root::getSingleton();
-		if (is_object($root->mLanguageManager)) {
-			$root->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
-		}
-		
-		$this->mProcessScript =& new XCube_Delegate();
-		$this->mInstallTable =& new XCube_Delegate();
-		$this->mInstallTemplate =& new XCube_Delegate();
-	}
-	
-	/**
-	 * Start callback to required member functions with module install
-	 * framework.
-	 * 
-	 * @return bool
-	 */
-	function execute()
-	{
-		$this->mModule =& $this->loadModuleObject($this->mDirname);
-		
-		if (!is_object($this->mModule)) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->mInstallTable->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installModule();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->mInstallTemplate->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installBlock();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-		
-		$this->_installNotification();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-
-		$this->_installPreference();
-		if (!$this->mForceMode && $this->mLog->hasError()) {
-			$this->_processReport();
-			return false;
-		}
-		
-		$this->mProcessScript->call(new XCube_Ref($this->mModule), new XCube_Ref($this->mLog));
-		
-		$this->_processReport();
-		
-		return true;
-	}
-
-	/**
-	 * Load xoops module object and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
-	 */
-	function &loadModuleObject($dirname)
-	{
-	}
-
-	function _installModule()
-	{
-		$moduleHandler =& xoops_gethandler('module');
-		if (!$moduleHandler->insert($this->mModule)) {
-			$this->mLog->addError("*Could not install module information*");
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Install or uninstall blocks and their templates, this function is called by own execute().
-	 */
-	function _installBlock()
-	{
-	}
-	
-	/**
-	 * Install or uninstall notifications, this member function is called by
-	 * own execute().
-	 * 
-	 * @access protected
-	 */
-	function _installNotification()
-	{
-	}
-	
-	/**
-	 * Install or uninstall blocks and their preference, this function is called by own execute().
-	 */
-	function _installPreference()
-	{
-	}
-
-	/**
-	 * If set true, this class may never stop for error.
-	 */
-	function setForceMode($flag)
-	{
-		$this->mForceMode = $flag;
-	}
-
-	/**
-	 * This member function is called back at the last part of execute().
-	 * Report the conclusion to the log.
-	 */	
-	function _processReport()
-	{
-	}
-	
-	/**
-	 * Return log instance.
-	 */
-	function &getLog()
-	{
-		return $this->mLog;
-	}
-	
-	function hasAgree()
-	{
-		return false;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 13 20:10:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 20:10:55 +0900
Subject: [xoops-cvslog 5833] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113111055.5CD652AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:removed
--- xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php:1.1.2.6	Thu Nov  2 00:02:14 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUtils.class.php	Mon Nov 13 20:10:55 2006
@@ -1,100 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/template.php";
-
-define("MODINSTALL_LOGTYPE_REPORT", "report");
-define("MODINSTALL_LOGTYPE_WARNING", "warning");
-define("MODINSTALL_LOGTYPE_ERROR", "error");
-
-/**
- * A temporary log class.
- */
-class Legacy_ModuleUtilsSimpleLog
-{
-	var $mFetalErrorFlag = false;
-	var $mMessages = array();
-
-	function add($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_REPORT, 'message' => $msg);
-	}
-
-	function addReport($msg)
-	{
-		$this->add($msg);
-	}
-	
-	function addWarning($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_WARNING, 'message' => $msg);
-	}
-
-	function addError($msg)
-	{
-		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_ERROR, 'message' => $msg);
-		$this->mFetalErrorFlag = true;
-	}
-	
-	function hasError()
-	{
-		return $this->mFetalErrorFlag;
-	}
-}
-
-/**
- * @brief Old utility class with static methods for installation.
- * 
- * This provides static methods for the module installation. Methods of this
- * class may move to base class of installers. 
- * 
- * @deprecated see Legacy_ModuleInstallUtils
- */
-class Legacy_ModuleUtils
-{
-    /**
-     * Merge existing block XoopsBlock object and new XoopsBlock object from xoops_verion
-     * @param $oldBlock XoopsBlock
-     * @param $newBlock XoopsBlock
-     * @param $changedFlag bool
-     * @return XoopsBlock
-     * 
-     * @deprecated
-     */
-	function &mergeBlockObject(&$oldBlock, &$newBlock, &$changedFlag)
-    {
-        $blockObj =& $oldBlock->xoopsClone();
-        $blockObj->unsetNew();
-        
-		$changedFlag = false;
-		$checkValues = array('name', 'func_file', 'show_func', 'edit_func', 'template');
-		foreach($checkValues as $checkValue) {
-		    if ($newBlock->getVar($checkValue) != $oldBlock->getVar($checkValue)) {
-		        $blockObj->setVar($checkValue, $newBlock->getVar($checkValue));
-		        $changedFlag |= true;
-		    }
-		}
-
-		$old_options=explode("|",$oldBlock->getVar('options'));
-		$new_options=explode("|",$newBlock->getVar('options'));
-		if (count($new_options) > count($old_options)) {
-	        $changedFlag |= true;
-		    for ($i=count($old_options); $i<count($new_options); $i++) {
-		        $old_options[$i] = $old_options[$i];
-		    }
-		    $blockObj->setVar('options', implode("|", $old_options));
-		} else if (count($new_options) < count($old_options)) {
-	        $changedFlag |= true;
-		    $blockObj->setVar('options', $newBlock->getVar('options'));
-		}
-		
-		return $blockObj;
-    }
-
-	
-
-	
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 13 20:11:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 13 Nov 2006 20:11:35 +0900
Subject: [xoops-cvslog 5834] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061113111135.6694E2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.8 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.8	Mon Nov 13 19:53:44 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Mon Nov 13 20:11:35 2006
@@ -2,7 +2,6 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
 class Legacy_ModuleUninstaller
@@ -11,7 +10,7 @@
 	 * This instance is prepared automatically in the constructor.
 	 * 
 	 * @public
-	 * @var Legacy_ModuleUtilsSimpleLog
+	 * @var Legacy_ModuleInstallLog
 	 */
 	var $mLog = null;
 	
@@ -25,7 +24,7 @@
 	
 	function Legacy_ModuleUninstaller()
 	{
-		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
+		$this->mLog =& new Legacy_ModuleInstallLog();
 	}
 	
 	/**
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.12 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.13
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.12	Sun Nov 12 02:50:44 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Mon Nov 13 20:11:35 2006
@@ -6,7 +6,6 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
 /**
@@ -60,7 +59,7 @@
 	 * This instance is prepared automatically in the constructor.
 	 * 
 	 * @public
-	 * @var Legacy_ModuleUtilsSimpleLog
+	 * @var Legacy_ModuleInstallLog
 	 */
 	var $mLog = null;
 	
@@ -91,7 +90,7 @@
 	
 	function Legacy_ModulePhasedUpgrader()
 	{
-		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
+		$this->mLog =& new Legacy_ModuleInstallLog();
 	}
 	
 	/**
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.9 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.9	Mon Nov 13 19:53:44 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Mon Nov 13 20:11:35 2006
@@ -6,6 +6,47 @@
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
 
+require_once XOOPS_ROOT_PATH."/class/template.php";
+
+define("MODINSTALL_LOGTYPE_REPORT", "report");
+define("MODINSTALL_LOGTYPE_WARNING", "warning");
+define("MODINSTALL_LOGTYPE_ERROR", "error");
+
+/**
+ * A temporary log class.
+ */
+class Legacy_ModuleInstallLog
+{
+	var $mFetalErrorFlag = false;
+	var $mMessages = array();
+
+	function add($msg)
+	{
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_REPORT, 'message' => $msg);
+	}
+
+	function addReport($msg)
+	{
+		$this->add($msg);
+	}
+	
+	function addWarning($msg)
+	{
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_WARNING, 'message' => $msg);
+	}
+
+	function addError($msg)
+	{
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_ERROR, 'message' => $msg);
+		$this->mFetalErrorFlag = true;
+	}
+	
+	function hasError()
+	{
+		return $this->mFetalErrorFlag;
+	}
+}
+
 /**
  * This class is collection of static utility functions for module installation.
  * These functions are useful for Legacy modules' system-fixed-installer and
@@ -98,7 +139,7 @@
 	 * 
 	 * @static
 	 * @param XoopsModule $module
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @note FOR THE CUSTOM-INSTALLER
 	 */
 	function installSQLAutomatically(&$module, &$log)
@@ -205,7 +246,7 @@
 	 * 
 	 * @static
 	 * @param XoopsModule $module
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @note FOR THE CUSTOM-INSTALLER
 	 * @see Legacy_ModuleInstallUtils::uninstallAllOfModuleTemplates()
 	 */	
@@ -230,7 +271,7 @@
 	 * @static
 	 * @param XoopsModule $module
 	 * @param string[][] $template
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @return bool
 	 * 
 	 * @note This is not usefull a litte for custom-installers.
@@ -293,7 +334,7 @@
 	 * 
 	 * @static
 	 * @param XoopsModule $module
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @param bool $defaultOnly Indicates whether this function deletes templates from all of tplsets.
 	 * @note FOR THE CUSTOM-INSTALLER
 	 * @see Legacy_ModuleInstallUtils::installAllOfModuleTemplates()
@@ -337,7 +378,7 @@
 	 * 
 	 * @static
 	 * @param XoopsModule $module
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @note FOR THE CUSTOM-INSTALLER
 	 * @see Legacy_ModuleInstallUtils::uninstallAllOfBlocks()
 	 */	
@@ -365,7 +406,7 @@
 	 * 
 	 * @static
 	 * @param XoopsModule $module
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @return bool
 	 * 
 	 * @note FOR THE CUSTOM-INSTALLER
@@ -513,7 +554,7 @@
 	 * permissions for the block.
 	 * 
 	 * @param XoopsBlock $block
-	 * @param Legacy_ModuleUtilsSimpleLog $log
+	 * @param Legacy_ModuleInstallLog $log
 	 * @note FOR THE CUSTOM-INSTALLER
 	 * 
 	 * @todo error handling & delete the block's template.
@@ -1238,7 +1279,9 @@
 		
 		foreach (array_keys($blockArr) as $idx) {
 			$info =& $this->_createBlockInformation($blockArr[$idx]);
-			$collection->add($info);
+			while (!$collection->add($info)) {
+				$info->mFuncNum++;
+			}
 		}
 		
 		return $collection;
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.6 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.6	Fri Nov  3 14:47:08 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Mon Nov 13 20:11:35 2006
@@ -6,7 +6,6 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUtils.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallUtils.class.php";
 
 /**
@@ -19,7 +18,7 @@
 {
 	/**
 	 * @public
-	 * @var Legacy_ModuleUtilsSimpleLog
+	 * @var Legacy_ModuleInstallLog
 	 */
 	var $mLog = null;
 	
@@ -32,7 +31,7 @@
 	
 	function Legacy_ModuleInstaller()
 	{
-		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
+		$this->mLog =& new Legacy_ModuleInstallLog();
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Tue Nov 14 15:58:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 15:58:23 +0900
Subject: [xoops-cvslog 5835] CVS update: xoops2jp/html
Message-ID: <20061114065823.52C032AC100@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2.8.2.2.5 xoops2jp/html/mainfile.dist.php:1.2.8.2.2.6
--- xoops2jp/html/mainfile.dist.php:1.2.8.2.2.5	Sat Nov 11 10:42:48 2006
+++ xoops2jp/html/mainfile.dist.php	Tue Nov 14 15:58:23 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2.8.2.2.5 2006/11/11 01:42:48 nobunobu Exp $
+// $Id: mainfile.dist.php,v 1.2.8.2.2.6 2006/11/14 06:58:23 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -32,6 +32,11 @@
     // Physical path to your main XOOPS directory WITHOUT trailing slash
     // Example: define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
     define('XOOPS_ROOT_PATH', '');
+	
+    // XOOPS Trusted Path
+    // This is option. If you need this path, input value. The trusted path
+    // should be a safety directory which web browsers can't access directly.
+    define('XOOPS_TRUST_PATH', '');
 
     // XOOPS Virtual Path (URL)
     // Virtual path to your main XOOPS directory WITHOUT trailing slash

From tom_g3x ＠ users.sourceforge.jp  Tue Nov 14 18:52:18 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 14 Nov 2006 18:52:18 +0900
Subject: [xoops-cvslog 5836] CVS update:
	xoops2jp/html/modules/legacy/admin/templates/stylesheets
Message-ID: <20061114095218.3ED382AC077@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css
diff -u xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.7 xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.7	Tue Oct 31 08:59:08 2006
+++ xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css	Tue Nov 14 18:52:18 2006
@@ -40,6 +40,11 @@
 /*  block admin for FireFox */
 input[type="radio"] {
 	margin:2px;
+
+}
+/*  block admin for IE7 */
+*+html input[type="radio"] {
+	margin:0;
 }
 
 /* module list */

From tom_g3x ＠ users.sourceforge.jp  Tue Nov 14 18:52:47 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 14 Nov 2006 18:52:47 +0900
Subject: [xoops-cvslog 5837] CVS update: xoops2jp/docs
Message-ID: <20061114095247.086302AC0A9@users.sourceforge.jp>

Index: xoops2jp/docs/INSTALL.html
diff -u xoops2jp/docs/INSTALL.html:1.1.8.1.2.3 xoops2jp/docs/INSTALL.html:1.1.8.1.2.4
--- xoops2jp/docs/INSTALL.html:1.1.8.1.2.3	Sat Nov 11 19:33:42 2006
+++ xoops2jp/docs/INSTALL.html	Tue Nov 14 18:52:46 2006
@@ -124,7 +124,7 @@
 </p>
 
 <p>
-After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">FAQ</a> or <a href="http://www.xoopscube.org">XOOPS Cube Forums</a> for further assistance.
+After clicking next a couple of times, you will come to an informational screen showing the results of table creation. If there is a problem, please refer to the <a href="http://xoopscube.org/modules/pukiwiki/">FAQ</a> or <a href="http://www.xoopscube.org">XOOPS Cube Forums</a> for further assistance.
 </p>
 
 <p><img src="images/install011.gif" /></p>
@@ -143,7 +143,7 @@
 
 <h4>Congratulations!</h4>
 <p>
-Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://wiki.xoops.org/wakka.php?wakka=Installation">FAQ</a> or <a href="http://www.xoops.org">XOOPS Cube Forums</a> for further assistance.</p>
+Your installation should now be complete.  You can check the site out by clicking the "HERE" text on the last screen. If all went well, then your new site should be up and running. If not, please refer to the <a href="http://xoopscube.org/modules/pukiwiki/">FAQ</a> or <a href="http://www.xoops.org">XOOPS Cube Forums</a> for further assistance.</p>
 
 </div>
 </body>
Index: xoops2jp/docs/INSTALL.ja.html
diff -u xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.5 xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.6
--- xoops2jp/docs/INSTALL.ja.html:1.1.8.2.2.5	Sat Nov 11 19:33:42 2006
+++ xoops2jp/docs/INSTALL.ja.html	Tue Nov 14 18:52:46 2006
@@ -255,7 +255,7 @@
 <p>
 お疲れさまでした、これでXOOPS Cubeのインストール作業はすべて完了しました。
 <u><b>サイト</b></u>に貼られた「ここ」リンクをクリックして、インストールしたXOOPS Cubeのサイトにアクセスし、この管理者ユーザ名でログインし、洗練されたポータルサイトを構築してください。
-もし、このガイドに従ってもインストールできない場合は <a href="http://xoopscube.org/wiki/pukiwiki.php?FrontPage">XOOPS Cubeサイトにあるマニュアル・FAQ</a> で調べたり、 
+もし、このガイドに従ってもインストールできない場合は <a href="http://xoopscube.org/modules/pukiwiki/">XOOPS Cubeサイトにあるマニュアル・FAQ</a> で調べたり、 
 <a href="http://xoopscube.jp/">XOOPS Cube日本語公式サイト</a>のフォーラムで開発チームのメンバーやたくさんのXOOPS Cubeユーザーに敬意を払って質問すれば、
 きっとインストールを成功させる方法を見つけられることでしょう。
 </p>

From tom_g3x ＠ users.sourceforge.jp  Tue Nov 14 20:03:58 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 14 Nov 2006 20:03:58 +0900
Subject: [xoops-cvslog 5838] CVS update:
	xoops2jp/html/modules/legacy/language/english/help
Message-ID: <20061114110358.E62632AC0DF@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/abc_index.html
diff -u xoops2jp/html/modules/legacy/language/english/help/abc_index.html:1.1.2.8 xoops2jp/html/modules/legacy/language/english/help/abc_index.html:1.1.2.9
--- xoops2jp/html/modules/legacy/language/english/help/abc_index.html:1.1.2.8	Fri Oct 27 18:00:47 2006
+++ xoops2jp/html/modules/legacy/language/english/help/abc_index.html	Tue Nov 14 20:03:58 2006
@@ -4,7 +4,7 @@
 
 
 <h5>What is Legacy?</h5>
-<p>This system uses modules, each of which has a particular function or purpose. <b>XOOPS Cube</b> is the part of the system that hosts the base modules, those modules that make the system work! One of these is the Base module called <b>Legacy</b> which is the container for other modules, including the modules you add to your site. The basic XOOPS Cube Legacy package has only minimal resources. It is up to you to choose what functionality your site will have. You can do this easily by finding and installing modules. Not only that but you can also easily change the look and feel of your site by installing different themes. For that, you have to learn just a little bit more about Cube Legacy 2.1.</p><br clear=all />
+<p>This system uses modules, each of which has a particular function or purpose. <b>XOOPS Cube</b> is the part of the system that hosts the base modules, those modules that make the system work! One of these is the Base module called <span class="highlight_module_name">Legacy</span> which is the container for other modules, including the modules you add to your site. The basic XOOPS Cube Legacy package has only minimal resources. It is up to you to choose what functionality your site will have. You can do this easily by finding and installing modules. Not only that but you can also easily change the look and feel of your site by installing different themes. For that, you have to learn just a little bit more about Cube Legacy 2.1.</p><br clear=all />
 
 <h5>Getting Started</h5>
 
Index: xoops2jp/html/modules/legacy/language/english/help/abc_4th.html
diff -u xoops2jp/html/modules/legacy/language/english/help/abc_4th.html:1.1.2.6 xoops2jp/html/modules/legacy/language/english/help/abc_4th.html:1.1.2.7
--- xoops2jp/html/modules/legacy/language/english/help/abc_4th.html:1.1.2.6	Fri Oct 27 18:02:22 2006
+++ xoops2jp/html/modules/legacy/language/english/help/abc_4th.html	Tue Nov 14 20:03:58 2006
@@ -15,14 +15,14 @@
 
 <p><img src="<{'abc_4th_groupmanagement_permission.png'|helpimage}>" /></p>
 
-<p>In the next screen, look at the top section, "System/module permissions". Here, each module is listed and for each you are offered two choices, "access" and "admin". In a large site, it is sometimes a good idea to have a trusted colleague take on some of the administration tasks for some modules. By selecting the "admin" checkbox, you can easily allow any group to have administration permissions for any module. Right now, though, we simply want the anonymous users to be able to have "access" to the "news" and "forum" modules. Select the "access" checkbox for both of these modules, then click <button>Submit</button></p>
+<p>In the next screen, look at the top section, "System/module permissions". Here, each module is listed and for each you are offered two choices, "access" and "admin". In a large site, it is sometimes a good idea to have a trusted colleague take on some of the administration tasks for some modules. By selecting the "admin" checkbox, you can easily allow any group to have administration permissions for any module. Right now, though, we simply want the anonymous users to be able to have "access" to the <span class ="highlight_module_name">"news"</span> and <span class ="highlight_module_name">"forum"</span> modules. Select the "access" checkbox for both of these modules, then click <button>Submit</button></p>
 
 <p><img src="<{'abc_4th_groupperm_news_forum.png'|helpimage}>" /></p>
 
 <p>Let's confirm the result. Click "logout" to go back to the homepage as an Anonymous user. You will now be able to see the display you wanted.</p>
 
 <h5>Step Four (2) --- Create a new user</h5>
-<p>You also need to check what registered users can see on your site. For that, you need to create a new user as a test account. Login as administrator and go to the Admin side and the Control Panel. In the User Module control menu, click <em>User Management</em>. Next, click on "Add a new user".</p>
+<p>You also need to check what registered users can see on your site. For that, you need to create a new user as a test account. Login as administrator and go to the Admin side and the Control Panel. In the <span class ="highlight_module_name">User Module</span> control menu, click <em>User Management</em>. Next, click on "Add a new user".</p>
 
 <p><img src="<{'abc_4th_clickaddnewuser.png'|helpimage}>" /></p>
 
Index: xoops2jp/html/modules/legacy/language/english/help/abc_1st.html
diff -u xoops2jp/html/modules/legacy/language/english/help/abc_1st.html:1.1.2.8 xoops2jp/html/modules/legacy/language/english/help/abc_1st.html:1.1.2.9
--- xoops2jp/html/modules/legacy/language/english/help/abc_1st.html:1.1.2.8	Fri Oct 27 18:00:40 2006
+++ xoops2jp/html/modules/legacy/language/english/help/abc_1st.html	Tue Nov 14 20:03:58 2006
@@ -9,7 +9,7 @@
 <h5>The basic layout of the Control Panel</h5>
 
 <h6>Left Column - Control Menus</h6>
-<p>You use various menus to manage the site. See the left column. Each of these control menus belongs to a module. When you add a module, you will get a new control menu. This Help file is part of the Legacy System module and hence the Legacy system control menu is currently expanded while the other menus are not.</p>
+<p>You use various menus to manage the site. See the left column. Each of these control menus belongs to a module. When you add a module, you will get a new control menu. This Help file is part of the <span class="highlight_module_name">Legacy System module</span> and hence the Legacy system control menu is currently expanded while the other menus are not.</p>
 <p><img src="<{'abc_1st_sidemenu.png'|helpimage}>" /></p>
 
 <p>You have already installed some modules during the installation stage, so there are some control menus in the left column. By default, the menu of the current module is expanded and menus of other modules are collapsed (hidden). Clicking the [+] icon will expand that menu but leave the main screen and other menus as they are. Clicking an item in a menu will close any other expanded menus, and take you to the item that you clicked on.</p><br clear=all />
@@ -41,7 +41,7 @@
 
 <p><img src="<{'abc_1st_defaultitle.png'|helpimage}>" /></p>
 
-<p>You can change your basic general information like a title or a slogan in <em>General Settings</em>. Go to the general settings by clicking the menu of Legacy System module.</p>
+<p>You can change your basic general information like a title or a slogan in <em>General Settings</em>. Go to the general settings by clicking the menu of <span class="highlight_module_name">Legacy System module</span>.</p>
 
 <p><img src="<{'abc_1st_clickgeneralsettings.png'|helpimage}>" /></p>
 
@@ -73,7 +73,7 @@
 <p>OK? Click on the 'Submit' button to confirm the site settings.</p>
 
 <h5>First steps for your site (2) --- User Preferences</h5>
-<p>Because XOOPS Cube Legacy aims to be a portal site, your site will be open to receive new user registrations right from the beginning. So, while you are setting things up, just in case, it is a good idea to stop user registration. To do so, you simply go to the preferences in the User module. In the left column, in the control menus, click the [+] icon by <b><em>User Module</em></b>, and click <em>Preferences.</em></p>
+<p>Because XOOPS Cube Legacy aims to be a portal site, your site will be open to receive new user registrations right from the beginning. So, while you are setting things up, just in case, it is a good idea to stop user registration. To do so, you simply go to the preferences in the User module. In the left column, in the control menus, click the [+] icon by <span class="highlight_module_name">User Module</span>, and click <em>Preferences.</em></p>
 
 <p><img src="<{'abc_1st_userpreference.png'|helpimage}>" /></p>
 
@@ -98,7 +98,7 @@
 <p><img src="<{'abc_1st_themepath_miss.png'|helpimage}>" /></p>
 
 <h6>Select your main theme</h6>
-<p>Click 'Theme Management' in the control menu of the Legacy System module.</p>
+<p>Click 'Theme Management' in the control menu of the <span class="highlight_module_name">Legacy System module</span>.</p>
 
 <p><img src="<{'abc_1st_thememanager.png'|helpimage}>" /></p>
 
Index: xoops2jp/html/modules/legacy/language/english/help/abc_3rd.html
diff -u xoops2jp/html/modules/legacy/language/english/help/abc_3rd.html:1.1.2.6 xoops2jp/html/modules/legacy/language/english/help/abc_3rd.html:1.1.2.7
--- xoops2jp/html/modules/legacy/language/english/help/abc_3rd.html:1.1.2.6	Fri Oct 27 18:00:47 2006
+++ xoops2jp/html/modules/legacy/language/english/help/abc_3rd.html	Tue Nov 14 20:03:58 2006
@@ -34,7 +34,7 @@
 <p>Download the archive and unzip it. Then upload the directory you unzipped, as explained above.</p>
 
 <h6>Install module</h6>
-<p>Click "Module Installation" in the control menu of the Legacy System module in the left block of the control panel.</p>
+<p>Click "Module Installation" in the control menu of the <span class="highlight_module_name">Legacy System module</span> in the left block of the control panel.</p>
 
 <p><img src="<{'abc_3rd_clickmoduleinstallation.png'|helpimage}>" /></p>
 
@@ -42,16 +42,16 @@
 
 <p><img src="<{'abc_3rd_moduleinstallation.png'|helpimage}>" /></p>
 
-<p>Find the row with the forum module (newbb) and click the install-icon on that row.</p>
+<p>Find the row with the <span class ="highlight_module_name">forum module</span> (newbb) and click the install-icon on that row.</p>
 
 <p><img src="<{'abc_3rd_clickinstallation.png'|helpimage}>" /></p>
 
-<p>You will now see a confirmation screen. Confirm that the module you want to install is newbb, then click "submit". Your screen will display a list of events related to tables being made in your system database. Once installed, you will see a new control menu for this module in the left hand column of the Control Panel.</p>
+<p>You will now see a confirmation screen. Confirm that the module you want to install is <span class ="highlight_module_name">newbb</span>, then click "submit". Your screen will display a list of events related to tables being made in your system database. Once installed, you will see a new control menu for this module in the left hand column of the Control Panel.</p>
 
 <p><img src="<{'abc_3rd_moduleinstallation_confirm.png'|helpimage}>" /></p>
 
 <h6>newbb settings</h6>
-<p>Go to your homepage to confirm that newbb is now installed. You should see the link in the Main Menu. The module has indeed been installed and now all you have to do is change the settings. Most modules need additonal settings before they can be used effectively. Most modules also have a help file with them and that is the best place to start. (Sorry but newbb doesn't have any documents...)</p>
+<p>Go to your homepage to confirm that <span class ="highlight_module_name">newbb</span> is now installed. You should see the link in the Main Menu. The module has indeed been installed and now all you have to do is change the settings. Most modules need additonal settings before they can be used effectively. Most modules also have a help file with them and that is the best place to start. (Sorry but newbb doesn't have any documents...)</p>
 
 <p>Head over back to the Control Panel (Admin side) and expand the Forum control menu by clicking the [+] icon. Now click <em>Add Category</em>.</p>
 
@@ -72,12 +72,12 @@
 <p>Newbb is now ready to talk baseball! Go to your homepage and have a look.</p>
 
 <h5>Step Three (3) --- Install a news module</h5>
-<p>The other plan for your site is a news module. The administrator posts important information in the news module; site news, news on players from Oregon and other items.</p>
+<p>The other plan for your site is a news module. The administrator posts important information in the <span class ="highlight_module_name">news module</span>; site news, news on players from Oregon and other items.</p>
 
-<p>There areof course a lot of different news modules as well as forum modules. For this exercise, for the same reasons we chose newbb, we have chosen to use the "news" module. "News" was the standard news module of XOOPS2. Again it is now old and perhaps not so good anymore, but it's easy to install and explain.</p>
+<p>There areof course a lot of different <span class ="highlight_module_name">news modules</span> as well as forum modules. For this exercise, for the same reasons we chose newbb, we have chosen to use the <span class ="highlight_module_name">"news" module</span>. "News" was the standard news module of XOOPS2. Again it is now old and perhaps not so good anymore, but it's easy to install and explain.</p>
 
 <h6>News settings</h6>
-<p>Find a copy of the "News" module. Download and decompress it, and then upload it to your XOOPS Cube Legacy installation. install it in the same way you installed "NewBB" above. Now you need to look at the settings for "News" as you did for newbb. Let's have a look.</p>
+<p>Find a copy of the <span class ="highlight_module_name">"News" module</span>. Download and decompress it, and then upload it to your XOOPS Cube Legacy installation. install it in the same way you installed <span class ="highlight_module_name">"NewBB"</span> above. Now you need to look at the settings for <span class ="highlight_module_name">"News"</span> as you did for <span class ="highlight_module_name">newbb</span>. Let's have a look.</p>
 
 <p>Again, go to the Admin side's control panel and expand the control menu for your "News" module. Click <em>Topic Manager</em>.</p>
 
@@ -87,7 +87,7 @@
 
 <p><img src="<{'abc_3rd_topicmanager.png'|helpimage}>" /></p>
 
-<p>Now let's delete the example topic called "XOOPS", which was created by the news module by default. In <em>Topic Manager</em>, choose "XOOPS" then click <button>Modify</button>.</p>
+<p>Now let's delete the example topic called "XOOPS", which was created by the <span class ="highlight_module_name">news module</span> by default. In <em>Topic Manager</em>, choose "XOOPS" then click <button>Modify</button>.</p>
 
 <p><img src="<{'abc_3rd_topicmanager_modify.png'|helpimage}>" /></p>
 
@@ -96,7 +96,7 @@
 <p><img src="<{'abc_3rd_topicmanager_delete.png'|helpimage}>" /></p>
 
 <h5>Step Three (4) --- How to control the order of the modules</h5>
-<p>Go to the homepage now and check the position in the main menu of the two modules you installed. You should find that the forum module is above the news module, in the main menu block.</p>
+<p>Go to the homepage now and check the position in the main menu of the two modules you installed. You should find that the forum module is above <span class ="highlight_module_name">the news module</span>, in the main menu block.</p>
 
 <p><img src="<{'abc_3rd_badmainmenublock.png'|helpimage}>" /></p>
 
@@ -108,14 +108,14 @@
 
 <p><img src="<{'abc_3rd_modulemanagement.png'|helpimage}>" /></p>
 
-<p>Give the forum module a weight of 10 and the news module a weight of 5.</p>
+<p>Give the forum module a weight of 10 and the <span class ="highlight_module_name">news module</span> a weight of 5.</p>
 
 <p><img src="<{'abc_3rd_modulemanagement_weight.png'|helpimage}>" /></p>
 
 <p>Then click <button>Update</button>. The confirmation screen is displayed. Confirm and click <button>Update</button> again.</p>
 
 <h6>TIPS: How to rename modules</h6>
-<p>The display of the main menu block isn't always what you want. "News" and "Forum" ... these names aren't very kind to visitors. You can rename them easily in the <em>Module Management</em> section. Simply type a new name under the module icon.</p>
+<p>The display of the main menu block isn't always what you want. <span class ="highlight_module_name">"News"</span> and <span class ="highlight_module_name">"Forum"</span> ... these names aren't very kind to visitors. You can rename them easily in the <em>Module Management</em> section. Simply type a new name under the module icon.</p>
 
 <p><img src="<{'abc_3rd_modulemanagement_rename.png'|helpimage}>" /></p>
 
@@ -125,7 +125,7 @@
 
 <h5>Step Three (5) --- Let's finish the top page</h5>
 <h6>Add new blocks for the forum and news</h6>
-<p>Lastly, let's add new blocks to the top page so our visitors can see the latest posts. Once again, in the Legacy System control menu, go to <em>Block Installation</em>. You will see some new blocks which were added when we installed the newbb and news modules. Most modules have one or more blocks that can be used to provide specialised content related to the module. If a module does have blocks, they are added to the available list automatically. Now, let's install the "Recent Topics" block of the newbb module.</p>
+<p>Lastly, let's add new blocks to the top page so our visitors can see the latest posts. Once again, in the Legacy System control menu, go to <em>Block Installation</em>. You will see some new blocks which were added when we installed the <span class ="highlight_module_name">newbb</span> and <span class ="highlight_module_name">news</span> modules. Most modules have one or more blocks that can be used to provide specialised content related to the module. If a module does have blocks, they are added to the available list automatically. Now, let's install the "Recent Topics" block of the <span class ="highlight_module_name">newbb module</span>.</p>
 
 <p><img src="<{'abc_3rd_newbbrecenttopics.png'|helpimage}>" /></p>
 

From minahito ＠ users.sourceforge.jp  Tue Nov 14 20:53:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 20:53:23 +0900
Subject: [xoops-cvslog 5839] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061114115323.E7F2A2AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.10 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.10	Mon Nov 13 20:11:35 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Tue Nov 14 20:53:23 2006
@@ -685,6 +685,38 @@
 		}
 	}
 	
+	function installPreferenceByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('config');
+		$config =& $handler->createConfig();
+		$config->set('conf_modid', $module->get('mid'));
+		$config->set('conf_catid', 0);
+		$config->set('conf_name', $info->mName);
+		$config->set('conf_title', $info->mTitle);
+		$config->set('conf_desc', $info->mDescription);
+		$config->set('conf_formtype', $info->mFormType);
+		$config->set('conf_valuetype', $info->mValueType);
+		$config->setConfValueForInput($info->mDefault);
+		$config->set('conf_order', $info->mOrder);
+		
+		if (count($info->mOption->mOptions) > 0) {
+			foreach (array_keys($info->mOption->mOptions) as $idx) {
+				$option =& $handler->createOption();
+				$option->set('confop_name', $info->mOption->mOptions[$idx]->mName);
+				$option->set('confop_value', $info->mOption->mOptions[$idx]->mValue);
+				$config->setConfOptions($option);
+				unset($option);
+			}
+		}
+		
+		if ($handler->insertConfig($config)) {
+			$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $config->get('conf_name')));
+		}
+		else {
+			$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $config->get('conf_name')));
+		}
+	}
+	
 	/**
 	 * Get & build config items from Manifesto by specific module object.
 	 */	
@@ -796,7 +828,7 @@
 		}
 	}
 	
-	function smartUpdateAllOfBlock(&$module, &$log)
+	function smartUpdateAllOfBlocks(&$module, &$log)
 	{
 		$dirname = $module->get('dirname');
 		
@@ -829,6 +861,85 @@
 		}
 	}
 	
+	function smartUpdateAllOfPreferences(&$module, &$log)
+	{
+		$dirname = $module->get('dirname');
+		
+		$fileReader =& new Legacy_ModinfoX2FileReader($dirname);
+		$latestPreferences =& $fileReader->loadPreferenceInformations();
+		
+		$dbReader =& new Legacy_ModinfoX2DBReader($dirname);
+		$currentPreferences =& $dbReader->loadPreferenceInformations();
+		
+		$currentPreferences->update($latestPreferences);
+
+		//
+		// Preferences
+		//
+		foreach (array_keys($currentPreferences->mPreferences) as $idx) {
+			switch ($currentPreferences->mPreferences[$idx]->mStatus) {
+				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+					break;
+				
+				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updatePreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mPreferences[$idx]->mOrder, $module, $log);
+					break;
+			}
+		}
+		
+		//
+		// Comments
+		//
+		foreach (array_keys($currentPreferences->mComments) as $idx) {
+			switch ($currentPreferences->mComments[$idx]->mStatus) {
+				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+					break;
+				
+				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updateCommentByInfo($currentPreferences->mComments[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mComments[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mComments[$idx]->mOrder, $module, $log);
+					break;
+			}
+		}
+		
+		//
+		// Notifications
+		//
+		foreach (array_keys($currentPreferences->mNotifications) as $idx) {
+			switch ($currentPreferences->mNotifications[$idx]->mStatus) {
+				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+					break;
+				
+				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updateCommentByInfo($currentPreferences->mNotifications[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mNotifications[$idx], $module, $log);
+					break;
+					
+				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mNotifications[$idx]->mOrder, $module, $log);
+					break;
+			}
+		}
+	}
+	
 	function updateBlockTemplateByInfo(&$info, &$module, &$log)
 	{
 		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
@@ -873,6 +984,83 @@
 		}
 	}
 	
+	function updatePreferenceByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('config');
+
+		$criteria =& new CriteriaCompo();		
+		$criteria->add(new Criteria('conf_modid', $module->get('mid')));
+		$criteria->add(new Criteria('conf_catid', 0));
+		$criteria->add(new Criteria('conf_order', $info->mOrder));
+		
+		$configArr =& $handler->getConfigs($criteria);
+		
+		if (count($configArr) == 0) {
+			$log->addError('Execption Error: Could not find config.');
+		}
+		
+		$config =& $configArr[0];
+		
+		$config->set('conf_name', $info->mName);
+		$config->set('conf_title', $info->mTitle);
+		$config->set('conf_desc', $info->mDescription);
+		$config->set('conf_formtype', $info->mFormType);
+		$config->set('conf_valuetype', $info->mValueType);
+		$config->setConfValueForInput($info->mDefault);
+		
+		$optionArr =& $handler->getConfigOptions(new Criteria('conf_id', $config->get('conf_id')));
+		if (is_array($optionArr)) {
+			foreach (array_keys($optionArr) as $idx) {
+				$handler->_oHandler->delete($optionArr[$idx]);
+			}
+		}
+		
+		if (count($info->mOption->mOptions) > 0) {
+			foreach (array_keys($info->mOption->mOptions) as $idx) {
+				$option =& $handler->createConfigOption();
+				$option->set('confop_name', $info->mOption->mOptions[$idx]->mName);
+				$option->set('confop_value', $info->mOption->mOptions[$idx]->mValue);
+				$option->set('conf_id', $option->get('conf_id'));
+				$config->setConfOptions($option);
+				unset($option);
+			}
+		}
+
+		if ($handler->insertConfig($config)) {
+			$log->addReport(XCube_Utils::formatMessage("Preference '{0}' is updateded.", $config->get('conf_name')));
+		}
+		else {
+			$log->addError(XCube_Utils::formatMessage("Could not update preference '{0}'.", $config->get('conf_name')));
+		}
+	}
+
+	function updateCommentByInfo(&$info, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('config');
+
+		$criteria =& new CriteriaCompo();		
+		$criteria->add(new Criteria('conf_modid', $module->get('mid')));
+		$criteria->add(new Criteria('conf_catid', 0));
+		$criteria->add(new Criteria('conf_order', $info->mOrder));
+		
+		$configArr =& $handler->getConfigs($criteria);
+		
+		if (count($configArr) == 0) {
+			$log->addError('Execption Error: Could not find config.');
+		}
+		
+		$config =& $configArr[0];
+		
+		$config->set('conf_order', $info->mOrder);
+
+		if ($handler->insertConfig($config)) {
+			$log->addReport(XCube_Utils::formatMessage("Preference '{0}' is updateded.", $config->get('conf_name')));
+		}
+		else {
+			$log->addError(XCube_Utils::formatMessage("Could not update preference '{0}'.", $config->get('conf_name')));
+		}
+	}
+	
 	function installBlockByInfo(&$info, &$module, &$log)
 	{
 		$handler =& xoops_gethandler('block');
@@ -938,6 +1126,27 @@
 		$handler->deleteAll($criteria);
 	}
 	
+	function uninstallPreferenceByOrder($order, &$module, &$log)
+	{
+		$handler =& xoops_gethandler('config');
+
+		$criteria =& new CriteriaCompo();		
+		$criteria->add(new Criteria('conf_modid', $module->get('mid')));
+		$criteria->add(new Criteria('conf_catid', 0));
+		$criteria->add(new Criteria('conf_order', $order));
+		
+		$configArr =& $handler->getConfigs($criteria);
+		
+		foreach (array_keys($configArr) as $idx) {
+			if ($handler->deleteConfig($configArr[$idx])) {
+				$log->addReport(XCube_Utils::formatMessage("Delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
+			}
+			else {
+				$log->addError(XCube_Utils::formatMessage("Could not delete preference '{0}'.", $configArr[$idx]->get('conf_name')));
+			}
+		}
+	}
+	
 	/**
 	 * Executes SQL query as cube style.
 	 */
@@ -991,7 +1200,7 @@
 define('LEGACY_BLOCKINFOMATION_STATUS_DELETED', "deleted");
 
 /**
- * The structure which is able to keep block's informations without DB. THis
+ * The structure which is able to keep block's informations without DB. This
  * is installer only.
  */
 class Legacy_BlockInformation
@@ -1122,6 +1331,294 @@
 	}
 }
 
+/**
+ * The structure which is able to keep preference's informations without DB.
+ * This is installer only.
+ */
+class Legacy_PreferenceInformation
+{
+	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	
+	var $mOrder = 0;
+	
+	var $mName = "";
+	
+	var $mTitle = "";
+	
+	var $mDescription = "";
+	
+	var $mFormType = "";
+	
+	var $mValueType = "";
+	
+	var $mDefault = null;
+	
+	var $mOption = null;
+	
+	function Legacy_PreferenceInformation($order, $name, $title, $description, $formType, $valueType, $default)
+	{
+		$this->mOrder = intval($order);
+		$this->mName = $name;
+		$this->mTitle = $title;
+		$this->mDescription = $description;
+		$this->mFormType = $formType;
+		$this->mValueType = $valueType;
+		$this->mDefault = $default;
+		
+		$this->mOption =& new Legacy_PreferenceOptionInfoCollection();
+	}
+	
+	/**
+	 * @return bool
+	 */
+	function isEqual(&$preference)
+	{
+		if ($this->mOrder != $preference->mOrder) {
+			return false;
+		}
+		
+		if ($this->mName != $preference->mName) {
+			return false;
+		}
+		
+		if ($this->mTitle != $preference->mTitle) {
+			return false;
+		}
+		
+		if ($this->mDescription != $preference->mDescription) {
+			return false;
+		}
+		
+		if ($this->mFormType != $preference->mFormType) {
+			return false;
+		}
+		
+		if ($this->mValueType != $preference->mValueType) {
+			return false;
+		}
+		
+		if (!$this->mOption->isEqual($preference->mOption)) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	function update(&$preference)
+	{
+		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		
+		$this->mName = $preference->mName;
+		$this->mTitle = $preference->mTitle;
+		$this->mDescription = $preference->mDescription;
+		$this->mFormType = $preference->mFormType;
+		$this->mValueType = $preference->mValueType;
+		$this->mDefault = $preference->mDefault;
+		
+		unset($this->mOption);
+		$this->mOption =& $preference->mOption;
+	}
+}
+
+class Legacy_PreferenceInfoCollection
+{
+	var $mPreferences = array();
+	
+	var $mComments = array();
+	
+	var $mNotifications = array();
+	
+	function Legacy_PreferenceInfoCollection()
+	{
+	}
+	
+	function add(&$preference)
+	{
+		if ($preference->mName == 'com_rule' || $preference->mName == 'com_anonpost') {
+			$this->mComments[$preference->mOrder] =& $preference;
+			$this->_sort();
+			return true;
+		}
+		
+		if ($preference->mName == 'notification_enabled' || $preference->mName == 'notification_events') {
+			$this->mNotifications[$preference->mOrder] =& $preference;
+			$this->_sort();
+			return true;
+		}
+		
+		if (isset($this->mPreferences[$preference->mOrder])) {
+			return false;
+		}
+		
+		$this->mPreferences[$preference->mOrder] =& $preference;
+		$this->_sort();
+		
+		return true;
+	}
+	
+	function _sort()
+	{
+		$maxOrder = 0;
+		foreach (array_keys($this->mPreferences) as $idx) {
+			if ($this->mPreferences[$idx]->mOrder > $maxOrder) {
+				$maxOrder = $this->mPreferences[$idx]->mOrder;
+			}
+		}
+		
+		$maxOrder++;
+
+		$t_comments = array();
+		foreach (array_keys($this->mComments) as $idx) {
+			if ($this->mComments[$idx]->mOrder != $maxOrder) {
+				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+				$this->mComments[$idx]->mOrder = $maxOrder;
+			}
+			$t_comments[$maxOrder++] =& $this->mComments[$idx];
+		}
+		
+		unset($this->mComments);
+		$this->mComments =& $t_comments;
+		
+		//
+		// Sort notifications
+		//
+		$t_notifications = array();
+		foreach (array_keys($this->mNotifications) as $idx) {
+			if ($this->mNotifications[$idx]->mOrder != $maxOrder) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+				$this->mNotifications[$idx]->mOrder = $maxOrder;
+			}
+			$t_notifications[$maxOrder++] =& $this->mNotifications[$idx];
+		}
+		
+		unset($this->mNotifications);
+		$this->mNotifications =& $t_notifications;
+	}
+	
+	function &get($order)
+	{
+		$ret = null;
+		
+		if (isset($this->mPreferences[$order])) {
+			return $this->mPreferences[$order];
+		}
+		
+		return $ret;
+	}
+	
+	/**
+	 * Updates the list of blocks by comparing with $collection.
+	 * @todo need delete comments' data
+	 * @todo need delete notifications' data
+	 */
+	function update(&$collection)
+	{
+		//
+		// Preferences
+		//
+		foreach (array_keys($this->mPreferences) as $idx) {
+			$t_preference =& $collection->get($this->mPreferences[$idx]->mOrder);
+			if ($t_preference == null) {
+				$this->mPreferences[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+			elseif (!$this->mPreferences[$idx]->isEqual($t_preference)) {
+				$this->mPreferences[$idx]->update($t_preference);
+			}
+		}
+		
+		foreach (array_keys($collection->mPreferences) as $idx) {
+			$order = $collection->mPreferences[$idx]->mOrder;
+			if (!isset($this->mPreferences[$order])) {
+				$this->add($collection->mPreferences[$idx]);
+				$this->mPreferences[$order]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+		
+		//
+		// Comments
+		//
+		if (count($this->mComments) > 0 && count($collection->mComments) == 0) {
+			foreach (array_keys($this->mComments) as $idx) {
+				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+		}
+		elseif (count($this->mComments) == 0 && count($collection->mComments) > 0) {
+			$this->mComments =& $collection->mComments;
+		}
+		
+		//
+		// Notifications
+		//
+		if (count($this->mNotifications) > 0 && count($collection->mNotifications) == 0) {
+			foreach (array_keys($this->mNotifications) as $idx) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+		}
+		elseif (count($this->mNotifications) == 0 && count($collection->mNotifications) > 0) {
+			$this->mNotifications =& $collection->mNotifications;
+		}
+	}
+	
+	function reset()
+	{
+		unset($this->mPreferences);
+		$this->mPreferences = array();
+	}
+}
+
+class Legacy_PreferenceOptionInformation
+{
+	var $mName = "";
+	var $mValue = "";
+	
+	function Legacy_PreferenceOptionInformation($name, $value)
+	{
+		$this->mName = $name;
+		$this->mValue = $value;
+	}
+	
+	function isEqual($option)
+	{
+		return (($this->mName == $option->mName) && ($this->mValue == $option->mValue));
+	}
+}
+
+class Legacy_PreferenceOptionInfoCollection
+{
+	var $mOptions = array();
+	
+	function Legacy_PreferenceOptionInfoCollection()
+	{
+	}
+	
+	function add(&$option)
+	{
+		$this->mOptions[] =& $option;
+		return true;
+	}
+	
+	function isEqual(&$collection)
+	{
+		if (count($this->mOptions) != count($collection->mOptions)) {
+			return false;
+		}
+		
+		foreach (array_keys($this->mOptions) as $idx) {
+			if (!$this->mOptions[$idx]->isEqual($collection->mOptions[$idx])) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	function reset()
+	{
+		unset($this->mOptions);
+		$this->mOptions = array();
+	}
+}
+
 class Legacy_AbstractModinfoReader
 {
 	function Legacy_AbstractModinfoReader()
@@ -1134,6 +1631,13 @@
 	function &loadBlockInformations()
 	{
 	}
+
+	/**
+	 * @return Legacy_PreferenceInfoCollection
+	 */	
+	function &loadPreferenceInformations()
+	{
+	}
 }
 
 /**
@@ -1249,6 +1753,76 @@
 		
 		return $collection;
 	}
+
+	function &_createPreferenceInformation($order, $arr)
+	{
+		$arr['description'] = isset($arr['description']) ? $arr['description'] : null;
+		$info =& new Legacy_PreferenceInformation($order, $arr['name'], $arr['title'], $arr['description'], $arr['formtype'], $arr['valuetype'], $arr['default']);
+		if (isset($arr['options'])) {
+			foreach ($arr['options'] as $name => $value) {
+				$option =& new Legacy_PreferenceOptionInformation($name, $value);
+				$info->mOption->add($option);
+			}
+		}
+		
+		return $info;
+	}
+	
+	/**
+	 * @todo Need guarantee of global variables.
+	 */
+	function &loadPreferenceInformations()
+	{
+		$collection =& new Legacy_PreferenceInfoCollection();
+		
+		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
+		if (!file_exists($t_filePath)) {
+			return $collection;
+		}
+		
+		include $t_filePath;
+		
+		if (!isset($modversion['config'])) {
+			return $collection;
+		}
+		
+		$preferenceArr = $modversion['config'];
+		
+		//
+		// Try (1) --- index pattern
+		//
+		
+		$successFlag = true;
+		foreach ($preferenceArr as $idx => $preference) {
+			if (is_int($idx)) {
+				$info =& $this->_createPreferenceInformation($idx, $preference);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if ($successFlag) {
+			return $collection;
+		}
+		
+		//
+		// Try (2) --- automatic
+		//
+		$collection->reset();
+		
+		$idx = 1;
+		foreach ($preferenceArr as $preference) {
+			$info =& $this->_createPreferenceInformation($idx++, $preference);
+			$successFlag &= $collection->add($info);
+			unset($info);
+		}
+		
+		return $collection;
+	}
 }
 
 class Legacy_ModinfoX2DBReader extends Legacy_AbstractModinfoReader
@@ -1286,6 +1860,41 @@
 		
 		return $collection;
 	}
+	
+	function &_createPreferenceInformation(&$config)
+	{
+		$info =& new Legacy_PreferenceInformation($config->get('conf_order'), $config->get('conf_name'), $config->get('conf_title'), $config->get('conf_desc'), $config->get('conf_formtype'), $config->get('conf_valuetype'), $config->get('conf_value'));
+		
+		$configOptionArr =& $config->getOptionItems();
+		
+		foreach (array_keys($configOptionArr) as $idx) {
+			$option =& new Legacy_PreferenceOptionInformation($configOptionArr[$idx]->get('confop_name'), $configOptionArr[$idx]->get('confop_value'));
+			$info->mOption->add($option);
+			unset($option);
+		}
+		
+		return $info;
+	}
+	
+	function &loadPreferenceInformations()
+	{
+		$collection =& new Legacy_PreferenceInfoCollection();
+
+		$handler =& xoops_gethandler('module');
+		$module =& $handler->getByDirname($this->_mDirname);
+				
+		$handler =& xoops_gethandler('config');
+		$configArr =& $handler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
+		
+		foreach (array_keys($configArr) as $idx) {
+			$info =& $this->_createPreferenceInformation($configArr[$idx]);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+		}
+		
+		return $collection;
+	}
 }
 
 

From minahito ＠ users.sourceforge.jp  Tue Nov 14 20:53:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 20:53:34 +0900
Subject: [xoops-cvslog 5840] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061114115334.EC36C2AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.13 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.14
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.13	Mon Nov 13 20:11:35 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Tue Nov 14 20:53:34 2006
@@ -305,7 +305,7 @@
 	 */
 	function _updateBlocks()
 	{
-		Legacy_ModuleInstallUtils::smartUpdateAllOfBlock($this->_mTargetXoopsModule, $this->mLog);
+		Legacy_ModuleInstallUtils::smartUpdateAllOfBlocks($this->_mTargetXoopsModule, $this->mLog);
 	}
 	
 	/**
@@ -316,7 +316,7 @@
 	 */
 	function _updatePreferences()
 	{
-		$this->_upgradePreferences();
+		Legacy_ModuleInstallUtils::smartUpdateAllOfPreferences($this->_mTargetXoopsModule, $this->mLog);
 	}
 	
 	/**

From minahito ＠ users.sourceforge.jp  Tue Nov 14 20:54:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 20:54:26 +0900
Subject: [xoops-cvslog 5841] CVS update: xoops2jp/html/modules/user
Message-ID: <20061114115426.B77892AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.6 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.7
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.6	Sat Nov 11 17:38:26 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Tue Nov 14 20:54:26 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.6 2006/11/11 08:38:26 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.7 2006/11/14 11:54:26 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -90,7 +90,7 @@
 $modversion['config'][]=array (
 		"name"=>"allow_register",
 		"title"=>"_MI_USER_CONF_ALLOW_REGISTER",
-		"description"=>"_MI_USER_CONF_ALLOW_REGISTER_DESC",
+		"description"=>"_MI_USER_CONF_ALW_RG_DESC",
 		"formtype"=>"yesno",
 		"valuetype"=>"int",
 		"default"=>1
@@ -182,7 +182,7 @@
 $modversion['config'][]=array (
 		"name"=>"avatar_minposts",
 		"title"=>"_MI_USER_CONF_AVATAR_MINPOSTS",
-		"description"=>"_MI_USER_CONF_AVATAR_MINPOSTS_DESC",
+		"description"=>"_MI_USER_CONF_AVT_MIN_DESC",
 		"formtype"=>"textbox",
 		"valuetype"=>"int",
 		"default"=>0
@@ -296,7 +296,7 @@
 		"valuetype"=>"string",
 		"default"=>"https://"
 	);
-	
+
 // Menu
 $modversion['hasMain'] = 0;
 $modversion['read_any'] = true;

From minahito ＠ users.sourceforge.jp  Tue Nov 14 20:54:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 20:54:26 +0900
Subject: [xoops-cvslog 5842] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20061114115426.DF9C02AC0DF@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.21.2.1 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.21.2.2
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.21.2.1	Sat Oct 14 20:25:42 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Tue Nov 14 20:54:26 2006
@@ -22,11 +22,11 @@
 define('_MI_USER_CONF_ACTV_TYPE', "新規登録ユーザアカウントの有効化の方法");
 define('_MI_USER_CONF_ACTV_USER', "ユーザ自身の確認が必要(推奨)");
 define('_MI_USER_CONF_ALLOW_REGISTER', "新規ユーザの登録を許可する");
-define('_MI_USER_CONF_ALLOW_REGISTER_DESC', "「はい」を選択すると新規ユーザの登録を許可します。");
+define('_MI_USER_CONF_ALW_RG_DESC', "「はい」を選択すると新規ユーザの登録を許可します。");
 define('_MI_USER_CONF_AVATAR_HEIGHT', "アバター画像の最大高さ(ピクセル)");
 define('_MI_USER_CONF_AVATAR_MAXSIZE', "アバター画像の最大ファイルサイズ(バイト)");
 define('_MI_USER_CONF_AVATAR_MINPOSTS', "アバターアップロード権を得るための発言数");
-define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "ユーザが自分で作成したアバターをアップロードするために必要な最低投稿数を設定してください。");
+define('_MI_USER_CONF_AVT_MIN_DESC', "ユーザが自分で作成したアバターをアップロードするために必要な最低投稿数を設定してください。");
 define('_MI_USER_CONF_AVATAR_WIDTH', "アバター画像の最大幅(ピクセル)");
 define('_MI_USER_CONF_AVTR_ALLOW_UP', "アバター画像のアップロードを許可する");
 define('_MI_USER_CONF_BAD_EMAILS', "ユーザのemailアドレスとして使用できない文字列");

From minahito ＠ users.sourceforge.jp  Tue Nov 14 20:54:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 14 Nov 2006 20:54:27 +0900
Subject: [xoops-cvslog 5843] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20061114115427.0D6962AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.17.2.3 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.17.2.4
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.17.2.3	Thu Oct 26 00:27:55 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Tue Nov 14 20:54:26 2006
@@ -22,11 +22,11 @@
 define('_MI_USER_CONF_ACTV_TYPE', "Select activation type of newly registered users");
 define('_MI_USER_CONF_ACTV_USER', "Require activation by user");
 define('_MI_USER_CONF_ALLOW_REGISTER', "Allow new user registration?");
-define('_MI_USER_CONF_ALLOW_REGISTER_DESC', "Select yes to accept new user registration.");
+define('_MI_USER_CONF_ALW_RG_DESC', "Select yes to accept new user registration.");
 define('_MI_USER_CONF_AVATAR_HEIGHT', "Avatar image max height (pixel)");
 define('_MI_USER_CONF_AVATAR_MAXSIZE', "Avatar image max filesize (byte)");
 define('_MI_USER_CONF_AVATAR_MINPOSTS', "Minimum posts required");
-define('_MI_USER_CONF_AVATAR_MINPOSTS_DESC', "Enter the minimum number of posts required to upload a custom avatar.");
+define('_MI_USER_CONF_AVT_MIN_DESC', "Enter the minimum number of posts required to upload a custom avatar.");
 define('_MI_USER_CONF_AVATAR_WIDTH', "Avatar image max width (pixel)");
 define('_MI_USER_CONF_AVTR_ALLOW_UP', "Allow custom avatar upload?");
 define('_MI_USER_CONF_BAD_EMAILS', "Enter emails that should not be used in user profile");

From minahito ＠ users.sourceforge.jp  Wed Nov 15 00:38:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 00:38:56 +0900
Subject: [xoops-cvslog 5844] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061114153856.B96C72AC114@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php
diff -u /dev/null xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.1
--- /dev/null	Wed Nov 15 00:38:56 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Wed Nov 15 00:38:56 2006
@@ -0,0 +1,833 @@
+<?php
+/**
+ * @package Legacy
+ * @brief This file declare some structure-class and stored-system readers for the installer.
+ * @version $Id$
+ */
+
+define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");
+define('LEGACY_BLOCKINFOMATION_STATUS_UPDATED', "updated");
+define('LEGACY_BLOCKINFOMATION_STATUS_NEW', "new");
+define('LEGACY_BLOCKINFOMATION_STATUS_DELETED', "deleted");
+
+/**
+ * The structure which is able to keep block's informations without DB. This
+ * is installer only.
+ */
+class Legacy_BlockInformation
+{
+	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	
+	var $mFuncNum = 0;
+	
+	var $mName = "";
+	
+	var $mOptions = "";
+	
+	var $mFuncFile = "";
+	var $mShowFunc = "";
+	var $mEditFunc = "";
+	var $mTemplate = "";
+	
+	function Legacy_BlockInformation($funcNum, $name, $funcFile, $showFunc, $editFunc, $template, $options = null)
+	{
+		$this->mFuncNum = intval($funcNum);
+		$this->mName = $name;
+		$this->mFuncFile = $funcFile;
+		$this->mShowFunc = $showFunc;
+		$this->mEditFunc = $editFunc;
+		$this->mTemplate = $template;
+		$this->mOptions = $options;
+	}
+	
+	/**
+	 * @return bool
+	 */
+	function isEqual(&$block)
+	{
+		if ($this->mFuncNum != $block->mFuncNum) {
+			return false;
+		}
+		
+		if ($this->mName != $block->mName) {
+			return false;
+		}
+		
+		if ($this->mFuncFile != $block->mFuncFile) {
+			return false;
+		}
+		
+		if ($this->mShowFunc != $block->mShowFunc) {
+			return false;
+		}
+		
+		if ($this->mEditFunc != $block->mEditFunc) {
+			return false;
+		}
+		
+		if ($this->mTemplate != $block->mTemplate) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	function update(&$block)
+	{
+		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		
+		$this->mName = $block->mName;
+		$this->mFuncFile = $block->mFuncFile;
+		$this->mShowFunc = $block->mShowFunc;
+		$this->mEditFunc = $block->mEditFunc;
+		$this->mTemplate = $block->mTemplate;
+	}
+}
+
+class Legacy_BlockInfoCollection
+{
+	var $mBlocks = array();
+	
+	function add(&$info)
+	{
+		if (isset($this->mBlocks[$info->mFuncNum])) {
+			return false;
+		}
+		
+		$this->mBlocks[$info->mFuncNum] =& $info;
+		
+		ksort($this->mBlocks);
+		
+		return true;
+	}
+	
+	function &get($funcNum)
+	{
+		if (isset($this->mBlocks[$funcNum])) {
+			return $this->mBlocks[$funcNum];
+		}
+		
+		$ret = null;
+		return $ret;
+	}
+	
+	/**
+	 * Updates the list of blocks by comparing with $collection.
+	 */
+	function update(&$collection)
+	{
+		foreach (array_keys($this->mBlocks) as $idx) {
+			$t_block =& $collection->get($this->mBlocks[$idx]->mFuncNum);
+			if ($t_block == null) {
+				$this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+			elseif (!$this->mBlocks[$idx]->isEqual($t_block)) {
+				$this->mBlocks[$idx]->update($t_block);
+			}
+		}
+		
+		foreach (array_keys($collection->mBlocks) as $idx) {
+			$func_num = $collection->mBlocks[$idx]->mFuncNum;
+			if (!isset($this->mBlocks[$func_num])) {
+				$this->add($collection->mBlocks[$idx]);
+				$this->mBlocks[$func_num]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+	}
+	
+	function reset()
+	{
+		unset($this->mBlocks);
+		$this->mBlocks = array();
+	}
+}
+
+/**
+ * The structure which is able to keep preference's informations without DB.
+ * This is installer only.
+ */
+class Legacy_PreferenceInformation
+{
+	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	
+	var $mOrder = 0;
+	
+	var $mName = "";
+	
+	var $mTitle = "";
+	
+	var $mDescription = "";
+	
+	var $mFormType = "";
+	
+	var $mValueType = "";
+	
+	var $mDefault = null;
+	
+	var $mOption = null;
+	
+	function Legacy_PreferenceInformation($order, $name, $title, $description, $formType, $valueType, $default)
+	{
+		$this->mOrder = intval($order);
+		$this->mName = $name;
+		$this->mTitle = $title;
+		$this->mDescription = $description;
+		$this->mFormType = $formType;
+		$this->mValueType = $valueType;
+		$this->mDefault = $default;
+		
+		$this->mOption =& new Legacy_PreferenceOptionInfoCollection();
+	}
+	
+	/**
+	 * @return bool
+	 */
+	function isEqual(&$preference)
+	{
+		if ($this->mOrder != $preference->mOrder) {
+			return false;
+		}
+		
+		if ($this->mName != $preference->mName) {
+			return false;
+		}
+		
+		if ($this->mTitle != $preference->mTitle) {
+			return false;
+		}
+		
+		if ($this->mDescription != $preference->mDescription) {
+			return false;
+		}
+		
+		if ($this->mFormType != $preference->mFormType) {
+			return false;
+		}
+		
+		if ($this->mValueType != $preference->mValueType) {
+			return false;
+		}
+		
+		if (!$this->mOption->isEqual($preference->mOption)) {
+			return false;
+		}
+		
+		return true;
+	}
+
+	function update(&$preference)
+	{
+		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		
+		$this->mName = $preference->mName;
+		$this->mTitle = $preference->mTitle;
+		$this->mDescription = $preference->mDescription;
+		$this->mFormType = $preference->mFormType;
+		$this->mValueType = $preference->mValueType;
+		$this->mDefault = $preference->mDefault;
+		
+		unset($this->mOption);
+		$this->mOption =& $preference->mOption;
+	}
+}
+
+class Legacy_PreferenceInfoCollection
+{
+	var $mPreferences = array();
+	
+	var $mComments = array();
+	
+	var $mNotifications = array();
+	
+	function Legacy_PreferenceInfoCollection()
+	{
+	}
+	
+	function add(&$preference)
+	{
+		if ($preference->mName == 'com_rule' || $preference->mName == 'com_anonpost') {
+			if (isset($this->mComments[$preference->mOrder])) {
+				return false;
+			}
+			$this->mComments[$preference->mOrder] =& $preference;
+			$this->_sort();
+			return true;
+		}
+		
+		if ($preference->mName == 'notification_enabled' || $preference->mName == 'notification_events') {
+			if (isset($this->mNotifications[$preference->mOrder])) {
+				return false;
+			}
+			$this->mNotifications[$preference->mOrder] =& $preference;
+			$this->_sort();
+			return true;
+		}
+		
+		if (isset($this->mPreferences[$preference->mOrder])) {
+			return false;
+		}
+		
+		$this->mPreferences[$preference->mOrder] =& $preference;
+		$this->_sort();
+		
+		return true;
+	}
+	
+	function _sort()
+	{
+		$maxOrder = 0;
+		foreach (array_keys($this->mPreferences) as $idx) {
+			if ($this->mPreferences[$idx]->mOrder > $maxOrder) {
+				$maxOrder = $this->mPreferences[$idx]->mOrder;
+			}
+		}
+		
+		$maxOrder++;
+
+		$t_comments = array();
+		foreach (array_keys($this->mComments) as $idx) {
+			if ($this->mComments[$idx]->mOrder != $maxOrder) {
+				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+				$this->mComments[$idx]->mOrder = $maxOrder;
+			}
+			$t_comments[$maxOrder++] =& $this->mComments[$idx];
+		}
+		
+		unset($this->mComments);
+		$this->mComments =& $t_comments;
+		
+		//
+		// Sort notifications
+		//
+		$t_notifications = array();
+		foreach (array_keys($this->mNotifications) as $idx) {
+			if ($this->mNotifications[$idx]->mOrder != $maxOrder) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+				$this->mNotifications[$idx]->mOrder = $maxOrder;
+			}
+			$t_notifications[$maxOrder++] =& $this->mNotifications[$idx];
+		}
+		
+		unset($this->mNotifications);
+		$this->mNotifications =& $t_notifications;
+	}
+	
+	function &get($order)
+	{
+		$ret = null;
+		
+		if (isset($this->mPreferences[$order])) {
+			return $this->mPreferences[$order];
+		}
+		
+		return $ret;
+	}
+	
+	/**
+	 * Updates the list of blocks by comparing with $collection.
+	 * @todo need delete comments' data
+	 * @todo need delete notifications' data
+	 */
+	function update(&$collection)
+	{
+		//
+		// Preferences
+		//
+		foreach (array_keys($this->mPreferences) as $idx) {
+			$t_preference =& $collection->get($this->mPreferences[$idx]->mOrder);
+			if ($t_preference == null) {
+				$this->mPreferences[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+			elseif (!$this->mPreferences[$idx]->isEqual($t_preference)) {
+				$this->mPreferences[$idx]->update($t_preference);
+			}
+		}
+		
+		foreach (array_keys($collection->mPreferences) as $idx) {
+			$order = $collection->mPreferences[$idx]->mOrder;
+			if (!isset($this->mPreferences[$order])) {
+				$this->add($collection->mPreferences[$idx]);
+				$this->mPreferences[$order]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+		
+		//
+		// Comments
+		//
+		if (count($this->mComments) > 0 && count($collection->mComments) == 0) {
+			foreach (array_keys($this->mComments) as $idx) {
+				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+		}
+		elseif (count($this->mComments) == 0 && count($collection->mComments) > 0) {
+			$this->mComments =& $collection->mComments;
+			foreach (array_keys($this->mComments) as $idx) {
+				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+		
+		//
+		// Notifications
+		//
+		if (count($this->mNotifications) > 0 && count($collection->mNotifications) == 0) {
+			foreach (array_keys($this->mNotifications) as $idx) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			}
+		}
+		elseif (count($this->mNotifications) == 0 && count($collection->mNotifications) > 0) {
+			$this->mNotifications =& $collection->mNotifications;
+			foreach (array_keys($this->mNotifications) as $idx) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			}
+		}
+	}
+	
+	function reset()
+	{
+		unset($this->mPreferences);
+		$this->mPreferences = array();
+	}
+}
+
+class Legacy_PreferenceOptionInformation
+{
+	var $mName = "";
+	var $mValue = "";
+	
+	function Legacy_PreferenceOptionInformation($name, $value)
+	{
+		$this->mName = $name;
+		$this->mValue = $value;
+	}
+	
+	function isEqual($option)
+	{
+		return (($this->mName == $option->mName) && ($this->mValue == $option->mValue));
+	}
+}
+
+class Legacy_PreferenceOptionInfoCollection
+{
+	var $mOptions = array();
+	
+	function Legacy_PreferenceOptionInfoCollection()
+	{
+	}
+	
+	function add(&$option)
+	{
+		$this->mOptions[] =& $option;
+		return true;
+	}
+	
+	function isEqual(&$collection)
+	{
+		if (count($this->mOptions) != count($collection->mOptions)) {
+			return false;
+		}
+		
+		foreach (array_keys($this->mOptions) as $idx) {
+			if (!$this->mOptions[$idx]->isEqual($collection->mOptions[$idx])) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	function reset()
+	{
+		unset($this->mOptions);
+		$this->mOptions = array();
+	}
+}
+
+class Legacy_AbstractModinfoReader
+{
+	function Legacy_AbstractModinfoReader()
+	{
+	}
+
+	/**
+	 * @return Legacy_BlockInfoCollection
+	 */	
+	function &loadBlockInformations()
+	{
+	}
+
+	/**
+	 * @return Legacy_PreferenceInfoCollection
+	 */	
+	function &loadPreferenceInformations()
+	{
+	}
+}
+
+/**
+ * @note final class
+ */
+class Legacy_ModinfoX2FileReader extends Legacy_AbstractModinfoReader
+{
+	/**
+	 * @protected
+	 */
+	var $_mDirname = null;
+	
+	function Legacy_ModinfoX2FileReader($dirname)
+	{
+		$this->_mDirname = $dirname;
+	}
+	
+	/**
+	 * @private
+	 */
+	function &_createBlockInformation($funcNum, $arr)
+	{
+		$showFunc = "";
+		if (isset($arr['class'])) {
+			$showFunc = 'cl::' . $arr['class'];
+		}
+		else {
+			$showFunc = $arr['show_func'];
+		}
+		
+		$editFunc = isset($arr['edit_func']) ? $arr['edit_func'] : null;
+		$template = isset($arr['template']) ? $arr['template'] : null;
+		$options = isset($arr['options']) ? $arr['options'] : null;
+		
+		$info =& new Legacy_BlockInformation($funcNum, $arr['name'], $arr['file'], $arr['show_func'], $editFunc, $template, $options);
+		
+		return $info;
+	}
+	
+	/**
+	 * @todo Need guarantee of global variables.
+	 */
+	function &loadBlockInformations()
+	{
+		$collection =& new Legacy_BlockInfoCollection();
+		
+		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
+		if (!file_exists($t_filePath)) {
+			return $collection;
+		}
+		
+		include $t_filePath;
+		
+		if (!isset($modversion['blocks'])) {
+			return $collection;
+		}
+		
+		$blockArr = $modversion['blocks'];
+		
+		//
+		// Try (1) --- func_num
+		//
+		$successFlag = true;
+		foreach ($blockArr as $idx => $block) {
+			if (isset($block['func_num'])) {
+				$info =& $this->_createBlockInformation($block['func_num'], $block);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if ($successFlag) {
+			return $collection;
+		}
+		
+		//
+		// Try (2) --- index pattern
+		//
+		$collection->reset();
+		
+		$successFlag = true;
+		foreach ($blockArr as $idx => $block) {
+			if (is_int($idx)) {
+				$info =& $this->_createBlockInformation($idx, $block);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if ($successFlag) {
+			return $collection;
+		}
+		
+		//
+		// Try (3) --- automatic
+		//
+		$collection->reset();
+		
+		$idx = 1;
+		foreach ($blockArr as $block) {
+			$info =& $this->_createBlockInformation($idx++, $block);
+			$successFlag &= $collection->add($info);
+			unset($info);
+		}
+		
+		return $collection;
+	}
+
+	function &_createPreferenceInformation($order, $arr)
+	{
+		$arr['description'] = isset($arr['description']) ? $arr['description'] : null;
+		$info =& new Legacy_PreferenceInformation($order, $arr['name'], $arr['title'], $arr['description'], $arr['formtype'], $arr['valuetype'], $arr['default']);
+		if (isset($arr['options'])) {
+			foreach ($arr['options'] as $name => $value) {
+				$option =& new Legacy_PreferenceOptionInformation($name, $value);
+				$info->mOption->add($option);
+			}
+		}
+		
+		return $info;
+	}
+	
+	function _loadCommentPreferenceInfomations(&$modversion, &$collection)
+	{
+		if (isset($modversion['hasComments']) && $modversion['hasComments'] == true) {
+			require_once XOOPS_ROOT_PATH . "/include/comment_constants.php";
+			
+			$comRule = array('name' => 'com_rule',
+			                 'title' => '_CM_COMRULES',
+			                 'description' => '',
+			                 'formtype' => 'select',
+			                 'valuetype' => 'int',
+			                 'default' => 1,
+			                 'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
+			           );
+			$info =& $this->_createPreferenceInformation(0, $comRule);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+			unset($info);
+
+			$comAnonpost = array('name' => 'com_anonpost',
+			                     'title' => '_CM_COMANONPOST',
+			                     'description' => '',
+			                     'formtype' => 'yesno',
+			                     'valuetype' => 'int',
+			                     'default' => 0
+			               );
+			$info =& $this->_createPreferenceInformation(1, $comAnonpost);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+			unset($info);
+		}
+	}
+	
+	function _loadNotificationPreferenceInfomations(&$modversion, &$collection)
+	{
+		if (isset($modversion['hasNotification']) && $modversion['hasNotification'] == true) {
+			require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+			require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			
+			$t_options = array();
+			$t_options['_NOT_CONFIG_DISABLE'] = XOOPS_NOTIFICATION_DISABLE;
+			$t_options['_NOT_CONFIG_ENABLEBLOCK'] = XOOPS_NOTIFICATION_ENABLEBLOCK;
+			$t_options['_NOT_CONFIG_ENABLEINLINE'] = XOOPS_NOTIFICATION_ENABLEINLINE;
+			$t_options['_NOT_CONFIG_ENABLEBOTH'] = XOOPS_NOTIFICATION_ENABLEBOTH;
+			
+			$notifyEnable = array(
+				'name' => 'notification_enabled',
+				'title' => '_NOT_CONFIG_ENABLE',
+				'description' => '_NOT_CONFIG_ENABLEDSC',
+				'formtype' => 'select',
+				'valuetype' => 'int',
+				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
+				'options' => $t_options
+			);
+			$info =& $this->_createPreferenceInformation(0, $notifyEnable);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+			unset($info);
+			
+			//
+			// FIXME: doesn't work when update module... can't read back the
+			//        array of options properly...  " changing to &quot;
+			//
+			
+			unset ($t_options);
+			
+			//
+			// Get the module object to get mid.
+			//
+			$handler =& xoops_gethandler('module');
+			$module =& $handler->getByDirname($this->_mDirname);
+			
+			$t_options = array();
+			$t_categoryArr =& notificationCategoryInfo('', $module->get('mid'));
+			foreach ($t_categoryArr as $t_category) {
+				$t_eventArr =& notificationEvents($t_category['name'], false, $module->get('mid'));
+				foreach ($t_eventArr as $t_event) {
+					if (!empty($event['invisible'])) {
+						continue;
+					}
+					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
+					$t_options[$t_optionName] = $t_category['name'] . '-' . $t_event['name'];
+				}
+			}
+				
+			$notifyEvents = array(
+				'name' => 'notification_events',
+				'title' => '_NOT_CONFIG_EVENTS',
+				'description' => '_NOT_CONFIG_EVENTSDSC',
+				'formtype' => 'select_multi',
+				'valuetype' => 'array',
+				'default' => array_values($t_options),
+				'options' => $t_options
+			);
+			$info =& $this->_createPreferenceInformation(1, $notifyEvents);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+			unset($info);
+		}
+	}
+	
+	/**
+	 * @note Because XoopsModule class of X2 kernel is too complex, this method
+	 *       parses xoops_version directly.
+	 * @todo Need guarantee of global variables.
+	 */
+	function &loadPreferenceInformations()
+	{
+		$collection =& new Legacy_PreferenceInfoCollection();
+		
+		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
+		if (!file_exists($t_filePath)) {
+			return $collection;
+		}
+		
+		include $t_filePath;
+		
+		if (!isset($modversion['config'])) {
+			return $collection;
+		}
+		
+		$preferenceArr = $modversion['config'];
+		
+		//
+		// Try (1) --- index pattern
+		//
+		
+		$successFlag = true;
+		foreach ($preferenceArr as $idx => $preference) {
+			if (is_int($idx)) {
+				$info =& $this->_createPreferenceInformation($idx, $preference);
+				$successFlag &= $collection->add($info);
+				unset($info);
+			}
+			else {
+				$successFlag = false;
+				break;
+			}
+		}
+		
+		if (!$successFlag) {
+			//
+			// Try (2) --- automatic
+			//
+			$collection->reset();
+			
+			$idx = 1;
+			foreach ($preferenceArr as $preference) {
+				$info =& $this->_createPreferenceInformation($idx++, $preference);
+				$collection->add($info);
+				unset($info);
+			}
+		}
+		
+		//
+		// Add comments & notifications
+		//
+		$this->_loadCommentPreferenceInfomations($modversion, $collection);
+		$this->_loadNotificationPreferenceInfomations($modversion, $collection);
+		
+		return $collection;
+	}
+}
+
+class Legacy_ModinfoX2DBReader extends Legacy_AbstractModinfoReader
+{
+	/**
+	 * @protected
+	 */
+	var $_mDirname = null;
+	
+	function Legacy_ModinfoX2DBReader($dirname)
+	{
+		$this->_mDirname = $dirname;
+	}
+	
+	function &_createBlockInformation(&$block)
+	{
+		$info =& new Legacy_BlockInformation($block->get('func_num'), $block->get('name'), $block->get('func_file'), $block->get('show_func'), $block->get('edit_func'), $block->get('template'), $block->get('options'));
+		return $info;
+	}
+	
+	function &loadBlockInformations()
+	{
+		$collection =& new Legacy_BlockInfoCollection();
+		
+		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
+		$criteria =& new Criteria('dirname', $this->_mDirname);
+		$blockArr =& $handler->getObjects($criteria);
+		
+		foreach (array_keys($blockArr) as $idx) {
+			$info =& $this->_createBlockInformation($blockArr[$idx]);
+			while (!$collection->add($info)) {
+				$info->mFuncNum++;
+			}
+		}
+		
+		return $collection;
+	}
+	
+	function &_createPreferenceInformation(&$config)
+	{
+		$info =& new Legacy_PreferenceInformation($config->get('conf_order'), $config->get('conf_name'), $config->get('conf_title'), $config->get('conf_desc'), $config->get('conf_formtype'), $config->get('conf_valuetype'), $config->get('conf_value'));
+		
+		$configOptionArr =& $config->getOptionItems();
+		
+		foreach (array_keys($configOptionArr) as $idx) {
+			$option =& new Legacy_PreferenceOptionInformation($configOptionArr[$idx]->get('confop_name'), $configOptionArr[$idx]->get('confop_value'));
+			$info->mOption->add($option);
+			unset($option);
+		}
+		
+		return $info;
+	}
+	
+	function &loadPreferenceInformations()
+	{
+		$collection =& new Legacy_PreferenceInfoCollection();
+
+		$handler =& xoops_gethandler('module');
+		$module =& $handler->getByDirname($this->_mDirname);
+				
+		$handler =& xoops_gethandler('config');
+		$configArr =& $handler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
+		
+		foreach (array_keys($configArr) as $idx) {
+			$info =& $this->_createPreferenceInformation($configArr[$idx]);
+			while (!$collection->add($info)) {
+				$info->mOrder++;
+			}
+		}
+		
+		return $collection;
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov 15 00:39:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 00:39:30 +0900
Subject: [xoops-cvslog 5845] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061114153930.752AC2AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.11 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.12
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.11	Tue Nov 14 20:53:23 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Wed Nov 15 00:39:30 2006
@@ -2,6 +2,7 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstallInformation.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleInstaller.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUpdater.class.php";
 require_once XOOPS_LEGACY_PATH . "/admin/class/ModuleUninstaller.class.php";
@@ -662,26 +663,30 @@
 
 	function installAllOfConfigs(&$module, &$log)
 	{
-		$configInfos = Legacy_ModuleInstallUtils::getConfigInfosFromManifesto($module);
-
-		$count = 0;
-		if (is_array($configInfos)) {
-			$configHandler =& xoops_gethandler('config');
-			
-			foreach ($configInfos as $configInfo) {
-				$config =& $configHandler->createConfig();
-				
-				$config->loadFromConfigInfo($module->get('mid'), $configInfo, $count++);
-				
-				if ($configHandler->insertConfig($config)) {
-					$log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $configInfo['name']));
-				}
-				else {
-					$log->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
-				}
-				
-				unset($config);
-			}
+		$dirname = $module->get('dirname');
+		
+		$fileReader =& new Legacy_ModinfoX2FileReader($dirname);
+		$preferences =& $fileReader->loadPreferenceInformations();
+		
+		//
+		// Preferences
+		//
+		foreach (array_keys($preferences->mPreferences) as $idx) {
+			Legacy_ModuleInstallUtils::installPreferenceByInfo($preferences->mPreferences[$idx], $module, $log);
+		}
+		
+		//
+		// Comments
+		//
+		foreach (array_keys($preferences->mComments) as $idx) {
+			Legacy_ModuleInstallUtils::installPreferenceByInfo($preferences->mComments[$idx], $module, $log);
+		}
+		
+		//
+		// Notifications
+		//
+		foreach (array_keys($preferences->mNotifications) as $idx) {
+			Legacy_ModuleInstallUtils::installPreferenceByInfo($preferences->mNotifications[$idx], $module, $log);
 		}
 	}
 	
@@ -701,7 +706,7 @@
 		
 		if (count($info->mOption->mOptions) > 0) {
 			foreach (array_keys($info->mOption->mOptions) as $idx) {
-				$option =& $handler->createOption();
+				$option =& $handler->createConfigOption();
 				$option->set('confop_name', $info->mOption->mOptions[$idx]->mName);
 				$option->set('confop_value', $info->mOption->mOptions[$idx]->mValue);
 				$config->setConfOptions($option);
@@ -904,7 +909,7 @@
 					break;
 				
 				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
-					Legacy_ModuleInstallUtils::updateCommentByInfo($currentPreferences->mComments[$idx], $module, $log);
+					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mComments[$idx], $module, $log);
 					break;
 					
 				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
@@ -926,7 +931,7 @@
 					break;
 				
 				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
-					Legacy_ModuleInstallUtils::updateCommentByInfo($currentPreferences->mNotifications[$idx], $module, $log);
+					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mNotifications[$idx], $module, $log);
 					break;
 					
 				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
@@ -1034,7 +1039,7 @@
 		}
 	}
 
-	function updateCommentByInfo(&$info, &$module, &$log)
+	function updatePreferenceOrderByInfo(&$info, &$module, &$log)
 	{
 		$handler =& xoops_gethandler('config');
 
@@ -1045,7 +1050,7 @@
 		
 		$configArr =& $handler->getConfigs($criteria);
 		
-		if (count($configArr) == 0) {
+		if (count($configArr) > 0 && !is_object($configArr[0])) {
 			$log->addError('Execption Error: Could not find config.');
 		}
 		
@@ -1194,708 +1199,4 @@
 	}
 }
 
-define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");
-define('LEGACY_BLOCKINFOMATION_STATUS_UPDATED', "updated");
-define('LEGACY_BLOCKINFOMATION_STATUS_NEW', "new");
-define('LEGACY_BLOCKINFOMATION_STATUS_DELETED', "deleted");
-
-/**
- * The structure which is able to keep block's informations without DB. This
- * is installer only.
- */
-class Legacy_BlockInformation
-{
-	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
-	
-	var $mFuncNum = 0;
-	
-	var $mName = "";
-	
-	var $mOptions = "";
-	
-	var $mFuncFile = "";
-	var $mShowFunc = "";
-	var $mEditFunc = "";
-	var $mTemplate = "";
-	
-	function Legacy_BlockInformation($funcNum, $name, $funcFile, $showFunc, $editFunc, $template, $options = null)
-	{
-		$this->mFuncNum = intval($funcNum);
-		$this->mName = $name;
-		$this->mFuncFile = $funcFile;
-		$this->mShowFunc = $showFunc;
-		$this->mEditFunc = $editFunc;
-		$this->mTemplate = $template;
-		$this->mOptions = $options;
-	}
-	
-	/**
-	 * @return bool
-	 */
-	function isEqual(&$block)
-	{
-		if ($this->mFuncNum != $block->mFuncNum) {
-			return false;
-		}
-		
-		if ($this->mName != $block->mName) {
-			return false;
-		}
-		
-		if ($this->mFuncFile != $block->mFuncFile) {
-			return false;
-		}
-		
-		if ($this->mShowFunc != $block->mShowFunc) {
-			return false;
-		}
-		
-		if ($this->mEditFunc != $block->mEditFunc) {
-			return false;
-		}
-		
-		if ($this->mTemplate != $block->mTemplate) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	function update(&$block)
-	{
-		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-		
-		$this->mName = $block->mName;
-		$this->mFuncFile = $block->mFuncFile;
-		$this->mShowFunc = $block->mShowFunc;
-		$this->mEditFunc = $block->mEditFunc;
-		$this->mTemplate = $block->mTemplate;
-	}
-}
-
-class Legacy_BlockInfoCollection
-{
-	var $mBlocks = array();
-	
-	function add(&$info)
-	{
-		if (isset($this->mBlocks[$info->mFuncNum])) {
-			return false;
-		}
-		
-		$this->mBlocks[$info->mFuncNum] =& $info;
-		
-		ksort($this->mBlocks);
-		
-		return true;
-	}
-	
-	function &get($funcNum)
-	{
-		if (isset($this->mBlocks[$funcNum])) {
-			return $this->mBlocks[$funcNum];
-		}
-		
-		$ret = null;
-		return $ret;
-	}
-	
-	/**
-	 * Updates the list of blocks by comparing with $collection.
-	 */
-	function update(&$collection)
-	{
-		foreach (array_keys($this->mBlocks) as $idx) {
-			$t_block =& $collection->get($this->mBlocks[$idx]->mFuncNum);
-			if ($t_block == null) {
-				$this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
-			}
-			elseif (!$this->mBlocks[$idx]->isEqual($t_block)) {
-				$this->mBlocks[$idx]->update($t_block);
-			}
-		}
-		
-		foreach (array_keys($collection->mBlocks) as $idx) {
-			$func_num = $collection->mBlocks[$idx]->mFuncNum;
-			if (!isset($this->mBlocks[$func_num])) {
-				$this->add($collection->mBlocks[$idx]);
-				$this->mBlocks[$func_num]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
-			}
-		}
-	}
-	
-	function reset()
-	{
-		unset($this->mBlocks);
-		$this->mBlocks = array();
-	}
-}
-
-/**
- * The structure which is able to keep preference's informations without DB.
- * This is installer only.
- */
-class Legacy_PreferenceInformation
-{
-	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
-	
-	var $mOrder = 0;
-	
-	var $mName = "";
-	
-	var $mTitle = "";
-	
-	var $mDescription = "";
-	
-	var $mFormType = "";
-	
-	var $mValueType = "";
-	
-	var $mDefault = null;
-	
-	var $mOption = null;
-	
-	function Legacy_PreferenceInformation($order, $name, $title, $description, $formType, $valueType, $default)
-	{
-		$this->mOrder = intval($order);
-		$this->mName = $name;
-		$this->mTitle = $title;
-		$this->mDescription = $description;
-		$this->mFormType = $formType;
-		$this->mValueType = $valueType;
-		$this->mDefault = $default;
-		
-		$this->mOption =& new Legacy_PreferenceOptionInfoCollection();
-	}
-	
-	/**
-	 * @return bool
-	 */
-	function isEqual(&$preference)
-	{
-		if ($this->mOrder != $preference->mOrder) {
-			return false;
-		}
-		
-		if ($this->mName != $preference->mName) {
-			return false;
-		}
-		
-		if ($this->mTitle != $preference->mTitle) {
-			return false;
-		}
-		
-		if ($this->mDescription != $preference->mDescription) {
-			return false;
-		}
-		
-		if ($this->mFormType != $preference->mFormType) {
-			return false;
-		}
-		
-		if ($this->mValueType != $preference->mValueType) {
-			return false;
-		}
-		
-		if (!$this->mOption->isEqual($preference->mOption)) {
-			return false;
-		}
-		
-		return true;
-	}
-
-	function update(&$preference)
-	{
-		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-		
-		$this->mName = $preference->mName;
-		$this->mTitle = $preference->mTitle;
-		$this->mDescription = $preference->mDescription;
-		$this->mFormType = $preference->mFormType;
-		$this->mValueType = $preference->mValueType;
-		$this->mDefault = $preference->mDefault;
-		
-		unset($this->mOption);
-		$this->mOption =& $preference->mOption;
-	}
-}
-
-class Legacy_PreferenceInfoCollection
-{
-	var $mPreferences = array();
-	
-	var $mComments = array();
-	
-	var $mNotifications = array();
-	
-	function Legacy_PreferenceInfoCollection()
-	{
-	}
-	
-	function add(&$preference)
-	{
-		if ($preference->mName == 'com_rule' || $preference->mName == 'com_anonpost') {
-			$this->mComments[$preference->mOrder] =& $preference;
-			$this->_sort();
-			return true;
-		}
-		
-		if ($preference->mName == 'notification_enabled' || $preference->mName == 'notification_events') {
-			$this->mNotifications[$preference->mOrder] =& $preference;
-			$this->_sort();
-			return true;
-		}
-		
-		if (isset($this->mPreferences[$preference->mOrder])) {
-			return false;
-		}
-		
-		$this->mPreferences[$preference->mOrder] =& $preference;
-		$this->_sort();
-		
-		return true;
-	}
-	
-	function _sort()
-	{
-		$maxOrder = 0;
-		foreach (array_keys($this->mPreferences) as $idx) {
-			if ($this->mPreferences[$idx]->mOrder > $maxOrder) {
-				$maxOrder = $this->mPreferences[$idx]->mOrder;
-			}
-		}
-		
-		$maxOrder++;
-
-		$t_comments = array();
-		foreach (array_keys($this->mComments) as $idx) {
-			if ($this->mComments[$idx]->mOrder != $maxOrder) {
-				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-				$this->mComments[$idx]->mOrder = $maxOrder;
-			}
-			$t_comments[$maxOrder++] =& $this->mComments[$idx];
-		}
-		
-		unset($this->mComments);
-		$this->mComments =& $t_comments;
-		
-		//
-		// Sort notifications
-		//
-		$t_notifications = array();
-		foreach (array_keys($this->mNotifications) as $idx) {
-			if ($this->mNotifications[$idx]->mOrder != $maxOrder) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-				$this->mNotifications[$idx]->mOrder = $maxOrder;
-			}
-			$t_notifications[$maxOrder++] =& $this->mNotifications[$idx];
-		}
-		
-		unset($this->mNotifications);
-		$this->mNotifications =& $t_notifications;
-	}
-	
-	function &get($order)
-	{
-		$ret = null;
-		
-		if (isset($this->mPreferences[$order])) {
-			return $this->mPreferences[$order];
-		}
-		
-		return $ret;
-	}
-	
-	/**
-	 * Updates the list of blocks by comparing with $collection.
-	 * @todo need delete comments' data
-	 * @todo need delete notifications' data
-	 */
-	function update(&$collection)
-	{
-		//
-		// Preferences
-		//
-		foreach (array_keys($this->mPreferences) as $idx) {
-			$t_preference =& $collection->get($this->mPreferences[$idx]->mOrder);
-			if ($t_preference == null) {
-				$this->mPreferences[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
-			}
-			elseif (!$this->mPreferences[$idx]->isEqual($t_preference)) {
-				$this->mPreferences[$idx]->update($t_preference);
-			}
-		}
-		
-		foreach (array_keys($collection->mPreferences) as $idx) {
-			$order = $collection->mPreferences[$idx]->mOrder;
-			if (!isset($this->mPreferences[$order])) {
-				$this->add($collection->mPreferences[$idx]);
-				$this->mPreferences[$order]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
-			}
-		}
-		
-		//
-		// Comments
-		//
-		if (count($this->mComments) > 0 && count($collection->mComments) == 0) {
-			foreach (array_keys($this->mComments) as $idx) {
-				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
-			}
-		}
-		elseif (count($this->mComments) == 0 && count($collection->mComments) > 0) {
-			$this->mComments =& $collection->mComments;
-		}
-		
-		//
-		// Notifications
-		//
-		if (count($this->mNotifications) > 0 && count($collection->mNotifications) == 0) {
-			foreach (array_keys($this->mNotifications) as $idx) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
-			}
-		}
-		elseif (count($this->mNotifications) == 0 && count($collection->mNotifications) > 0) {
-			$this->mNotifications =& $collection->mNotifications;
-		}
-	}
-	
-	function reset()
-	{
-		unset($this->mPreferences);
-		$this->mPreferences = array();
-	}
-}
-
-class Legacy_PreferenceOptionInformation
-{
-	var $mName = "";
-	var $mValue = "";
-	
-	function Legacy_PreferenceOptionInformation($name, $value)
-	{
-		$this->mName = $name;
-		$this->mValue = $value;
-	}
-	
-	function isEqual($option)
-	{
-		return (($this->mName == $option->mName) && ($this->mValue == $option->mValue));
-	}
-}
-
-class Legacy_PreferenceOptionInfoCollection
-{
-	var $mOptions = array();
-	
-	function Legacy_PreferenceOptionInfoCollection()
-	{
-	}
-	
-	function add(&$option)
-	{
-		$this->mOptions[] =& $option;
-		return true;
-	}
-	
-	function isEqual(&$collection)
-	{
-		if (count($this->mOptions) != count($collection->mOptions)) {
-			return false;
-		}
-		
-		foreach (array_keys($this->mOptions) as $idx) {
-			if (!$this->mOptions[$idx]->isEqual($collection->mOptions[$idx])) {
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
-	function reset()
-	{
-		unset($this->mOptions);
-		$this->mOptions = array();
-	}
-}
-
-class Legacy_AbstractModinfoReader
-{
-	function Legacy_AbstractModinfoReader()
-	{
-	}
-
-	/**
-	 * @return Legacy_BlockInfoCollection
-	 */	
-	function &loadBlockInformations()
-	{
-	}
-
-	/**
-	 * @return Legacy_PreferenceInfoCollection
-	 */	
-	function &loadPreferenceInformations()
-	{
-	}
-}
-
-/**
- * @note final class
- */
-class Legacy_ModinfoX2FileReader extends Legacy_AbstractModinfoReader
-{
-	/**
-	 * @protected
-	 */
-	var $_mDirname = null;
-	
-	function Legacy_ModinfoX2FileReader($dirname)
-	{
-		$this->_mDirname = $dirname;
-	}
-	
-	/**
-	 * @private
-	 */
-	function &_createBlockInformation($funcNum, $arr)
-	{
-		$showFunc = "";
-		if (isset($arr['class'])) {
-			$showFunc = 'cl::' . $arr['class'];
-		}
-		else {
-			$showFunc = $arr['show_func'];
-		}
-		
-		$editFunc = isset($arr['edit_func']) ? $arr['edit_func'] : null;
-		$template = isset($arr['template']) ? $arr['template'] : null;
-		$options = isset($arr['options']) ? $arr['options'] : null;
-		
-		$info =& new Legacy_BlockInformation($funcNum, $arr['name'], $arr['file'], $arr['show_func'], $editFunc, $template, $options);
-		
-		return $info;
-	}
-	
-	/**
-	 * @todo Need guarantee of global variables.
-	 */
-	function &loadBlockInformations()
-	{
-		$collection =& new Legacy_BlockInfoCollection();
-		
-		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
-		if (!file_exists($t_filePath)) {
-			return $collection;
-		}
-		
-		include $t_filePath;
-		
-		if (!isset($modversion['blocks'])) {
-			return $collection;
-		}
-		
-		$blockArr = $modversion['blocks'];
-		
-		//
-		// Try (1) --- func_num
-		//
-		$successFlag = true;
-		foreach ($blockArr as $idx => $block) {
-			if (isset($block['func_num'])) {
-				$info =& $this->_createBlockInformation($block['func_num'], $block);
-				$successFlag &= $collection->add($info);
-				unset($info);
-			}
-			else {
-				$successFlag = false;
-				break;
-			}
-		}
-		
-		if ($successFlag) {
-			return $collection;
-		}
-		
-		//
-		// Try (2) --- index pattern
-		//
-		$collection->reset();
-		
-		$successFlag = true;
-		foreach ($blockArr as $idx => $block) {
-			if (is_int($idx)) {
-				$info =& $this->_createBlockInformation($idx, $block);
-				$successFlag &= $collection->add($info);
-				unset($info);
-			}
-			else {
-				$successFlag = false;
-				break;
-			}
-		}
-		
-		if ($successFlag) {
-			return $collection;
-		}
-		
-		//
-		// Try (3) --- automatic
-		//
-		$collection->reset();
-		
-		$idx = 1;
-		foreach ($blockArr as $block) {
-			$info =& $this->_createBlockInformation($idx++, $block);
-			$successFlag &= $collection->add($info);
-			unset($info);
-		}
-		
-		return $collection;
-	}
-
-	function &_createPreferenceInformation($order, $arr)
-	{
-		$arr['description'] = isset($arr['description']) ? $arr['description'] : null;
-		$info =& new Legacy_PreferenceInformation($order, $arr['name'], $arr['title'], $arr['description'], $arr['formtype'], $arr['valuetype'], $arr['default']);
-		if (isset($arr['options'])) {
-			foreach ($arr['options'] as $name => $value) {
-				$option =& new Legacy_PreferenceOptionInformation($name, $value);
-				$info->mOption->add($option);
-			}
-		}
-		
-		return $info;
-	}
-	
-	/**
-	 * @todo Need guarantee of global variables.
-	 */
-	function &loadPreferenceInformations()
-	{
-		$collection =& new Legacy_PreferenceInfoCollection();
-		
-		$t_filePath = XOOPS_ROOT_PATH . '/modules/' . $this->_mDirname . '/xoops_version.php';
-		if (!file_exists($t_filePath)) {
-			return $collection;
-		}
-		
-		include $t_filePath;
-		
-		if (!isset($modversion['config'])) {
-			return $collection;
-		}
-		
-		$preferenceArr = $modversion['config'];
-		
-		//
-		// Try (1) --- index pattern
-		//
-		
-		$successFlag = true;
-		foreach ($preferenceArr as $idx => $preference) {
-			if (is_int($idx)) {
-				$info =& $this->_createPreferenceInformation($idx, $preference);
-				$successFlag &= $collection->add($info);
-				unset($info);
-			}
-			else {
-				$successFlag = false;
-				break;
-			}
-		}
-		
-		if ($successFlag) {
-			return $collection;
-		}
-		
-		//
-		// Try (2) --- automatic
-		//
-		$collection->reset();
-		
-		$idx = 1;
-		foreach ($preferenceArr as $preference) {
-			$info =& $this->_createPreferenceInformation($idx++, $preference);
-			$successFlag &= $collection->add($info);
-			unset($info);
-		}
-		
-		return $collection;
-	}
-}
-
-class Legacy_ModinfoX2DBReader extends Legacy_AbstractModinfoReader
-{
-	/**
-	 * @protected
-	 */
-	var $_mDirname = null;
-	
-	function Legacy_ModinfoX2DBReader($dirname)
-	{
-		$this->_mDirname = $dirname;
-	}
-	
-	function &_createBlockInformation(&$block)
-	{
-		$info =& new Legacy_BlockInformation($block->get('func_num'), $block->get('name'), $block->get('func_file'), $block->get('show_func'), $block->get('edit_func'), $block->get('template'), $block->get('options'));
-		return $info;
-	}
-	
-	function &loadBlockInformations()
-	{
-		$collection =& new Legacy_BlockInfoCollection();
-		
-		$handler =& xoops_getmodulehandler('newblocks', 'legacy');
-		$criteria =& new Criteria('dirname', $this->_mDirname);
-		$blockArr =& $handler->getObjects($criteria);
-		
-		foreach (array_keys($blockArr) as $idx) {
-			$info =& $this->_createBlockInformation($blockArr[$idx]);
-			while (!$collection->add($info)) {
-				$info->mFuncNum++;
-			}
-		}
-		
-		return $collection;
-	}
-	
-	function &_createPreferenceInformation(&$config)
-	{
-		$info =& new Legacy_PreferenceInformation($config->get('conf_order'), $config->get('conf_name'), $config->get('conf_title'), $config->get('conf_desc'), $config->get('conf_formtype'), $config->get('conf_valuetype'), $config->get('conf_value'));
-		
-		$configOptionArr =& $config->getOptionItems();
-		
-		foreach (array_keys($configOptionArr) as $idx) {
-			$option =& new Legacy_PreferenceOptionInformation($configOptionArr[$idx]->get('confop_name'), $configOptionArr[$idx]->get('confop_value'));
-			$info->mOption->add($option);
-			unset($option);
-		}
-		
-		return $info;
-	}
-	
-	function &loadPreferenceInformations()
-	{
-		$collection =& new Legacy_PreferenceInfoCollection();
-
-		$handler =& xoops_gethandler('module');
-		$module =& $handler->getByDirname($this->_mDirname);
-				
-		$handler =& xoops_gethandler('config');
-		$configArr =& $handler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
-		
-		foreach (array_keys($configArr) as $idx) {
-			$info =& $this->_createPreferenceInformation($configArr[$idx]);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
-		}
-		
-		return $collection;
-	}
-}
-
-
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov 15 13:07:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 13:07:58 +0900
Subject: [xoops-cvslog 5846] CVS update: xoops2jp/html/install/include
Message-ID: <20061115040758.E00EB2AC018@users.sourceforge.jp>

Index: xoops2jp/html/install/include/makedata.php
diff -u xoops2jp/html/install/include/makedata.php:1.1.2.6.2.3 xoops2jp/html/install/include/makedata.php:1.1.2.6.2.4
--- xoops2jp/html/install/include/makedata.php:1.1.2.6.2.3	Sun Oct 15 02:23:16 2006
+++ xoops2jp/html/install/include/makedata.php	Wed Nov 15 13:07:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.1.2.6.2.3 2006/10/14 17:23:16 minahito Exp $
+// $Id: makedata.php,v 1.1.2.6.2.4 2006/11/15 04:07:58 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -114,7 +114,7 @@
 
     $temp = md5($adminpass);
     $regdate = time();
-    $dbm->insert('users', " VALUES (1,'','".addslashes($adminname)."','".addslashes($adminmail)."','".XOOPS_URL."/','blank.gif','".$regdate."','','','',1,'','','','','".$temp."',0,0,7,5,'default','".$time_diff."',".time().",'thread',0,1,0,'','','',0)");
+    $dbm->insert('users', " VALUES (1,'','".addslashes($adminname)."','".addslashes($adminmail)."','".XOOPS_URL."/','blank.gif','".$regdate."','','','',1,'','','','','".$temp."',0,0,7,5,'cube_default','".$time_diff."',".time().",'thread',0,1,0,'','','',0)");
 
     // data for table 'groups_users_link'
 

From minahito ＠ users.sourceforge.jp  Wed Nov 15 13:18:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 13:18:32 +0900
Subject: [xoops-cvslog 5847] CVS update: xoops2jp/html/modules/legacy/preload
Message-ID: <20061115041832.803F92AC114@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.3 xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.3	Sat Oct 21 20:36:13 2006
+++ xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php	Wed Nov 15 13:18:32 2006
@@ -33,7 +33,7 @@
 	
 	function preBlockFilter()
 	{
-		$this->mController->mRoot->mDelegateManager->add("Site.CheckLogin.Success", "Legacy_ThemeSelect::callbackCheckLoginSuccess");
+		$this->mController->mRoot->mDelegateManager->add("Site.CheckLogin.Success", array(&$this, "callbackCheckLoginSuccess"));
 	}
 	
 	/**
@@ -58,7 +58,7 @@
 		// Check Theme and set it to session.
 		//
 		$userTheme = $xoopsUser->get('theme');
-		if (is_array($userTheme) && in_array($userTheme, $this->mRoot->mContext->getXoopsConfig('theme_set_allowed'))) {
+		if (in_array($userTheme, $this->mRoot->mContext->getXoopsConfig('theme_set_allowed'))) {
 			$_SESSION['xoopsUserTheme'] = $userTheme;
 		}
 	}

From nobunobu ＠ users.sourceforge.jp  Wed Nov 15 15:17:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 15 Nov 2006 15:17:51 +0900
Subject: [xoops-cvslog 5848] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061115061751.161C52AC07E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.1 xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.1	Wed Nov 15 00:38:56 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Wed Nov 15 15:17:50 2006
@@ -87,6 +87,8 @@
 class Legacy_BlockInfoCollection
 {
 	var $mBlocks = array();
+	var $mShowFuncs = array();
+	var $mFuncFiles = array();
 	
 	function add(&$info)
 	{
@@ -95,6 +97,8 @@
 		}
 		
 		$this->mBlocks[$info->mFuncNum] =& $info;
+		$this->mShowFuncs[] = $info->mShowFunc;
+		$this->mFuncFiles[] = $info->mFuncFile;
 		
 		ksort($this->mBlocks);
 		
@@ -111,6 +115,10 @@
 		return $ret;
 	}
 	
+    function funcExists($info) {
+        return (in_array($info->mShowFunc, $this->mShowFuncs) && in_array($info->mFuncFile, $this->mFuncFiles));
+    }
+	
 	/**
 	 * Updates the list of blocks by comparing with $collection.
 	 */
@@ -119,7 +127,11 @@
 		foreach (array_keys($this->mBlocks) as $idx) {
 			$t_block =& $collection->get($this->mBlocks[$idx]->mFuncNum);
 			if ($t_block == null) {
-				$this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+			    if (!$collection->funcExists($this->mBlocks[$idx])) {
+				    $this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+				} else {
+				    $this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED; // No Action.
+				}
 			}
 			elseif (!$this->mBlocks[$idx]->isEqual($t_block)) {
 				$this->mBlocks[$idx]->update($t_block);

From minahito ＠ users.sourceforge.jp  Wed Nov 15 18:11:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 18:11:08 +0900
Subject: [xoops-cvslog 5849] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061115091108.B71962AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.2	Wed Nov 15 15:17:50 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Wed Nov 15 18:11:08 2006
@@ -5,10 +5,10 @@
  * @version $Id$
  */
 
-define('LEGACY_BLOCKINFOMATION_STATUS_LOADED', "loaded");
-define('LEGACY_BLOCKINFOMATION_STATUS_UPDATED', "updated");
-define('LEGACY_BLOCKINFOMATION_STATUS_NEW', "new");
-define('LEGACY_BLOCKINFOMATION_STATUS_DELETED', "deleted");
+define('LEGACY_INSTALLINFO_STATUS_LOADED', "loaded");
+define('LEGACY_INSTALLINFO_STATUS_UPDATED', "updated");
+define('LEGACY_INSTALLINFO_STATUS_NEW', "new");
+define('LEGACY_INSTALLINFO_STATUS_DELETED', "deleted");
 
 /**
  * The structure which is able to keep block's informations without DB. This
@@ -16,7 +16,7 @@
  */
 class Legacy_BlockInformation
 {
-	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	var $mStatus = LEGACY_INSTALLINFO_STATUS_LOADED;
 	
 	var $mFuncNum = 0;
 	
@@ -74,7 +74,7 @@
 
 	function update(&$block)
 	{
-		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		$this->mStatus = LEGACY_INSTALLINFO_STATUS_UPDATED;
 		
 		$this->mName = $block->mName;
 		$this->mFuncFile = $block->mFuncFile;
@@ -128,9 +128,9 @@
 			$t_block =& $collection->get($this->mBlocks[$idx]->mFuncNum);
 			if ($t_block == null) {
 			    if (!$collection->funcExists($this->mBlocks[$idx])) {
-				    $this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+				    $this->mBlocks[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_DELETED;
 				} else {
-				    $this->mBlocks[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED; // No Action.
+				    $this->mBlocks[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_UPDATED; // No Action.
 				}
 			}
 			elseif (!$this->mBlocks[$idx]->isEqual($t_block)) {
@@ -142,7 +142,7 @@
 			$func_num = $collection->mBlocks[$idx]->mFuncNum;
 			if (!isset($this->mBlocks[$func_num])) {
 				$this->add($collection->mBlocks[$idx]);
-				$this->mBlocks[$func_num]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+				$this->mBlocks[$func_num]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
 			}
 		}
 	}
@@ -160,7 +160,7 @@
  */
 class Legacy_PreferenceInformation
 {
-	var $mStatus = LEGACY_BLOCKINFOMATION_STATUS_LOADED;
+	var $mStatus = LEGACY_INSTALLINFO_STATUS_LOADED;
 	
 	var $mOrder = 0;
 	
@@ -178,15 +178,15 @@
 	
 	var $mOption = null;
 	
-	function Legacy_PreferenceInformation($order, $name, $title, $description, $formType, $valueType, $default)
+	function Legacy_PreferenceInformation($name, $title, $description, $formType, $valueType, $default, $order = 0)
 	{
-		$this->mOrder = intval($order);
 		$this->mName = $name;
 		$this->mTitle = $title;
 		$this->mDescription = $description;
 		$this->mFormType = $formType;
 		$this->mValueType = $valueType;
 		$this->mDefault = $default;
+		$this->mOrder = intval($order);
 		
 		$this->mOption =& new Legacy_PreferenceOptionInfoCollection();
 	}
@@ -196,10 +196,6 @@
 	 */
 	function isEqual(&$preference)
 	{
-		if ($this->mOrder != $preference->mOrder) {
-			return false;
-		}
-		
 		if ($this->mName != $preference->mName) {
 			return false;
 		}
@@ -229,7 +225,7 @@
 
 	function update(&$preference)
 	{
-		$this->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
+		$this->mStatus = LEGACY_INSTALLINFO_STATUS_UPDATED;
 		
 		$this->mName = $preference->mName;
 		$this->mTitle = $preference->mTitle;
@@ -258,78 +254,59 @@
 	function add(&$preference)
 	{
 		if ($preference->mName == 'com_rule' || $preference->mName == 'com_anonpost') {
-			if (isset($this->mComments[$preference->mOrder])) {
+			if (isset($this->mComments[$preference->mName])) {
 				return false;
 			}
-			$this->mComments[$preference->mOrder] =& $preference;
+			$this->mComments[$preference->mName] =& $preference;
 			$this->_sort();
 			return true;
 		}
 		
 		if ($preference->mName == 'notification_enabled' || $preference->mName == 'notification_events') {
-			if (isset($this->mNotifications[$preference->mOrder])) {
+			if (isset($this->mNotifications[$preference->mName])) {
 				return false;
 			}
-			$this->mNotifications[$preference->mOrder] =& $preference;
+			$this->mNotifications[$preference->mName] =& $preference;
 			$this->_sort();
 			return true;
 		}
 		
-		if (isset($this->mPreferences[$preference->mOrder])) {
+		if (isset($this->mPreferences[$preference->mName])) {
 			return false;
 		}
 		
-		$this->mPreferences[$preference->mOrder] =& $preference;
+		$this->mPreferences[$preference->mName] =& $preference;
 		$this->_sort();
 		
 		return true;
 	}
 	
+	/**
+	 * @private
+	 * Renumbers orders of preferences.
+	 */
 	function _sort()
 	{
-		$maxOrder = 0;
+		$currentOrder = 0;
 		foreach (array_keys($this->mPreferences) as $idx) {
-			if ($this->mPreferences[$idx]->mOrder > $maxOrder) {
-				$maxOrder = $this->mPreferences[$idx]->mOrder;
-			}
+			$this->mPreferences[$idx]->mOrder = $currentOrder++;
 		}
 		
-		$maxOrder++;
-
-		$t_comments = array();
 		foreach (array_keys($this->mComments) as $idx) {
-			if ($this->mComments[$idx]->mOrder != $maxOrder) {
-				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-				$this->mComments[$idx]->mOrder = $maxOrder;
-			}
-			$t_comments[$maxOrder++] =& $this->mComments[$idx];
+			$this->mComments[$idx]->mOrder = $currentOrder++;
 		}
 		
-		unset($this->mComments);
-		$this->mComments =& $t_comments;
-		
-		//
-		// Sort notifications
-		//
-		$t_notifications = array();
 		foreach (array_keys($this->mNotifications) as $idx) {
-			if ($this->mNotifications[$idx]->mOrder != $maxOrder) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_UPDATED;
-				$this->mNotifications[$idx]->mOrder = $maxOrder;
-			}
-			$t_notifications[$maxOrder++] =& $this->mNotifications[$idx];
+			$this->mNotifications[$idx]->mOrder = $currentOrder++;
 		}
-		
-		unset($this->mNotifications);
-		$this->mNotifications =& $t_notifications;
 	}
 	
-	function &get($order)
+	function &get($name)
 	{
 		$ret = null;
 		
-		if (isset($this->mPreferences[$order])) {
-			return $this->mPreferences[$order];
+		if (isset($this->mPreferences[$name])) {
+			return $this->mPreferences[$name];
 		}
 		
 		return $ret;
@@ -346,9 +323,9 @@
 		// Preferences
 		//
 		foreach (array_keys($this->mPreferences) as $idx) {
-			$t_preference =& $collection->get($this->mPreferences[$idx]->mOrder);
+			$t_preference =& $collection->get($this->mPreferences[$idx]->mName);
 			if ($t_preference == null) {
-				$this->mPreferences[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+				$this->mPreferences[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_DELETED;
 			}
 			elseif (!$this->mPreferences[$idx]->isEqual($t_preference)) {
 				$this->mPreferences[$idx]->update($t_preference);
@@ -356,10 +333,10 @@
 		}
 		
 		foreach (array_keys($collection->mPreferences) as $idx) {
-			$order = $collection->mPreferences[$idx]->mOrder;
-			if (!isset($this->mPreferences[$order])) {
-				$this->add($collection->mPreferences[$idx]);
-				$this->mPreferences[$order]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+			$name = $collection->mPreferences[$idx]->mName;
+			if (!isset($this->mPreferences[$name])) {
+				$this->add($collection->mPreferences[$name]);
+				$this->mPreferences[$name]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
 			}
 		}
 		
@@ -368,13 +345,13 @@
 		//
 		if (count($this->mComments) > 0 && count($collection->mComments) == 0) {
 			foreach (array_keys($this->mComments) as $idx) {
-				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+				$this->mComments[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_DELETED;
 			}
 		}
 		elseif (count($this->mComments) == 0 && count($collection->mComments) > 0) {
 			$this->mComments =& $collection->mComments;
 			foreach (array_keys($this->mComments) as $idx) {
-				$this->mComments[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+				$this->mComments[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
 			}
 		}
 		
@@ -383,13 +360,13 @@
 		//
 		if (count($this->mNotifications) > 0 && count($collection->mNotifications) == 0) {
 			foreach (array_keys($this->mNotifications) as $idx) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_DELETED;
+				$this->mNotifications[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_DELETED;
 			}
 		}
 		elseif (count($this->mNotifications) == 0 && count($collection->mNotifications) > 0) {
 			$this->mNotifications =& $collection->mNotifications;
 			foreach (array_keys($this->mNotifications) as $idx) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_BLOCKINFOMATION_STATUS_NEW;
+				$this->mNotifications[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
 			}
 		}
 	}
@@ -589,10 +566,10 @@
 		return $collection;
 	}
 
-	function &_createPreferenceInformation($order, $arr)
+	function &_createPreferenceInformation($arr)
 	{
 		$arr['description'] = isset($arr['description']) ? $arr['description'] : null;
-		$info =& new Legacy_PreferenceInformation($order, $arr['name'], $arr['title'], $arr['description'], $arr['formtype'], $arr['valuetype'], $arr['default']);
+		$info =& new Legacy_PreferenceInformation($arr['name'], $arr['title'], $arr['description'], $arr['formtype'], $arr['valuetype'], $arr['default']);
 		if (isset($arr['options'])) {
 			foreach ($arr['options'] as $name => $value) {
 				$option =& new Legacy_PreferenceOptionInformation($name, $value);
@@ -616,10 +593,8 @@
 			                 'default' => 1,
 			                 'options' => array('_CM_COMNOCOM' => XOOPS_COMMENT_APPROVENONE, '_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)
 			           );
-			$info =& $this->_createPreferenceInformation(0, $comRule);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
+			$info =& $this->_createPreferenceInformation($comRule);
+			$collection->add($info);
 			unset($info);
 
 			$comAnonpost = array('name' => 'com_anonpost',
@@ -629,10 +604,8 @@
 			                     'valuetype' => 'int',
 			                     'default' => 0
 			               );
-			$info =& $this->_createPreferenceInformation(1, $comAnonpost);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
+			$info =& $this->_createPreferenceInformation($comAnonpost);
+			$collection->add($info);
 			unset($info);
 		}
 	}
@@ -658,10 +631,8 @@
 				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
 				'options' => $t_options
 			);
-			$info =& $this->_createPreferenceInformation(0, $notifyEnable);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
+			$info =& $this->_createPreferenceInformation($notifyEnable);
+			$collection->add($info);
 			unset($info);
 			
 			//
@@ -699,10 +670,8 @@
 				'default' => array_values($t_options),
 				'options' => $t_options
 			);
-			$info =& $this->_createPreferenceInformation(1, $notifyEvents);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
+			$info =& $this->_createPreferenceInformation($notifyEvents);
+			$collection->add($info);
 			unset($info);
 		}
 	}
@@ -730,13 +699,13 @@
 		$preferenceArr = $modversion['config'];
 		
 		//
-		// Try (1) --- index pattern
+		// Try (1) --- name index pattern
 		//
-		
 		$successFlag = true;
 		foreach ($preferenceArr as $idx => $preference) {
-			if (is_int($idx)) {
-				$info =& $this->_createPreferenceInformation($idx, $preference);
+			if (is_string($idx)) {
+				$preference['name'] = $idx;
+				$info =& $this->_createPreferenceInformation($preference);
 				$successFlag &= $collection->add($info);
 				unset($info);
 			}
@@ -746,15 +715,14 @@
 			}
 		}
 		
+		//
+		// Try (2) --- auto number
+		//
 		if (!$successFlag) {
-			//
-			// Try (2) --- automatic
-			//
 			$collection->reset();
 			
-			$idx = 1;
 			foreach ($preferenceArr as $preference) {
-				$info =& $this->_createPreferenceInformation($idx++, $preference);
+				$info =& $this->_createPreferenceInformation($preference);
 				$collection->add($info);
 				unset($info);
 			}
@@ -808,7 +776,7 @@
 	
 	function &_createPreferenceInformation(&$config)
 	{
-		$info =& new Legacy_PreferenceInformation($config->get('conf_order'), $config->get('conf_name'), $config->get('conf_title'), $config->get('conf_desc'), $config->get('conf_formtype'), $config->get('conf_valuetype'), $config->get('conf_value'));
+		$info =& new Legacy_PreferenceInformation($config->get('conf_name'), $config->get('conf_title'), $config->get('conf_desc'), $config->get('conf_formtype'), $config->get('conf_valuetype'), $config->get('conf_value'));
 		
 		$configOptionArr =& $config->getOptionItems();
 		
@@ -829,13 +797,13 @@
 		$module =& $handler->getByDirname($this->_mDirname);
 				
 		$handler =& xoops_gethandler('config');
-		$configArr =& $handler->getConfigs(new Criteria('conf_modid', $module->get('mid')));
+		$criteria =& new Criteria('conf_modid', $module->get('mid'));
+		$criteria->setOrder('conf_order');
+		$configArr =& $handler->getConfigs($criteria);
 		
 		foreach (array_keys($configArr) as $idx) {
 			$info =& $this->_createPreferenceInformation($configArr[$idx]);
-			while (!$collection->add($info)) {
-				$info->mOrder++;
-			}
+			$collection->add($info);
 		}
 		
 		return $collection;
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.12 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.13
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.12	Wed Nov 15 00:39:30 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Wed Nov 15 18:11:08 2006
@@ -847,19 +847,19 @@
 
 		foreach (array_keys($currentBlocks->mBlocks) as $idx) {
 			switch ($currentBlocks->mBlocks[$idx]->mStatus) {
-				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+				case LEGACY_INSTALLINFO_STATUS_LOADED:
 					Legacy_ModuleInstallUtils::updateBlockTemplateByInfo($currentBlocks->mBlocks[$idx], $module, $log);
 					break;
 				
-				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updateBlockByInfo($currentBlocks->mBlocks[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+				case LEGACY_INSTALLINFO_STATUS_NEW:
 					Legacy_ModuleInstallUtils::installBlockByInfo($currentBlocks->mBlocks[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+				case LEGACY_INSTALLINFO_STATUS_DELETED:
 					Legacy_ModuleInstallUtils::uninstallBlockByFuncNum($currentBlocks->mBlocks[$idx]->mFuncNum, $module, $log);
 					break;
 			}
@@ -883,18 +883,19 @@
 		//
 		foreach (array_keys($currentPreferences->mPreferences) as $idx) {
 			switch ($currentPreferences->mPreferences[$idx]->mStatus) {
-				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+				case LEGACY_INSTALLINFO_STATUS_LOADED:
+					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mPreferences[$idx], $module, $log);
 					break;
 				
-				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+				case LEGACY_INSTALLINFO_STATUS_NEW:
 					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+				case LEGACY_INSTALLINFO_STATUS_DELETED:
 					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mPreferences[$idx]->mOrder, $module, $log);
 					break;
 			}
@@ -905,18 +906,16 @@
 		//
 		foreach (array_keys($currentPreferences->mComments) as $idx) {
 			switch ($currentPreferences->mComments[$idx]->mStatus) {
-				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
-					break;
-				
-				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+				case LEGACY_INSTALLINFO_STATUS_LOADED:
+				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mComments[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+				case LEGACY_INSTALLINFO_STATUS_NEW:
 					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mComments[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+				case LEGACY_INSTALLINFO_STATUS_DELETED:
 					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mComments[$idx]->mOrder, $module, $log);
 					break;
 			}
@@ -927,18 +926,18 @@
 		//
 		foreach (array_keys($currentPreferences->mNotifications) as $idx) {
 			switch ($currentPreferences->mNotifications[$idx]->mStatus) {
-				case LEGACY_BLOCKINFOMATION_STATUS_LOADED:
+				case LEGACY_INSTALLINFO_STATUS_LOADED:
 					break;
 				
-				case LEGACY_BLOCKINFOMATION_STATUS_UPDATED:
+				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mNotifications[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_NEW:
+				case LEGACY_INSTALLINFO_STATUS_NEW:
 					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mNotifications[$idx], $module, $log);
 					break;
 					
-				case LEGACY_BLOCKINFOMATION_STATUS_DELETED:
+				case LEGACY_INSTALLINFO_STATUS_DELETED:
 					Legacy_ModuleInstallUtils::uninstallPreferenceByOrder($currentPreferences->mNotifications[$idx]->mOrder, $module, $log);
 					break;
 			}
@@ -996,7 +995,7 @@
 		$criteria =& new CriteriaCompo();		
 		$criteria->add(new Criteria('conf_modid', $module->get('mid')));
 		$criteria->add(new Criteria('conf_catid', 0));
-		$criteria->add(new Criteria('conf_order', $info->mOrder));
+		$criteria->add(new Criteria('conf_name', $info->mName));
 		
 		$configArr =& $handler->getConfigs($criteria);
 		
@@ -1006,12 +1005,23 @@
 		
 		$config =& $configArr[0];
 		
-		$config->set('conf_name', $info->mName);
 		$config->set('conf_title', $info->mTitle);
 		$config->set('conf_desc', $info->mDescription);
-		$config->set('conf_formtype', $info->mFormType);
-		$config->set('conf_valuetype', $info->mValueType);
-		$config->setConfValueForInput($info->mDefault);
+		
+		//
+		// Decide whether it changes values.
+		//
+		if ($config->get('conf_formtype') != $info->mFormType && $config->get('conf_valuetype') != $info->mValueType) {
+			$config->set('conf_formtype', $info->mFormType);
+			$config->set('conf_valuetype', $info->mValueType);
+			$config->setConfValueForInput($info->mDefault);
+		}
+		else {
+			$config->set('conf_formtype', $info->mFormType);
+			$config->set('conf_valuetype', $info->mValueType);
+		}
+		
+		$config->set('conf_order', $info->mOrder);
 		
 		$optionArr =& $handler->getConfigOptions(new Criteria('conf_id', $config->get('conf_id')));
 		if (is_array($optionArr)) {
@@ -1046,11 +1056,11 @@
 		$criteria =& new CriteriaCompo();		
 		$criteria->add(new Criteria('conf_modid', $module->get('mid')));
 		$criteria->add(new Criteria('conf_catid', 0));
-		$criteria->add(new Criteria('conf_order', $info->mOrder));
+		$criteria->add(new Criteria('conf_name', $info->mName));
 		
 		$configArr =& $handler->getConfigs($criteria);
 		
-		if (count($configArr) > 0 && !is_object($configArr[0])) {
+		if (!(count($configArr) > 0 && is_object($configArr[0]))) {
 			$log->addError('Execption Error: Could not find config.');
 		}
 		
@@ -1058,11 +1068,8 @@
 		
 		$config->set('conf_order', $info->mOrder);
 
-		if ($handler->insertConfig($config)) {
-			$log->addReport(XCube_Utils::formatMessage("Preference '{0}' is updateded.", $config->get('conf_name')));
-		}
-		else {
-			$log->addError(XCube_Utils::formatMessage("Could not update preference '{0}'.", $config->get('conf_name')));
+		if (!$handler->insertConfig($config)) {
+			$log->addError(XCube_Utils::formatMessage("Could not update the order of preference '{0}'.", $config->get('conf_name')));
 		}
 	}
 	

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:41:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:41:20 +0900
Subject: [xoops-cvslog 5850] CVS update: xoops2jp/html/modules/pm/preload
Message-ID: <20061115104120.388632AC14A@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/preload/index.html
diff -u /dev/null xoops2jp/html/modules/pm/preload/index.html:1.1.2.1
--- /dev/null	Wed Nov 15 19:41:20 2006
+++ xoops2jp/html/modules/pm/preload/index.html	Wed Nov 15 19:41:20 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:41:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:41:43 +0900
Subject: [xoops-cvslog 5851] CVS update: xoops2jp/html/modules/pm/service
Message-ID: <20061115104143.2B7DA2AC14A@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/service/Service.class.php
diff -u /dev/null xoops2jp/html/modules/pm/service/Service.class.php:1.1.2.1
--- /dev/null	Wed Nov 15 19:41:43 2006
+++ xoops2jp/html/modules/pm/service/Service.class.php	Wed Nov 15 19:41:43 2006
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: Service.class.php,v 1.1.2.1 2006/11/15 10:41:43 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * Sample class
+ */
+class Pm_Service extends XCube_Service
+{
+	var $mServiceName = "Pm_Service";
+	var $mNameSpace = "Pm";
+	var $mClassName = "Pm_Service";
+	
+	function prepare()
+	{
+		$this->addFunction(S_PUBLIC_FUNC('string getPmInboxUrl(int uid)'));
+		$this->addFunction(S_PUBLIC_FUNC('string getPmliteUrl(int fromUid, int toUid)'));
+		$this->addFunction(S_PUBLIC_FUNC('int getCountUnreadPM(int uid)'));
+	}
+	
+	function getPmInboxUrl()
+	{
+		$root =& XCube_Root::getSingleton();
+		$uid = $root->mContext->mRequest->getRequest('uid');
+		
+		if ($uid > 0) {
+			return XOOPS_MODULE_URL . "/pm/index.php";
+		}
+		
+		return "";
+	}
+	
+	function getPmliteUrl()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$fromUid = $root->mContext->mRequest->getRequest('fromUid');
+		$toUid = $root->mContext->mRequest->getRequest('toUid');
+
+		if ($fromUid > 0 && $toUid > 0) {
+			return XOOPS_URL . "/pmlite.php?send2=1&to_userid=${toUid}";
+		}
+		
+		return "";
+	}
+	
+	function getCountUnreadPM()
+	{
+		$root =& XCube_Root::getSingleton();
+		$uid = $root->mContext->mRequest->getRequest('uid');
+		
+		if ($uid > 0) {
+			$handler =& xoops_gethandler('privmessage');
+			return $handler->getCountUnreadByFromUid($uid);
+		}
+		
+		return 0;
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:42:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:42:27 +0900
Subject: [xoops-cvslog 5852] CVS update: xoops2jp/html/modules/pm/preload
Message-ID: <20061115104227.B4B802AC0B4@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/preload/Preload.class.php
diff -u xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6 xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6.2.1
--- xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6	Fri Sep 22 19:06:16 2006
+++ xoops2jp/html/modules/pm/preload/Preload.class.php	Wed Nov 15 19:42:27 2006
@@ -6,28 +6,16 @@
 {
 	function preBlockFilter()
 	{
+		require_once XOOPS_MODULE_PATH . "/pm/service/Service.class.php";
+		$service =& new Pm_Service();
+		$service->prepare();
+		
+		$this->mRoot->mServiceManager->addService('privateMessage', $service);
+
 		$root =& XCube_Root::getSingleton();
 		$root->mDelegateManager->add('Legacypage.Viewpmsg.Access', "Pm_Preload::accessToViewpmsg");
 		$root->mDelegateManager->add('Legacypage.Readpmsg.Access', "Pm_Preload::accessToReadpmsg");
 		$root->mDelegateManager->add('Legacypage.Pmlite.Access', "Pm_Preload::accessToPmlite");
-		
-		$this->mController->mGetPMInboxUrl->add("Pm_Preload::getPmInboxUrl");
-		$this->mController->mGetCountUnreadPM->add("Pm_Preload::getCountUnreadPM");
-	}
-	
-	function getPmInboxUrl(&$url, $uid)
-	{
-		if ($uid > 0) {
-			$url = XOOPS_MODULE_URL . "/pm/index.php";
-		}
-	}
-	
-	function getCountUnreadPM(&$count, $uid)
-	{
-		if ($uid > 0) {
-			$handler =& xoops_gethandler('privmessage');
-			$count = $handler->getCountUnreadByFromUid($uid);
-		}
 	}
 	
 	function accessToReadpmsg()

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:43:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:43:02 +0900
Subject: [xoops-cvslog 5853] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061115104302.9D7DA2AC0B4@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.4 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.5
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.4	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Wed Nov 15 19:43:02 2006
@@ -55,11 +55,11 @@
           </td>
         </tr>
       <{/if}>
-      <{if $xoops_isuser == true}>
+      <{if $xoops_isuser == true && $pmliteUrl != ''}>
         <tr valign="top">
           <td class="head"><{$smarty.const._MD_USER_LANG_PM}></td>
           <td class="even">
-            <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getShow('uid')}>', 'pmlite', 480, 400);">
+            <a href="javascript:openWithSelfMain('<{$pmliteUrl|escape}>', 'pmlite', 480, 400);">
             <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" /></a>
           </td>
         </tr>

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:43:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:43:02 +0900
Subject: [xoops-cvslog 5854] CVS update: xoops2jp/html/modules/user
Message-ID: <20061115104302.CA43B2AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.7 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.8
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.7	Tue Nov 14 20:54:26 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Wed Nov 15 19:43:02 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.7 2006/11/14 11:54:26 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.8 2006/11/15 10:43:02 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 2.04;
+$modversion['version'] = 2.05;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:43:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:43:02 +0900
Subject: [xoops-cvslog 5855] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061115104302.F31E52AC0B4@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserInfoAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.1 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.2
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.1	Fri Nov 10 20:30:01 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php	Wed Nov 15 19:43:02 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.1 2006/11/10 11:30:01 minahito Exp $
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.2 2006/11/15 10:43:02 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -25,6 +25,8 @@
 	var $mSearchResults = null;
 	
 	var $mSelfDelete = false;
+	
+	var $mPmliteURL = null;
 
 	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
@@ -51,6 +53,14 @@
 		$this->mRankObject =& $rankHandler->get($this->mObject->get('rank'));
 		
 		$root =& $controller->mRoot;
+		
+		$service =& $root->mServiceManager->getService('privateMessage');
+		if ($service != null) {
+			$client =& $root->mServiceManager->createClient($service);
+			$this->mPmliteURL = $client->call('getPmliteUrl', array('fromUid' => is_object($xoopsUser) ? $xoopsUser->get('uid') : 0, 'toUid' => $uid));
+		}
+		unset($service);
+		
 		$service =& $root->mServiceManager->getService("LegacySearch");
 		if ($service != null) {
 			$this->mSearchResults = array();
@@ -91,6 +101,8 @@
 		$render->setTemplateName("user_userinfo.html");
 		$render->setAttribute("thisUser", $this->mObject);
 		$render->setAttribute("rank", $this->mRankObject);
+		
+		$render->setAttribute('pmliteUrl', $this->mPmliteURL);
 
 		$myts =& MyTextSanitizer::getInstance();
 		$userSignature = $myts->makeTareaData4Show($this->mObject->get('user_sig'), 0, 1, 1);

From minahito ＠ users.sourceforge.jp  Wed Nov 15 19:45:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 19:45:03 +0900
Subject: [xoops-cvslog 5856] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061115104504.C06B72AC036@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.22 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.23
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.22	Sun Nov 12 14:18:43 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Wed Nov 15 19:45:03 2006
@@ -42,16 +42,6 @@
 	/**
 	 * @var XCube_Delegate
 	 */
-	var $mGetCountUnreadPM = null;
-	
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mGetPMInboxUrl = null;
-	
-	/**
-	 * @var XCube_Delegate
-	 */
 	var $mCheckLogin = null;
 	
 	/**
@@ -98,9 +88,6 @@
 		//
 		$this->mSetupUser->register("Legacy_Controller.SetupUser");
 		
-		$this->mGetCountUnreadPM =& new XCube_Delegate();
-		$this->mGetPMInboxUrl =& new XCube_Delegate();
-		
 		$this->mCheckLogin =& new XCube_Delegate();
 		$this->mCheckLogin->register("Site.CheckLogin");
 		
@@ -1024,34 +1011,6 @@
 	}
 	
 	/**
-	 * Return URL of pm inbox. This is X2 fixed feature.
-	 * 
-	 * @param $uid int ID of the user
-	 * @return string if any functions don't return value, return null.
-	 */
-	function getPMInboxUrl($uid)
-	{
-		$url = null;
-		$this->mGetPMInboxUrl->call(new XCube_Ref($url), $uid);
-		
-		return $url;
-	}
-
-	/**
-	 * Return counts of unread pm. This is X2 fixed feature.
-	 * 
-	 * @param $uid int ID of the user
-	 * @return int
-	 */
-	function getCountUnreadPM($uid)
-	{
-		$count = 0;
-		$this->mGetCountUnreadPM->call(new XCube_Ref($count), $uid);
-		
-		return $count;
-	}
-
-	/**
 	 * This member function works to redirect as well as redirect_header().
 	 * But, this member function handles raw values which hasn't been converted
 	 * by htmlspecialchars(). Therefore, if user calls this function with the

From minahito ＠ users.sourceforge.jp  Wed Nov 15 20:16:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 20:16:16 +0900
Subject: [xoops-cvslog 5857] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061115111616.450B62AC0B4@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_usermenu.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_usermenu.php:1.1.2.1 xoops2jp/html/modules/legacy/blocks/legacy_usermenu.php:1.1.2.2
--- xoops2jp/html/modules/legacy/blocks/legacy_usermenu.php:1.1.2.1	Sat Oct 14 23:55:26 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_usermenu.php	Wed Nov 15 20:16:16 2006
@@ -20,22 +20,27 @@
 
     if (is_object($xoopsUser)) {
         $block = array();
-        
-        $block['uid'] = $xoopsUser->getVar('uid');
+		
+        $block['uid'] = $xoopsUser->get('uid');
 		$block['flagShowInbox'] = false;
 
 		//
 		// Check does this system have PrivateMessage feature.
 		//
-		$url = $root->mController->getPMInboxUrl($block['uid']);
-
-		if ($url != null) {
-			$block['inbox_url'] = $url;
-			$block['new_messages'] = $root->mController->getCountUnreadPM($block['uid']);
-			$block['flagShowInbox']=true;
+		$url = null;
+		$service =& $root->mServiceManager->getService('privateMessage');
+		if ($service != null) {
+			$client =& $root->mServiceManager->createClient($service);
+			$url = $client->call('getPmInboxUrl', array('uid' => $xoopsUser->get('uid')));
+			
+			if ($url != null) {
+				$block['inbox_url'] = $url;
+				$block['new_messages'] = $client->call('getCountUnreadPM', array('uid' => $xoopsUser->get('uid')));
+				$block['flagShowInbox']=true;
+			}
 		}
 		
-		$block['show_adminlink'] = $xoopsUser->isAdmin(-1);
+		$block['show_adminlink'] = $root->mContext->mUser->isInRole('Site.Administrator');
 
         return $block;
     }

From minahito ＠ users.sourceforge.jp  Wed Nov 15 20:33:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 20:33:20 +0900
Subject: [xoops-cvslog 5858] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061115113320.A06F92AC153@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.9 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.9	Mon Nov 13 20:11:35 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Wed Nov 15 20:33:20 2006
@@ -145,6 +145,12 @@
 		if ($installScript != false) {
 			require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
 			$funcName = 'xoops_module_uninstall_' . $this->_mXoopsModule->get('dirname');
+			
+			if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $funcName)) {
+				$this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+				return;
+			}
+			
 			if (function_exists($funcName)) {
 				if (!call_user_func($funcName, $this->_mXoopsModule)) {
 					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
@@ -204,6 +210,10 @@
 		}
 		
 		$this->_processScript();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
 		
 		$this->_processReport();
 		
Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.14 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.15
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.14	Tue Nov 14 20:53:34 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Wed Nov 15 20:33:20 2006
@@ -372,6 +372,10 @@
 		// call bacl 'onUpdate'
 		//
 		$this->_processScript();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
 		
 		$this->_processReport();
 		
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.7 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.7	Mon Nov 13 20:11:35 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Wed Nov 15 20:33:20 2006
@@ -189,6 +189,12 @@
         if ($installScript != false) {
             require_once XOOPS_MODULE_PATH . "/" . $this->_mXoopsModule->get('dirname') . "/" . $installScript;
             $funcName = 'xoops_module_install_' . $this->_mXoopsModule->get('dirname');
+			
+			if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $funcName)) {
+				$this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
+				return;
+			}
+			
             if (function_exists($funcName)) {
                 if (!call_user_func($funcName, $this->_mXoopsModule)) {
                     $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_LEGACY_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
@@ -248,6 +254,10 @@
 		}
 		
 		$this->_processScript();
+		if (!$this->_mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
 		
 		$this->_processReport();
 		

From nobunobu ＠ users.sourceforge.jp  Wed Nov 15 22:26:50 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 15 Nov 2006 22:26:50 +0900
Subject: [xoops-cvslog 5859] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061115132650.436602AC155@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.3	Wed Nov 15 18:11:08 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Wed Nov 15 22:26:50 2006
@@ -216,6 +216,10 @@
 			return false;
 		}
 		
+		if ($this->mOrder != $preference->mOrder) {
+			return false;
+		}
+		
 		if (!$this->mOption->isEqual($preference->mOption)) {
 			return false;
 		}
@@ -233,6 +237,7 @@
 		$this->mFormType = $preference->mFormType;
 		$this->mValueType = $preference->mValueType;
 		$this->mDefault = $preference->mDefault;
+		$this->mOrder = $preference->mOrder;
 		
 		unset($this->mOption);
 		$this->mOption =& $preference->mOption;

From minahito ＠ users.sourceforge.jp  Wed Nov 15 23:56:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 23:56:05 +0900
Subject: [xoops-cvslog 5860] CVS update:
	xoops2jp/html/modules/legacy/lib/Mailer
Message-ID: <20061115145605.2D2BE2AC127@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Wed Nov 15 23:56:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 23:56:08 +0900
Subject: [xoops-cvslog 5861] CVS update:
	xoops2jp/html/modules/legacy/lib/Mailer
Message-ID: <20061115145608.B7E7A2AC127@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php
diff -u /dev/null xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.1
--- /dev/null	Wed Nov 15 23:56:08 2006
+++ xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php	Wed Nov 15 23:56:08 2006
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id$
+ */
+
+/**
+ * This is an exmine class for mail.
+ */
+class Legacy_Mailer extends phpmailer
+{
+	/**
+	 * @type XCube_Delegate
+	 */
+	var $mConvertLocal = null;
+	
+	function Legacy_Mailer()
+	{
+		$this->mConvertLocal =& new XCube_Delegate();
+		$this->mConvertLocal->register('Legacy_Mailer.ConvertLocal');
+	}
+	
+	function prepare()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$handler =& xoops_gethandler('config');
+		$xoopsMailerConfig =& $handler->getConfigByCat(XOOPS_CONF_MAILER);
+		$this->reset();
+		
+		if ($xoopsMailerConfig['form'] == '') {
+			$this->From = $root->mContext->mXoopsConfig['adminmail'];
+		}
+		else {
+			$this->From = $xoopsMailerConfig['from'];
+		}
+		
+		$this->Sender = $root->mContext->mXoopsConfig['adminmail'];
+		
+		$this->SetLanguage = LEGACY_MAIL_LANG;
+		$this->CharSet = LEGACY_MAIL_CHAR;
+		$this->Encoding = LEGACY_MAIL_ENCO;
+		
+		switch ($xoopsMailerConfig['mailmethod']) {
+			case 'smtpauth':
+				$this->IsSMTP();
+				$this->SMTPAuth = true;
+				$this->Host = implode(';', $xoopsMailerConfig['smtphost']);
+				$this->Username = $xoopsMailerConfig['smtpuser'];
+				$this->Password = $xoopsMailerConfig['smtppass'];
+				break;
+				
+			case 'smtp':
+				$this->IsSMTP();
+				$this->SMTPAuth = false;
+				$this->Host = implode(';', $xoopsMailerConfig['smtphost']);
+				break;
+				
+			case 'sendmail':
+				$this->IsSendmail();
+				$this->Sendmail = $xoopsMailerConfig['sendmailpath'];
+				break;
+		}
+		
+		return true;
+	}
+	
+	function setFrom($text)
+	{
+		$this->From = $text;
+	}
+	
+	function setFromname($text)
+	{
+		$this->FromName = $this->convertLocal($text, true);
+	}
+	
+	function setSubject($text)
+	{
+		$this->Subject = $this->convertLocal($text, true);
+	}
+  
+	function setBody($text)
+	{
+		$this->Body = $this->convertLocal($text);
+	}
+	
+	function setTo($add, $name)
+	{
+		$this->AddAddress($add, $this->convertLocal($name, true));
+	}
+	
+	function reset()
+	{
+		$this->ClearAllRecipients();
+		$this->Body = "";
+		$this->Subject = "";
+	}
+	
+	function convertLocal($text, $mime = false)
+	{
+		$this->mConvertLocal->call(new XCube_Ref($text), $mine);
+		return $text;
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacy/lib/Mailer/index.html
diff -u /dev/null xoops2jp/html/modules/legacy/lib/Mailer/index.html:1.1.2.1
--- /dev/null	Wed Nov 15 23:56:08 2006
+++ xoops2jp/html/modules/legacy/lib/Mailer/index.html	Wed Nov 15 23:56:08 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Nov 15 23:56:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 15 Nov 2006 23:56:56 +0900
Subject: [xoops-cvslog 5862] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061115145656.0E5E72AC127@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/global.php
diff -u xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.1 xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.2
--- xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.1	Sat Oct 14 23:55:27 2006
+++ xoops2jp/html/modules/legacy/language/japanese/global.php	Wed Nov 15 23:56:55 2006
@@ -192,6 +192,22 @@
 // change 0 to 1 if this language is a multi-bytes language
 define('XOOPS_USE_MULTIBYTES', '1');
 
+//
+// Register the function about local.
+//
+if (function_exists('mb_convert_encoding') && function_exists('mb_convert_kana')) {
+	$root =& XCube_Root::getSingleton();
+	$root->mDelegateManager->add('Legacy_Mailer.ConvertLocal', 'Legacy_JapaneseEucJP_convLocal');
+}
+
+function Legacy_JapaneseEucJP_convLocal(&$text, $mime)
+{
+	$text = mb_convert_encoding($text, 'JIS');
+	if ($mime) {
+		$text = mb_encode_mimeheader($text);
+	}
+}
+
 function xoops_language_trim($text)
 {
 	if (function_exists('mb_convert_kana')) {

From minahito ＠ users.sourceforge.jp  Thu Nov 16 00:51:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 00:51:40 +0900
Subject: [xoops-cvslog 5863] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061115155140.B291D2AC0DB@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/global.php
diff -u xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.2 xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.3
--- xoops2jp/html/modules/legacy/language/japanese/global.php:1.1.2.2	Wed Nov 15 23:56:55 2006
+++ xoops2jp/html/modules/legacy/language/japanese/global.php	Thu Nov 16 00:51:40 2006
@@ -200,6 +200,10 @@
 	$root->mDelegateManager->add('Legacy_Mailer.ConvertLocal', 'Legacy_JapaneseEucJP_convLocal');
 }
 
+ ＠ define('LEGACY_MAIL_LANG','ja');
+ ＠ define('LEGACY_MAIL_CHAR','iso-2022-jp');
+ ＠ define('LEGACY_MAIL_ENCO','7bit');
+
 function Legacy_JapaneseEucJP_convLocal(&$text, $mime)
 {
 	$text = mb_convert_encoding($text, 'JIS');

From minahito ＠ users.sourceforge.jp  Thu Nov 16 16:30:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 16:30:51 +0900
Subject: [xoops-cvslog 5864] CVS update: xoops2jp/html/modules/pm/service
Message-ID: <20061116073051.ACE252AC076@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/service/index.html
diff -u /dev/null xoops2jp/html/modules/pm/service/index.html:1.1.4.1
--- /dev/null	Thu Nov 16 16:30:51 2006
+++ xoops2jp/html/modules/pm/service/index.html	Thu Nov 16 16:30:51 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:13:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:13:57 +0900
Subject: [xoops-cvslog 5865] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061116081357.859F92AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.1 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.2
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.1	Thu Nov  2 16:39:35 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Thu Nov 16 17:13:57 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.16.2.1 2006/11/02 07:39:35 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.16.2.2 2006/11/16 08:13:57 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_PM_NAME;
-$modversion['version'] = 2.01;
+$modversion['version'] = 2.02;
 $modversion['description'] = _MI_PM_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
@@ -78,6 +78,6 @@
 	);
 
 // Menu
-$modversion['hasMain'] = 1;
+$modversion['hasMain'] = 0;
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:14:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:14:12 +0900
Subject: [xoops-cvslog 5866] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061116081412.79B8E2AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/pmlite.php
diff -u xoops2jp/html/modules/pm/pmlite.php:1.1.2.5.2.1 xoops2jp/html/modules/pm/pmlite.php:removed
--- xoops2jp/html/modules/pm/pmlite.php:1.1.2.5.2.1	Thu Sep 28 14:04:21 2006
+++ xoops2jp/html/modules/pm/pmlite.php	Thu Nov 16 17:14:12 2006
@@ -1,24 +0,0 @@
-<?php
-/**
- * @package pm
- * @version $Id: pmlite.php,v 1.1.2.5.2.1 2006/09/28 05:04:21 minahito Exp $
- */
-
-require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH . "/header.php";
-require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
-
-$root =& XCube_Root::getSingleton();
-
-$moduleRunner =& new Pm_ActionFrame(false);
-$moduleRunner->setActionName("pmlite");
-
-$root->mController->setDialogMode(true);
-
-$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
-$root->mController->execute();
-
-require_once XOOPS_ROOT_PATH . "/footer.php";
-
-?>
Index: xoops2jp/html/modules/pm/index.php
diff -u xoops2jp/html/modules/pm/index.php:1.1.2.4.2.1 xoops2jp/html/modules/pm/index.php:removed
--- xoops2jp/html/modules/pm/index.php:1.1.2.4.2.1	Thu Sep 28 14:04:21 2006
+++ xoops2jp/html/modules/pm/index.php	Thu Nov 16 17:14:12 2006
@@ -1,24 +0,0 @@
-<?php
-/**
- * @package pm
- * @version $Id: index.php,v 1.1.2.4.2.1 2006/09/28 05:04:21 minahito Exp $
- */
-
-require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH . "/header.php";
-require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
-
-$root =& XCube_Root::getSingleton();
-
-$actionName = isset($_GET['action']) ? trim($_GET['action']) : "default";
-
-$moduleRunner =& new Pm_ActionFrame(false);
-$moduleRunner->setActionName($actionName);
-
-$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
-
-$root->mController->execute();
-
-require_once XOOPS_ROOT_PATH . "/footer.php";
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:14:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:14:27 +0900
Subject: [xoops-cvslog 5867] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061116081427.43B4B2AC17F@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/index.html
diff -u /dev/null xoops2jp/html/modules/pm/index.html:1.1.2.1
--- /dev/null	Thu Nov 16 17:14:27 2006
+++ xoops2jp/html/modules/pm/index.html	Thu Nov 16 17:14:27 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:15:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:15:10 +0900
Subject: [xoops-cvslog 5868] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20061116081510.B6AC92AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.4 xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.4.2.1
--- xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.4	Thu Aug 17 18:09:51 2006
+++ xoops2jp/html/modules/pm/actions/DeleteAction.class.php	Thu Nov 16 17:15:10 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: DeleteAction.class.php,v 1.1.2.4 2006/08/17 09:09:51 minahito Exp $
+ * @version $Id: DeleteAction.class.php,v 1.1.2.4.2.1 2006/11/16 08:15:10 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -50,12 +50,12 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		$controller->executeRedirect("./index.php", 1, _MD_PM_MESSAGE_DELETED);
+		$controller->executeRedirect(XOOPS_URL . "/viewpmsg.php", 1, _MD_PM_MESSAGE_DELETED);
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		$controller->executeRedirect("./index.php", 1, _MD_PM_ERROR_ACCESS);
+		$controller->executeRedirect(XOOPS_URL . "/viewpmsg.php", 1, _MD_PM_ERROR_ACCESS);
 	}
 }
 
Index: xoops2jp/html/modules/pm/actions/ReadAction.class.php
diff -u xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.3.2.2 xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.3.2.3
--- xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.3.2.2	Tue Oct 17 19:23:03 2006
+++ xoops2jp/html/modules/pm/actions/ReadAction.class.php	Thu Nov 16 17:15:10 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: ReadAction.class.php,v 1.1.2.3.2.2 2006/10/17 10:23:03 minahito Exp $
+ * @version $Id: ReadAction.class.php,v 1.1.2.3.2.3 2006/11/16 08:15:10 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -113,12 +113,12 @@
 	 */
 	function execute(&$controller, &$xoopsUser)
 	{
-		$controller->executeForward(XOOPS_MODULE_URL . "/pm/index.php?action=DeleteOne&msg_id=" . xoops_getrequest('msg_id'));
+		$controller->executeForward(XOOPS_URL . "/readpmsg.php?action=DeleteOne&msg_id=" . xoops_getrequest('msg_id'));
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		$controller->executeRedirect("./index.php", 1, _MD_PM_ERROR_ACCESS);
+		$controller->executeRedirect(XOOPS_URL . "/viewpmsg.php", 1, _MD_PM_ERROR_ACCESS);
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:16:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:16:19 +0900
Subject: [xoops-cvslog 5869] CVS update: xoops2jp/html/modules/pm/preload
Message-ID: <20061116081619.710C52AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/preload/Preload.class.php
diff -u xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6.2.1 xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6.2.2
--- xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.6.2.1	Wed Nov 15 19:42:27 2006
+++ xoops2jp/html/modules/pm/preload/Preload.class.php	Thu Nov 16 17:16:19 2006
@@ -20,42 +20,77 @@
 	
 	function accessToReadpmsg()
 	{
+		//
+		// Boot the action frame of the user module directly.
+		//
 		$root =& XCube_Root::getSingleton();
-		$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/index.php?action=read&msg_id=" . intval(xoops_getrequest('msg_id')));
+		$root->mController->executeHeader();
+		
+		$root->mController->setupModuleContext('pm');
+		$root->mLanguageManager->loadModuleMessageCatalog('pm');
+		
+		require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
+
+		$actionName = xoops_getrequest('action') == 'DeleteOne' ? 'DeleteOne' : 'read';
+		
+		$moduleRunner =& new Pm_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 
 	function accessToViewpmsg()
 	{
+		//
+		// Boot the action frame of the user module directly.
+		//
 		$root =& XCube_Root::getSingleton();
-		$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/index.php");
+		$root->mController->executeHeader();
+		
+		$root->mController->setupModuleContext('pm');
+		$root->mLanguageManager->loadModuleMessageCatalog('pm');
+		
+		require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
+
+		$actionName = xoops_getrequest('action') == 'delete' ? 'delete' : 'default';
+		
+		$moduleRunner =& new Pm_ActionFrame(false);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 	
 	function accessToPmlite()
 	{
-		$root =& XCube_Root::getSingleton();
-		
 		//
-		// Does this access request reply mode?
+		// Boot the action frame of the user module directly.
 		//
-		$params = array();
-		if (xoops_getrequest('reply') != null) {
-			$params[] = "reply=" . (xoops_getrequest('reply') ? 1 : 0);
-		}
-		
-		if (xoops_getrequest('msg_id') != null) {
-			$params[] = "msg_id=" . intval(xoops_getrequest('msg_id'));
-		}
-		
-		if (xoops_getrequest('to_userid') != null) {
-			$params[] = "to_userid=" . intval(xoops_getrequest('to_userid'));
-		}
-		
-		if (count($params) > 0) {
-			$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/pmlite.php?" . implode('&', $params));
-		}
-		else {
-			$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/pmlite.php");
-		}
+		$root =& XCube_Root::getSingleton();
+		$root->mController->executeHeader();
+		
+		$root->mController->setupModuleContext('pm');
+		$root->mLanguageManager->loadModuleMessageCatalog('pm');
+		
+		$root->mController->setDialogMode(true);
+
+		require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
+
+		$moduleRunner =& new Pm_ActionFrame(false);
+		$moduleRunner->setActionName('pmlite');
+
+		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
+
+		$root->mController->execute();
+		
+		$root->mController->executeView();
 	}
 
 }

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:16:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:16:27 +0900
Subject: [xoops-cvslog 5870] CVS update: xoops2jp/html/modules/pm/service
Message-ID: <20061116081627.6BE372AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/service/Service.class.php
diff -u xoops2jp/html/modules/pm/service/Service.class.php:1.1.2.1 xoops2jp/html/modules/pm/service/Service.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/service/Service.class.php:1.1.2.1	Wed Nov 15 19:41:43 2006
+++ xoops2jp/html/modules/pm/service/Service.class.php	Thu Nov 16 17:16:27 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Pm
- * @version $Id: Service.class.php,v 1.1.2.1 2006/11/15 10:41:43 minahito Exp $
+ * @version $Id: Service.class.php,v 1.1.2.2 2006/11/16 08:16:27 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -28,7 +28,7 @@
 		$uid = $root->mContext->mRequest->getRequest('uid');
 		
 		if ($uid > 0) {
-			return XOOPS_MODULE_URL . "/pm/index.php";
+			return XOOPS_URL . "/viewpmsg.php";
 		}
 		
 		return "";

From minahito ＠ users.sourceforge.jp  Thu Nov 16 17:16:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 17:16:46 +0900
Subject: [xoops-cvslog 5871] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20061116081646.F3C3A2AC0B6@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.2 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.3
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.2	Sat Nov  4 17:09:01 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Thu Nov 16 17:16:46 2006
@@ -4,7 +4,7 @@
 &nbsp;&raquo;&raquo;&nbsp;<{$smarty.const._MD_PM_LANG_INBOX}>
 <br /><br />
 
-<form name="prvmsg" method="post" action="./index.php?action=delete">
+<form name="prvmsg" method="post" action="<{$xoops_url}>/viewpmsg.php?action=delete">
 <{xoops_token form=$actionForm}>
 <table border="0" cellspacing="1" cellpadding="4" width="100%" class="outer">
   <tr style="text-align:center;" valign="middle">
@@ -43,7 +43,7 @@
         <{$pm->get("from_userid")|xoops_user:"uname"}>
       </td>
       <td style="vertical-align:middle;">
-        <a href="./index.php?action=read&amp;msg_id=<{$pm->get('msg_id')}>"><{$pm->getShow('subject')}></a>
+        <a href="<{$xoops_url}>/readpmsg.php?msg_id=<{$pm->getShow('msg_id')}>"><{$pm->getShow('subject')}></a>
       </td>
       </td>
       <td style="text-align:center; vertical-align:middle;">
@@ -63,7 +63,7 @@
   <{else}>
     <tr class="foot" style="text-align:left;">
       <td colspan="6">
-        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send=1','pmlite',480,400);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
+        <input type="button" class="formButton" onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?send=1','pmlite',480,400);" value="<{$smarty.const._MD_PM_LANG__SEND}>" />
       </td>
     </tr>
   <{/if}>
Index: xoops2jp/html/modules/pm/templates/pm_delete_one.html
diff -u xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.4.2.1 xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.4.2.2
--- xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.4.2.1	Fri Oct 13 20:28:24 2006
+++ xoops2jp/html/modules/pm/templates/pm_delete_one.html	Thu Nov 16 17:16:46 2006
@@ -1,6 +1,6 @@
 <div><b><{$smarty.const._MD_PM_MESSAGE_CONFIRM_DELETE_PM}></b></div>
 
-<form method="post" action="./index.php?action=DeleteOne">
+<form method="post" action="<{$xoops_url}>/readpmsg.php?action=DeleteOne">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=msg_id value=$actionForm->get('msg_id')}>
   <table class="outer">
Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.2 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.2	Sat Nov  4 17:09:01 2006
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Thu Nov 16 17:16:46 2006
@@ -5,7 +5,7 @@
 <a href="index.php"><{$smarty.const._MD_PM_LANG_INBOX}></a>
 &nbsp;&raquo;&raquo;&nbsp;<{$privMessage->getShow('subject')}>
 
-<form action='./index.php?action=Read' method='post' name='delete<{$privMessage->getShow('msg_id')}>'>
+<form action='<{$xoops_url}>/readpmsg.php' method='post' name='delete<{$privMessage->getShow('msg_id')}>'>
   <table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%">
     <tr>
       <th <{if $sendUser->hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}></th>
@@ -37,7 +37,7 @@
     <tr class="foot">
       <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:left;">
         <!--- TODO check postr. See original readpmsg --->
-        <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',480,400);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._MD_PM_LANG_REPLY}>" title="<{$smarty.const._MD_PM_LANG_REPLY}>" /></a>
+        <a href='#' onclick="javascript:openWithSelfMain('<{$xoops_url}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',480,400);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._MD_PM_LANG_REPLY}>" title="<{$smarty.const._MD_PM_LANG_REPLY}>" /></a>
         <input type="hidden" name="delete" value="1" />  <!--- << check --->
         <input type="hidden" name="msg_id" value="<{$privMessage->getShow('msg_id')}>" />
         <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._MD_PM_LANG_DELETE}>" title="<{$smarty.const._MD_PM_LANG_DELETE}>" /></a>
@@ -46,11 +46,11 @@
     <tr>
       <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
         <{if $previousMessage}>
-          <a href="index.php?action=read&amp;msg_id=<{$previousMessage->getShow('msg_id')}>"><{$smarty.const._MD_PM_LANG__PREVIOUS}></a>
+          <a href="<{$xoops_url}>/readpmsg.php?msg_id=<{$previousMessage->getShow('msg_id')}>"><{$smarty.const._MD_PM_LANG__PREVIOUS}></a>
         <{/if}>
         <{if $nextMessage}>
           <{if $previousMessage}> | <{/if}>
-          <a href="index.php?action=read&amp;msg_id=<{$nextMessage->getShow('msg_id')}>"><{$smarty.const._MD_PM_LANG_NEXT}></a>
+          <a href="<{$xoops_url}>/readpmsg.php?msg_id=<{$nextMessage->getShow('msg_id')}>"><{$smarty.const._MD_PM_LANG_NEXT}></a>
         <{/if}>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Thu Nov 16 19:07:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 19:07:57 +0900
Subject: [xoops-cvslog 5872] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061116100757.EF06F2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/Legacy_SQLScanner.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/Legacy_SQLScanner.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/Legacy_SQLScanner.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/Legacy_SQLScanner.class.php:1.1.2.4	Mon Oct 30 18:52:45 2006
+++ xoops2jp/html/modules/legacy/admin/class/Legacy_SQLScanner.class.php	Thu Nov 16 19:07:57 2006
@@ -7,79 +7,6 @@
 class Legacy_SQLScanner extends EasyLex_SQLScanner
 {
 	var $mDB_PREFIX = "";
-	
-	function setDB_PREFIX($prefix)
-	{
-		$this->mDB_PREFIX = $prefix;
-	}
-
-	/**
-	 * Override.
-	 */	
-	function &getOperations()
-	{
-		$t_lines = array();
-		$t_tokens = array();
-		$depth = 0;
-		
-		foreach (array_keys($this->mTokens) as $key) {
-			if ($this->mTokens[$key]->mType == EASYLEX_SQL_OPEN_PARENTHESIS) {
-				$depth++;
-			}
-			elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_CLOSE_PARENTHESIS) {
-				$depth--;
-			}
-			
-			$t_tokens[] =& $this->mTokens[$key];
-			
-			if (count($t_tokens) > 1 && $depth == 0) {
-				if ($this->mTokens[$key]->mType == EASYLEX_SQL_SEMICOLON) {
-					$t_lines[] =& $t_tokens;
-					unset($t_tokens);
-					$t_tokens = array();
-				}
-				elseif ($this->mTokens[$key]->mType == EASYLEX_SQL_LETTER && (strtoupper($this->mTokens[$key]->mValue) =='CREATE' || strtoupper($this->mTokens[$key]->mValue) =='ALTER' || strtoupper($this->mTokens[$key]->mValue) =='INSERT')) {
-					array_pop($t_tokens);
-					$t_lines[] =& $t_tokens;
-					unset($t_tokens);
-					$t_tokens = array();
-					$t_tokens[] =& $this->mTokens[$key];
-				}
-			}
-		}
-		
-		if (count($t_tokens) > 0) {
-			$t_lines[] =& $t_tokens;
-			unset($t_tokens);
-		}
-		
-		foreach ($t_lines as $op) {
-			if (count($op) >= 3) {
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'CREATE' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'ALTER' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'TABLE' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-				if ($op[0]->mType == EASYLEX_SQL_LETTER && strtoupper($op[0]->mValue) == 'INSERT' &&
-				    $op[1]->mType == EASYLEX_SQL_LETTER && strtoupper($op[1]->mValue) == 'INTO' &&
-				    ($op[2]->mType == EASYLEX_SQL_LETTER || $op[2]->mType == EASYLEX_SQL_STRING_LITERAL)) {
-						$op[2]->mValue = $this->mDB_PREFIX . '_' . $op[2]->getValue();
-				}
-			}
-		}
-		
-		return $t_lines;
-	}
-}
-
-class Legacy_CubeStyleSQLScanner extends EasyLex_SQLScanner
-{
-	var $mDB_PREFIX = "";
 	var $mDirname = "";
 	
 	function setDB_PREFIX($prefix)

From minahito ＠ users.sourceforge.jp  Thu Nov 16 19:08:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 19:08:07 +0900
Subject: [xoops-cvslog 5873] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061116100807.E57FE2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.15 xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.16
--- xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php:1.1.2.15	Wed Nov 15 20:33:20 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUpdater.class.php	Thu Nov 16 19:08:07 2006
@@ -381,115 +381,6 @@
 		
 		return true;
 	}
-
-	/**
-	 * Tries to smart update all of preferences & notifications.
-	 * 
-	 * @todo This method is perhaps uncompleted. If you have written more smart
-	 *       function, please contribute it to us.
-	 * @note The utility method for the custom-update-installer.
-	 */
-	function _upgradePreferences()
-	{
-		$configHandler =& xoops_gethandler('config');
-		
-		//
-		// At the start, load config items of this time.
-		//
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('conf_modid', $this->_mTargetXoopsModule->get('mid')));
-		$criteria->add(new Criteria('conf_catid', 0));
-		
-		$activeConfigArr =& $configHandler->getConfigs($criteria);
-		
-		//
-		// Next, load config item from xoops_version.php.
-		//
-		$newConfigArr = array();
-		$t_configInfoArr = Legacy_ModuleInstallUtils::getConfigInfosFromManifesto($this->_mTargetXoopsModule);
-		
-		$count = 0;
-		if (is_array($t_configInfoArr)) {
-			foreach ($t_configInfoArr as $t_configInfo) {
-				$config =& $configHandler->createConfig();
-				$config->loadFromConfigInfo($this->_mTargetXoopsModule->get('mid'), $t_configInfo, $count++);
-				$newConfigArr[] =& $config;
-				unset($config);
-			}
-		}
-		
-		//
-		// If some active configs were deleted, remove them form database.
-		//
-		foreach (array_keys($activeConfigArr) as $t_actkey) {
-			$findFlag = false;
-			foreach (array_keys($newConfigArr) as $t_newkey) {
-				
-				if ($activeConfigArr[$t_actkey]->get('conf_name') == $newConfigArr[$t_newkey]->get('conf_name')) {
-					$findFlag = true;
-					if (!$activeConfigArr[$t_actkey]->isEqual($newConfigArr[$t_newkey])) {
-						//
-						// Update object
-						//
-						$activeConfigArr[$t_actkey]->set('conf_title', $newConfigArr[$t_newkey]->get('conf_title'));
-						$activeConfigArr[$t_actkey]->set('conf_value', $newConfigArr[$t_newkey]->get('conf_value'));
-						$activeConfigArr[$t_actkey]->set('conf_desc', $newConfigArr[$t_newkey]->get('conf_desc'));
-						$activeConfigArr[$t_actkey]->set('conf_formtype', $newConfigArr[$t_newkey]->get('conf_formtype'));
-						$activeConfigArr[$t_actkey]->set('conf_valuetype', $newConfigArr[$t_newkey]->get('conf_valuetype'));
-						
-						//
-						// Delete config options.
-						//
-						$t_optionArr =& $activeConfigArr[$t_actkey]->getOptionItems();
-						foreach (array_keys($t_optionArr) as $t_optionKey) {
-							$configHandler->_oHandler->delete($t_optionArr[$t_optionKey]);	//< Exception!!
-						}
-						
-						$activeConfigArr[$t_actkey]->setConfOptions($newConfigArr[$t_newkey]->getConfOptions());
-						
-						$configHandler->insertConfig($activeConfigArr[$t_actkey]);	//< FIXME need log.
-					}
-				}
-			}
-			
-			if (!$findFlag) {
-				$configHandler->deleteConfig($activeConfigArr[$t_actkey]);
-				unset($activeConfigArr[$t_actkey]);
-			}
-		}
-		
-		//
-		// If some new configs were registered, insert them into database.
-		//
-		$maxOrder = 0;
-		foreach (array_keys($activeConfigArr) as $t_actkey) {
-			if ($activeConfigArr[$t_actkey]->get('conf_order') > $maxOrder) {
-				$maxOrder = $activeConfigArr[$t_actkey]->get('conf_order');
-			}
-		}
-		
-		$order = $maxOrder + 1;
-		
-		foreach (array_keys($newConfigArr) as $t_newkey) {
-			$newFlag = true;
-			foreach (array_keys($activeConfigArr) as $t_actkey) {
-				if ($newConfigArr[$t_newkey]->isEqual($activeConfigArr[$t_actkey])) {
-					$newFlag = false;
-					break;
-				}
-			}
-			
-			if ($newFlag) {
-				$newConfigArr[$t_newkey]->set('conf_order', $order);
-				if ($configHandler->insertConfig($newConfigArr[$t_newkey])) {
-					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_INSERT_CONFIG, $newConfigArr[$t_newkey]->get('conf_name')));
-				}
-				else {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG, $newConfigArr[$t_newkey]->get('conf_name')));
-				}
-			}
-		}
-	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Nov 16 19:10:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 19:10:25 +0900
Subject: [xoops-cvslog 5874] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061116101025.8F1922AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.4	Wed Nov 15 22:26:50 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Thu Nov 16 19:10:25 2006
@@ -7,6 +7,7 @@
 
 define('LEGACY_INSTALLINFO_STATUS_LOADED', "loaded");
 define('LEGACY_INSTALLINFO_STATUS_UPDATED', "updated");
+define('LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED', "order_updated");
 define('LEGACY_INSTALLINFO_STATUS_NEW', "new");
 define('LEGACY_INSTALLINFO_STATUS_DELETED', "deleted");
 
@@ -294,15 +295,30 @@
 	{
 		$currentOrder = 0;
 		foreach (array_keys($this->mPreferences) as $idx) {
-			$this->mPreferences[$idx]->mOrder = $currentOrder++;
+			if ($this->mPreferences[$idx]->mOrder != $currentOrder) {
+				$this->mPreferences[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED;
+				$this->mPreferences[$idx]->mOrder = $currentOrder;
+			}
+			
+			$currentOrder++;
 		}
 		
 		foreach (array_keys($this->mComments) as $idx) {
-			$this->mComments[$idx]->mOrder = $currentOrder++;
+			if ($this->mComments[$idx]->mOrder != $currentOrder) {
+				$this->mComments[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED;
+				$this->mComments[$idx]->mOrder = $currentOrder;
+			}
+			
+			$currentOrder++;
 		}
 		
 		foreach (array_keys($this->mNotifications) as $idx) {
-			$this->mNotifications[$idx]->mOrder = $currentOrder++;
+			if ($this->mNotifications[$idx]->mOrder != $currentOrder) {
+				$this->mNotifications[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED;
+				$this->mNotifications[$idx]->mOrder = $currentOrder;
+			}
+			
+			$currentOrder++;
 		}
 	}
 	
@@ -317,6 +333,17 @@
 		return $ret;
 	}
 	
+	function &getNotify($name)
+	{
+		$ret = null;
+		
+		if (isset($this->mNotifications[$name])) {
+			return $this->mNotifications[$name];
+		}
+		
+		return $ret;
+	}
+	
 	/**
 	 * Updates the list of blocks by comparing with $collection.
 	 * @todo need delete comments' data
@@ -363,15 +390,21 @@
 		//
 		// Notifications
 		//
-		if (count($this->mNotifications) > 0 && count($collection->mNotifications) == 0) {
-			foreach (array_keys($this->mNotifications) as $idx) {
+		foreach (array_keys($this->mNotifications) as $idx) {
+			$t_preference =& $collection->getNotify($this->mNotifications[$idx]->mName);
+			if ($t_preference == null) {
 				$this->mNotifications[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_DELETED;
 			}
+			elseif (!$this->mNotifications[$idx]->isEqual($t_preference)) {
+				$this->mNotifications[$idx]->update($t_preference);
+			}
 		}
-		elseif (count($this->mNotifications) == 0 && count($collection->mNotifications) > 0) {
-			$this->mNotifications =& $collection->mNotifications;
-			foreach (array_keys($this->mNotifications) as $idx) {
-				$this->mNotifications[$idx]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
+		
+		foreach (array_keys($collection->mNotifications) as $idx) {
+			$name = $collection->mNotifications[$idx]->mName;
+			if (!isset($this->mNotifications[$name])) {
+				$this->add($collection->mNotifications[$name]);
+				$this->mNotifications[$name]->mStatus = LEGACY_INSTALLINFO_STATUS_NEW;
 			}
 		}
 	}
Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.13 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.14
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.13	Wed Nov 15 18:11:08 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Nov 16 19:10:25 2006
@@ -157,7 +157,7 @@
 		
 		if (isset($module->modinfo['cube_style']) && $module->modinfo['cube_style'] == true) {
 			require_once XOOPS_MODULE_PATH . "/legacy/admin/class/Legacy_SQLScanner.class.php";
-			$scanner =& new Legacy_CubeStyleSQLScanner();
+			$scanner =& new Legacy_SQLScanner();
 			$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
 			$scanner->setDirname($module->get('dirname'));
 			
@@ -850,7 +850,7 @@
 				case LEGACY_INSTALLINFO_STATUS_LOADED:
 					Legacy_ModuleInstallUtils::updateBlockTemplateByInfo($currentBlocks->mBlocks[$idx], $module, $log);
 					break;
-				
+					
 				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updateBlockByInfo($currentBlocks->mBlocks[$idx], $module, $log);
 					break;
@@ -883,14 +883,14 @@
 		//
 		foreach (array_keys($currentPreferences->mPreferences) as $idx) {
 			switch ($currentPreferences->mPreferences[$idx]->mStatus) {
-				case LEGACY_INSTALLINFO_STATUS_LOADED:
-					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mPreferences[$idx], $module, $log);
-					break;
-				
 				case LEGACY_INSTALLINFO_STATUS_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
 					break;
 					
+				case LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED:
+					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mPreferences[$idx], $module, $log);
+					break;
+					
 				case LEGACY_INSTALLINFO_STATUS_NEW:
 					Legacy_ModuleInstallUtils::installPreferenceByInfo($currentPreferences->mPreferences[$idx], $module, $log);
 					break;
@@ -906,8 +906,11 @@
 		//
 		foreach (array_keys($currentPreferences->mComments) as $idx) {
 			switch ($currentPreferences->mComments[$idx]->mStatus) {
-				case LEGACY_INSTALLINFO_STATUS_LOADED:
 				case LEGACY_INSTALLINFO_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updatePreferenceByInfo($currentPreferences->mComments[$idx], $module, $log);
+					break;
+					
+				case LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mComments[$idx], $module, $log);
 					break;
 					
@@ -926,10 +929,11 @@
 		//
 		foreach (array_keys($currentPreferences->mNotifications) as $idx) {
 			switch ($currentPreferences->mNotifications[$idx]->mStatus) {
-				case LEGACY_INSTALLINFO_STATUS_LOADED:
-					break;
-				
 				case LEGACY_INSTALLINFO_STATUS_UPDATED:
+					Legacy_ModuleInstallUtils::updatePreferenceByInfo($currentPreferences->mNotifications[$idx], $module, $log);
+					break;
+					
+				case LEGACY_INSTALLINFO_STATUS_ORDER_UPDATED:
 					Legacy_ModuleInstallUtils::updatePreferenceOrderByInfo($currentPreferences->mNotifications[$idx], $module, $log);
 					break;
 					
@@ -1168,7 +1172,7 @@
 		
 		$successFlag = true;
 		
-		$scanner =& new Legacy_CubeStyleSQLScanner();
+		$scanner =& new Legacy_SQLScanner();
 		$scanner->setDB_PREFIX(XOOPS_DB_PREFIX);
 		$scanner->setDirname($module->get('dirname'));
 		$scanner->setBuffer($query);

From minahito ＠ users.sourceforge.jp  Thu Nov 16 19:26:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 16 Nov 2006 19:26:17 +0900
Subject: [xoops-cvslog 5875] CVS update: xoops2jp/html/include
Message-ID: <20061116102617.BB0522AC0D8@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.8 xoops2jp/html/include/functions.php:1.2.8.19.2.9
--- xoops2jp/html/include/functions.php:1.2.8.19.2.8	Sat Nov 11 18:34:07 2006
+++ xoops2jp/html/include/functions.php	Thu Nov 16 19:26:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.8 2006/11/11 09:34:07 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.9 2006/11/16 10:26:17 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -32,25 +32,8 @@
  */
 function xoops_getrequest($name)
 {
-	if (!isset($_REQUEST[$name])) {
-		return null;
-	}
-	
-	if (!get_magic_quotes_gpc()) {
-		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : null;
-	}
-	
-	if(!is_array($_REQUEST[$name])) {
-		return stripslashes($_REQUEST[$name]);
-	}
-	else {
-		$ret = array();
-		foreach ($_REQUEST[$name] as $key => $value) {
-			$ret[$key] = stripslashes($value);
-		}
-		
-		return $ret;
-	}
+	$root =& XCube_Root::getSingleton();
+	return $root->mContext->mRequest->getRequest($name);
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:38:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:38:55 +0900
Subject: [xoops-cvslog 5876] CVS update: xoops2jp/html/core
Message-ID: <20061117103855.907942AC052@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Property.class.php
diff -u xoops2jp/html/core/XCube_Property.class.php:1.1.2.4 xoops2jp/html/core/XCube_Property.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_Property.class.php:1.1.2.4	Sat Oct  7 18:26:15 2006
+++ xoops2jp/html/core/XCube_Property.class.php	Fri Nov 17 19:38:55 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Property.class.php,v 1.1.2.4 2006/10/07 09:26:15 minahito Exp $
+ * @version $Id: XCube_Property.class.php,v 1.1.2.5 2006/11/17 10:38:55 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -187,6 +187,19 @@
 	function set($arg1, $arg2 = null)
 	{
 		if (is_array($arg1) && $arg2 == null) {
+			$this->reset();
+			foreach ($arg1 as $t_key => $t_value) {
+				$this->_set($t_key, $t_value);
+			}
+		}
+		elseif ($arg1 !== null && $arg2 !== null) {
+			$this->_set($arg1, $arg2);
+		}
+	}
+	
+	function add($arg1, $arg2 = null)
+	{
+		if (is_array($arg1) && $arg2 == null) {
 			foreach ($arg1 as $t_key => $t_value) {
 				$this->_set($t_key, $t_value);
 			}
@@ -225,6 +238,12 @@
 		return isset($this->mProperties[$index]) ? $this->mProperties[$index]->get() : null;
 	}
 	
+	function reset()
+	{
+		unset($this->mProperties);
+		$this->mProperties = array();
+	}
+	
 	function isArray()
 	{
 		return true;

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:39:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:39:48 +0900
Subject: [xoops-cvslog 5877] CVS update:
	xoops2jp/html/modules/user/admin/preload
Message-ID: <20061117103948.375012AC052@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:39:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:39:51 +0900
Subject: [xoops-cvslog 5878] CVS update:
	xoops2jp/html/modules/user/admin/preload
Message-ID: <20061117103951.DC1A82AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php:1.1.2.1
--- /dev/null	Fri Nov 17 19:39:51 2006
+++ xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php	Fri Nov 17 19:39:51 2006
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package user
+ * @version $Id: AdminPreload.class.php,v 1.1.2.1 2006/11/17 10:39:51 minahito Exp $
+ */
+
+class User_AdminPreload extends XCube_ActionFilter
+{
+	function preBlockFilter()
+	{
+		$this->mRoot->mDelegateManager->add('Legacy.Event.ThemeSettingChanged', 'User_AdminPreload::doThemeSettingChanged');
+	}
+	
+	function doThemeSettingChanged($mainTheme, $selectableThemes)
+	{
+		$root =& XCube_Root::getSingleton();
+		$db =& $root->mController->mDB;
+		$table = $db->prefix('users');
+		
+		$mainTheme = $db->quoteString($mainTheme);
+		
+		$t_conds = array();
+		foreach ($selectableThemes as $theme) {
+			$t_conds[] = "theme <> " . $db->quoteString($theme);
+		}
+		
+		$sql = "UPDATE ${table} SET theme=${mainTheme} WHERE " . join(' AND ' , $t_conds);
+
+		$db->query($sql);
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:40:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:40:09 +0900
Subject: [xoops-cvslog 5879] CVS update:
	xoops2jp/html/modules/user/admin/preload
Message-ID: <20061117104009.F2D262AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/preload/index.html
diff -u /dev/null xoops2jp/html/modules/user/admin/preload/index.html:1.1.2.1
--- /dev/null	Fri Nov 17 19:40:09 2006
+++ xoops2jp/html/modules/user/admin/preload/index.html	Fri Nov 17 19:40:09 2006
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:40:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:40:50 +0900
Subject: [xoops-cvslog 5880] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061117104050.3654D2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php:1.1.2.3	Mon Oct 23 18:34:46 2006
+++ xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php	Fri Nov 17 19:40:50 2006
@@ -76,6 +76,8 @@
 			}
 		}
 		
+		$this->mState->postFilter($this->mObjects, $this->mActionForm);
+		
 		return LEGACY_FRAME_VIEW_SUCCESS;
 	}
 
@@ -183,6 +185,10 @@
 	{
 	}
 	
+	function postFilter(&$objectArr, &$actionForm)
+	{
+	}
+	
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
 	}
@@ -219,6 +225,25 @@
 		return $permHandler->checkRight('module_admin', $module->get('mid'), $xoopsUser->getGroups());
 	}
 	
+	function postFilter(&$objectArr, &$actionForm)
+	{
+		$themeName = null;
+		$allowedThemes = null;
+		foreach (array_keys($objectArr) as $key) {
+			$name = $objectArr[$key]->get('conf_name');
+			if ($name == 'theme_set') {
+				$themeName = $objectArr[$key]->getConfValueForOutput();
+			}
+			elseif ($name == 'theme_set_allowed') {
+				$allowedThemes = $actionForm->get('theme_set_allowed');
+			}
+		}
+		
+		if ($name != null && $allowedThemes != null) {
+			XCube_DelegateUtils::call('Legacy.Event.ThemeSettingChanged', $themeName, $allowedThemes);
+		}
+	}
+	
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
 		$controller->executeForward("./index.php?action=PreferenceList");

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:40:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:40:59 +0900
Subject: [xoops-cvslog 5881] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061117104059.340D32AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.3	Sat Oct 21 20:34:18 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php	Fri Nov 17 19:40:59 2006
@@ -107,6 +107,8 @@
 				$this->mMainTheme = $themeName;
 			}
 		}
+		
+		XCube_DelegateUtils::call('Legacy.Event.ThemeSettingChanged', $this->mMainTheme, $t_themeArr);
 
 		return $this->getDefaultView($controller, $xoopsUser);
 	}

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:41:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:41:24 +0900
Subject: [xoops-cvslog 5882] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061117104124.B55872AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_themes.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.2 xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.3
--- xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.2	Sun Oct 15 01:27:10 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_themes.php	Fri Nov 17 19:41:24 2006
@@ -7,6 +7,14 @@
 		return null;
 	}
 	
+    $block = array();
+	if (xoops_getenv('REQUEST_METHOD') == 'POST') {
+		$block['isEnableChanger'] = 0;
+		return $block;
+	}
+	
+	$block['isEnableChanger'] = 1;
+	
     $theme_options = array();
     foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
         $theme_option['name'] = $theme;
@@ -18,7 +26,6 @@
         $theme_options[] = $theme_option;
     }
 	
-    $block = array();
     $block['count'] = count($xoopsConfig['theme_set_allowed']);
     $block['mode'] = $options[0];
     $block['width'] = $options[1];

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:41:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:41:41 +0900
Subject: [xoops-cvslog 5883] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061117104141.4CC232AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/blocks.php
diff -u xoops2jp/html/modules/legacy/language/japanese/blocks.php:1.1.2.2 xoops2jp/html/modules/legacy/language/japanese/blocks.php:1.1.2.3
--- xoops2jp/html/modules/legacy/language/japanese/blocks.php:1.1.2.2	Sun Oct 15 01:42:05 2006
+++ xoops2jp/html/modules/legacy/language/japanese/blocks.php	Fri Nov 17 19:41:41 2006
@@ -33,4 +33,6 @@
 
 define('_MB_LEGACY_LANG_RECOMMENDSITE', "当サイトを友達に薦める");
 
+define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "ただいまテーマチェンジャーはご利用になれません");
+
 ?>

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:41:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:41:41 +0900
Subject: [xoops-cvslog 5884] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061117104141.70C4F2AC092@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/blocks.php
diff -u xoops2jp/html/modules/legacy/language/english/blocks.php:1.1.2.2 xoops2jp/html/modules/legacy/language/english/blocks.php:1.1.2.3
--- xoops2jp/html/modules/legacy/language/english/blocks.php:1.1.2.2	Sun Oct 15 01:41:42 2006
+++ xoops2jp/html/modules/legacy/language/english/blocks.php	Fri Nov 17 19:41:41 2006
@@ -33,4 +33,6 @@
 
 define('_MB_LEGACY_LANG_RECOMMENDSITE', "Recommend this Site to a Friend");
 
+define('_MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE', "Sorry, you can't change themes now.");
+
 ?>

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:42:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:42:01 +0900
Subject: [xoops-cvslog 5885] CVS update: xoops2jp/html/modules/legacy/preload
Message-ID: <20061117104201.F0BAF2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.4 xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.4	Wed Nov 15 13:18:32 2006
+++ xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php	Fri Nov 17 19:42:01 2006
@@ -47,6 +47,7 @@
 		if (!empty($_POST['xoops_theme_select']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
 			$this->mRoot->mContext->setThemeName($_POST['xoops_theme_select']);
 			$_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
+			$controller->executeForward($GLOBALS['xoopsRequestUri']);
 		} elseif (!empty($_SESSION['xoopsUserTheme']) && $this->_isSelectableTheme($_SESSION['xoopsUserTheme'])) {
 			$this->mRoot->mContext->setThemeName($_SESSION['xoopsUserTheme']);
 		}

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:42:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:42:14 +0900
Subject: [xoops-cvslog 5886] CVS update:
	xoops2jp/html/modules/legacy/templates/blocks
Message-ID: <20061117104214.0F87C2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html
diff -u xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.2	Sun Oct 15 01:45:15 2006
+++ xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html	Fri Nov 17 19:42:13 2006
@@ -1,18 +1,22 @@
-<div style="text-align: center;">
-<form action="index.php" method="post">
-<{if $block.mode==1}>
-  <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" title="screenshot" width="<{$block.width}>" /><br />
-  <select id="xoops_theme_select" name="xoops_theme_select" onchange="showImgSelected('xoops_theme_img','xoops_theme_select','themes','/screenshot.png', '<{$xoops_url}>');">
+<{if $block.isEnableChanger == false}>
+  <{$smarty.const._MB_LEGACY_MESSAGE_CAN_NOT_THEME_CHANGE}>
 <{else}>
-  <select id="xoops_theme_select" name="xoops_theme_select" onchange="submit();" size="3">
+  <div style="text-align: center;">
+  <form action="#" method="post">
+  <{if $block.mode==1}>
+    <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" title="screenshot" width="<{$block.width}>" /><br />
+    <select id="xoops_theme_select" name="xoops_theme_select" onchange="showImgSelected('xoops_theme_img','xoops_theme_select','themes','/screenshot.png', '<{$xoops_url}>');">
+  <{else}>
+    <select id="xoops_theme_select" name="xoops_theme_select" onchange="submit();" size="3">
+  <{/if}>
+  <{foreach item=theme_option from=$block.theme_options}>
+      <option value="<{$theme_option.name}>" <{$theme_option.selected}> ><{$theme_option.name}></option>
+  <{/foreach}>
+    </select>
+  <{if $block.mode==1}>
+    <input type="submit" value="<{$smarty.const._GO}>" />
+  <{/if}>
+  <br />(<{"<b>"|cat:$block.count|cat:"</b>"|string_format:$smarty.const._MB_LEGACY_LANG_NUMTHEME}>)<br />
+  </form>
+  </div>
 <{/if}>
-<{foreach item=theme_option from=$block.theme_options}>
-    <option value="<{$theme_option.name}>" <{$theme_option.selected}> ><{$theme_option.name}></option>
-<{/foreach}>
-  </select>
-<{if $block.mode==1}>
-  <input type="submit" value="<{$smarty.const._GO}>" />
-<{/if}>
-<br />(<{"<b>"|cat:$block.count|cat:"</b>"|string_format:$smarty.const._MB_LEGACY_LANG_NUMTHEME}>)<br />
-</form>
-</div>

From minahito ＠ users.sourceforge.jp  Fri Nov 17 19:42:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 19:42:46 +0900
Subject: [xoops-cvslog 5887] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061117104246.ED80D2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.9 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.10
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.9	Sat Nov 11 13:20:35 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Fri Nov 17 19:42:46 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.05;
+$modversion['version'] = 2.06;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From minahito ＠ users.sourceforge.jp  Fri Nov 17 20:21:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 20:21:33 +0900
Subject: [xoops-cvslog 5888] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061117112133.E5EAA2AC13F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php:1.1.2.4	Fri Nov 17 19:40:59 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ThemeListAction.class.php	Fri Nov 17 20:21:33 2006
@@ -33,7 +33,15 @@
 	{
 		$this->_setupObject();
 		$this->_setupActionForm();
-		$this->mMainTheme = $controller->mRoot->mContext->getThemeName();
+		
+		$handler =& xoops_gethandler('config');
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('conf_name', 'theme_set'));
+		$criteria->add(new Criteria('conf_catid', XOOPS_CONF));
+		
+		$configs =& $handler->getConfigs($criteria);
+		$this->mMainTheme = $configs[0]->get('conf_value');
 	}
 	
 	function _setupObject()

From minahito ＠ users.sourceforge.jp  Fri Nov 17 20:21:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 17 Nov 2006 20:21:51 +0900
Subject: [xoops-cvslog 5889] CVS update: xoops2jp/html/modules/legacy/preload
Message-ID: <20061117112151.B15122AC13F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.5 xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.5	Fri Nov 17 19:42:01 2006
+++ xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php	Fri Nov 17 20:21:51 2006
@@ -61,6 +61,7 @@
 		$userTheme = $xoopsUser->get('theme');
 		if (in_array($userTheme, $this->mRoot->mContext->getXoopsConfig('theme_set_allowed'))) {
 			$_SESSION['xoopsUserTheme'] = $userTheme;
+			$this->mRoot->mContext->setThemeName($userTheme);
 		}
 	}
 	

From nobunobu ＠ users.sourceforge.jp  Fri Nov 17 22:31:37 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 17 Nov 2006 22:31:37 +0900
Subject: [xoops-cvslog 5890] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061117133137.C008A2AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.13 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.14
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.13	Sat Nov 11 18:34:44 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Fri Nov 17 22:31:37 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.13 2006/11/11 09:34:44 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.14 2006/11/17 13:31:37 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -68,14 +68,15 @@
 				    $this->_tpl_vars[$t_key] = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$t_value]), ENT_QUOTES);
 				}
 			}
-			return parent::get_template_vars($name);
+			$value =& parent::get_template_vars($name);
 		}
 		elseif (isset($this->_mContextReserve[$name])) {
 			$value = htmlspecialchars($root->mContext->getAttribute($this->_mContextReserve[$name]), ENT_QUOTES);
 		}
 		else {
-			return parent::get_template_vars($name);
+			$value =& parent::get_template_vars($name);
 		}
+		return $value;
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 17:44:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 17:44:09 +0900
Subject: [xoops-cvslog 5891] CVS update: xoops2jp/html
Message-ID: <20061118084409.086902AC08B@users.sourceforge.jp>

Index: xoops2jp/html/edituser.php
diff -u xoops2jp/html/edituser.php:1.2.8.5 xoops2jp/html/edituser.php:1.2.8.5.2.1
--- xoops2jp/html/edituser.php:1.2.8.5	Wed Jul 19 19:25:14 2006
+++ xoops2jp/html/edituser.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: edituser.php,v 1.2.8.5 2006/07/19 10:25:14 minahito Exp $
+// $Id: edituser.php,v 1.2.8.5.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
Index: xoops2jp/html/pmlite.php
diff -u xoops2jp/html/pmlite.php:1.2.8.4 xoops2jp/html/pmlite.php:1.2.8.4.2.1
--- xoops2jp/html/pmlite.php:1.2.8.4	Tue Jul 11 10:33:49 2006
+++ xoops2jp/html/pmlite.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: pmlite.php,v 1.2.8.4 2006/07/11 01:33:49 minahito Exp $
+// $Id: pmlite.php,v 1.2.8.4.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
Index: xoops2jp/html/readpmsg.php
diff -u xoops2jp/html/readpmsg.php:1.2.8.2 xoops2jp/html/readpmsg.php:1.2.8.2.2.1
--- xoops2jp/html/readpmsg.php:1.2.8.2	Tue Jul 11 10:33:36 2006
+++ xoops2jp/html/readpmsg.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: readpmsg.php,v 1.2.8.2 2006/07/11 01:33:36 minahito Exp $
+// $Id: readpmsg.php,v 1.2.8.2.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
Index: xoops2jp/html/register.php
diff -u xoops2jp/html/register.php:1.2.8.3 xoops2jp/html/register.php:1.2.8.3.2.1
--- xoops2jp/html/register.php:1.2.8.3	Wed Jul 19 19:25:14 2006
+++ xoops2jp/html/register.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: register.php,v 1.2.8.3 2006/07/19 10:25:14 minahito Exp $
+// $Id: register.php,v 1.2.8.3.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
Index: xoops2jp/html/userinfo.php
diff -u xoops2jp/html/userinfo.php:1.2.8.4 xoops2jp/html/userinfo.php:1.2.8.4.2.1
--- xoops2jp/html/userinfo.php:1.2.8.4	Wed Jul 19 19:25:14 2006
+++ xoops2jp/html/userinfo.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: userinfo.php,v 1.2.8.4 2006/07/19 10:25:14 minahito Exp $
+// $Id: userinfo.php,v 1.2.8.4.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //
Index: xoops2jp/html/viewpmsg.php
diff -u xoops2jp/html/viewpmsg.php:1.2.8.3 xoops2jp/html/viewpmsg.php:1.2.8.3.2.1
--- xoops2jp/html/viewpmsg.php:1.2.8.3	Tue Jul 11 10:33:59 2006
+++ xoops2jp/html/viewpmsg.php	Sat Nov 18 17:44:08 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: viewpmsg.php,v 1.2.8.3 2006/07/11 01:33:59 minahito Exp $
+// $Id: viewpmsg.php,v 1.2.8.3.2.1 2006/11/18 08:44:08 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 17:44:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 17:44:09 +0900
Subject: [xoops-cvslog 5892] CVS update: xoops2jp/html/include
Message-ID: <20061118084409.2E9B62AC0D5@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.2.8.5 xoops2jp/html/include/checklogin.php:1.2.8.5.2.1
--- xoops2jp/html/include/checklogin.php:1.2.8.5	Tue Jul 25 18:07:54 2006
+++ xoops2jp/html/include/checklogin.php	Sat Nov 18 17:44:09 2006
@@ -3,11 +3,11 @@
  @package base
  @deprecated
  */
-// $Id: checklogin.php,v 1.2.8.5 2006/07/25 09:07:54 minahito Exp $
+// $Id: checklogin.php,v 1.2.8.5.2.1 2006/11/18 08:44:09 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 17:44:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 17:44:09 +0900
Subject: [xoops-cvslog 5893] CVS update: xoops2jp/html/modules/legacyRender
Message-ID: <20061118084409.529FA2AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/xoops_version.php
diff -u xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.2 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.3
--- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.2	Thu Nov  2 16:38:49 2006
+++ xoops2jp/html/modules/legacyRender/xoops_version.php	Sat Nov 18 17:44:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: xoops_version.php,v 1.1.2.11.2.2 2006/11/02 07:38:49 minahito Exp $
+ * @version $Id: xoops_version.php,v 1.1.2.11.2.3 2006/11/18 08:44:09 nobunobu Exp $
  * @package legacyRender
  */
 
@@ -98,7 +98,7 @@
 		"description"=>"_MI_LR_FOOTER_DESC",
 		"formtype"=>"textarea",
 		"valuetype"=>"text",
-		"default"=>"Powered by XOOPS Cube 2.1&copy; 2001-2006 <a href=\"http://www.xoopscube.org/\" target=\"_blank\">The XOOPS Cube Project</a>"
+		"default"=>"Powered by XOOPS Cube 2.1&copy; 2001-2006 <a href=\"http://xoopscube.org/\" target=\"_blank\">The XOOPS Cube Project</a>"
 	);
 
 $modversion['config'][]=array (

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 17:44:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 17:44:09 +0900
Subject: [xoops-cvslog 5894] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061118084409.784392AC0E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.7 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.7	Wed Nov  8 15:41:22 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Sat Nov 18 17:44:09 2006
@@ -87,7 +87,7 @@
 </tr>
 </table>
 
-<div id="footer">Powered by&nbsp;<{$smarty.const.XOOPS_VERSION}>&copy; 2001-2006 <a href="http://www.xoopscube.org/" target="_blank">The XOOPS Cube Project</a></div>
+<div id="footer">Powered by&nbsp;<{$smarty.const.XOOPS_VERSION}>&copy; 2001-2006 <a href="http://xoopscube.org/" target="_blank">The XOOPS Cube Project</a></div>
 
 </div>
 </body>

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 17:44:09 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 17:44:09 +0900
Subject: [xoops-cvslog 5895] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061118084409.9E2112AC0D5@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.10 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.11
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.10	Fri Nov 17 19:42:46 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Sat Nov 18 17:44:09 2006
@@ -3,7 +3,7 @@
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 21:59:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 21:59:51 +0900
Subject: [xoops-cvslog 5896] CVS update: xoops2jp/html
Message-ID: <20061118125951.78FBC2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/lostpass.php
diff -u xoops2jp/html/lostpass.php:1.2.8.3 xoops2jp/html/lostpass.php:1.2.8.3.2.1
--- xoops2jp/html/lostpass.php:1.2.8.3	Wed Jul 19 19:25:14 2006
+++ xoops2jp/html/lostpass.php	Sat Nov 18 21:59:51 2006
@@ -1,9 +1,9 @@
 <?php
-// $Id: lostpass.php,v 1.2.8.3 2006/07/19 10:25:14 minahito Exp $
+// $Id: lostpass.php,v 1.2.8.3.2.1 2006/11/18 12:59:51 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
+//                     <http://xoopscube.org/>                           //
 //  ------------------------------------------------------------------------ //
 //  This program is free software; you can redistribute it and/or modify     //
 //  it under the terms of the GNU General Public License as published by     //

From nobunobu ＠ users.sourceforge.jp  Sat Nov 18 23:10:59 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 18 Nov 2006 23:10:59 +0900
Subject: [xoops-cvslog 5897] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061118141059.C4CDC2AC00F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php:1.1.2.2	Sun Oct 15 00:43:44 2006
+++ xoops2jp/html/modules/legacy/actions/SearchResultsAction.class.php	Sat Nov 18 23:10:59 2006
@@ -64,7 +64,7 @@
 		if (is_object($service)) {
 			$client =& $root->mServiceManager->createClient($service);
 
-			$this->mModules =& $client->call('getActiveModules', array());
+			$this->mModules = $client->call('getActiveModules', array());
 			
 			$this->mActionForm->update($params);
 			

From minahito ＠ users.sourceforge.jp  Mon Nov 20 13:01:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 13:01:31 +0900
Subject: [xoops-cvslog 5898] CVS update:
	xoops2jp/html/modules/user/admin/preload
Message-ID: <20061120040131.087322AC1C1@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php
diff -u xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php:1.1.2.1	Fri Nov 17 19:39:51 2006
+++ xoops2jp/html/modules/user/admin/preload/AdminPreload.class.php	Mon Nov 20 13:01:30 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: AdminPreload.class.php,v 1.1.2.1 2006/11/17 10:39:51 minahito Exp $
+ * @version $Id: AdminPreload.class.php,v 1.1.2.2 2006/11/20 04:01:30 minahito Exp $
  */
 
 class User_AdminPreload extends XCube_ActionFilter
@@ -20,6 +20,7 @@
 		$mainTheme = $db->quoteString($mainTheme);
 		
 		$t_conds = array();
+		$t_conds[] = "theme <> " . $db->quoteString('');
 		foreach ($selectableThemes as $theme) {
 			$t_conds[] = "theme <> " . $db->quoteString($theme);
 		}

From nobunobu ＠ users.sourceforge.jp  Mon Nov 20 15:20:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 20 Nov 2006 15:20:08 +0900
Subject: [xoops-cvslog 5899] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061120062008.37F002AC1D2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.10 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.10	Wed Nov 15 20:33:20 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Mon Nov 20 15:20:08 2006
@@ -95,10 +95,10 @@
 				$sql = "DROP TABLE " . $t_tableName;
 				
 				if ($db->query($sql)) {
-					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $db->prefix($t_tableName)));
+					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_DROP_TABLE, $t_tableName));
 				}
 				else {
-					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $db->prefix($t_tableName)));
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_LEGACY_ERROR_DROP_TABLE, $t_tableName));
 				}
 			}
 		}

From minahito ＠ users.sourceforge.jp  Mon Nov 20 18:23:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 18:23:39 +0900
Subject: [xoops-cvslog 5900] CVS update:
	xoops2jp/html/modules/user/language/english/help
Message-ID: <20061120092339.D666E2AC109@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/help/basic.html
diff -u /dev/null xoops2jp/html/modules/user/language/english/help/basic.html:1.1.2.1
--- /dev/null	Mon Nov 20 18:23:39 2006
+++ xoops2jp/html/modules/user/language/english/help/basic.html	Mon Nov 20 18:23:39 2006
@@ -0,0 +1,33 @@
+<h4>User module - Basic Knowledge</h4>
+<p>At first, you must understand five elemental things which are User, Group, Rank, Avatar, Permission. This section explains the basic of them to you. For more informations, you should read each sections.</p>
+
+<h5>User</h5>
+<p>This is meaning a user account. A user account has login informations on Xoops Authentication and fixed profile fields. Uname, E-mail address and Password are must to work this site. User accounts are added by administration and User Registration.</p>
+
+<h5>Group</h5>
+<p>This is meaning a group of user accounts. A user account can belong to plural groups. A group has Permission for modules. In this module, the thing having permissions is not users but groups. Permissions of users are decided by groups which users belong to.</p>
+
+<p>You may create groups for both of permission management and user list. But, you must know three fixed-groups. These special groups have been created in the installation, and it's unpossible to delete.</p>
+
+<h6>Webmasters</h6>
+<p>Users belonging has the permission to do anything. In other words, users which can belong to this group are the webmaster only. You pay attention to that this groups are allowed to do anything. In case where you hope to leave your friends a part of site management, you don't put your friends to this group.</p>
+
+<p>Let me say that again. This group has the permission to do anything.</p>
+
+<h6>Registered Users</h6>
+<p>Common users belong to this module. User Registration of this module uses this group as an initial group which a new user belongs to. In most of cases, you should not give admin permissions to this group.</p>
+
+<h6>Anonymous Users</h6>
+<p>Access which doesn't login is handled as this group. This group is really special group and a kind of virtual groups. This group should not have members.</p>
+
+<h5>Rank</h5>
+<p>Rank is one of user's profiles. Rank consists of the symbol image and the title. A rank of a user is decided by number of his posts. This feature is a kind of jokes which make your site exciting. Therefore, you don't need to worry that ranks give some effects to Xoops Authentication.</p>
+
+<h5>Avatar</h5>
+<p>Avatar is one of user's profiles, too. This is a personal graphical label. There is two kinds of avatars. One of them is System Avatar, which administrators prepare. Another one is Custom Avatar, which users upload their favorite image file.</p>
+
+<h5>Permission</h5>
+<p>Permission is action permissions of groups. This module can edit the basic of permissions. If you hope to edit module-specific permissions, use the permission editor of each modules.</p>
+
+<p>Permissions of a user are decided by union of all group permissions which a user belongs to.</p>
+
Index: xoops2jp/html/modules/user/language/english/help/preferences.html
diff -u /dev/null xoops2jp/html/modules/user/language/english/help/preferences.html:1.1.2.1
--- /dev/null	Mon Nov 20 18:23:39 2006
+++ xoops2jp/html/modules/user/language/english/help/preferences.html	Mon Nov 20 18:23:39 2006
@@ -0,0 +1,120 @@
+<h4>User module - Preferences</h4>
+<h5>Allow new user registration?</h5>
+<p>Specifies whether anonymous users can register to your site. In case of YES, register.php is available, and <span class='highlight_block_name'>Login Block</span> shows the link to register.php. Even if case of No, you can add a new user in the user management.</p>
+
+<h5>Minimum length of password required</h5>
+<p>Specifies the minimum length of password. Long password makes a password harder to guess. Of course, the length isn't all factors of strong password. But, you should specify five or longer.</p>
+
+<h5>Minimum length of username required</h5>
+<p>Specifies the minimum length of username. This option isn't about security. Decide with just your preferences.</p>
+
+<h5>Allow users to change email address?</h5>
+<p>Specifies whether users can change their email address in user profile editor (edituser.php). In fact, this module doesn't send confirm-mail for users who changes email address.</p>
+
+<h5>Notify by mail when a new user is registered?</h5>
+<p>In the case where this option is Yes, the group specified by the next option can receive notification mail about new users' registrations.</p>
+
+<h5>Select a group to which new user notification mail will be sent</h5>
+<p>Specifies the group which get notification mail in the case where the previous option is Yes. Webmaster group is good usually for this option.</p>
+
+<h5>Select activation type of newly registered users</h5>
+<p>After registering, a user must be activated. Being activated means being able to log in. There are several ways to activate users.</p>
+
+<h6>Require activation by user</h6>
+<p>This is far and away the most popular setting in the world of website systems. A user gets an activation email when they register. They can then become able to login by clicking the activation URL on the mail. This choise is good for most of cases.</p>
+
+<h6>Activate automatically</h6>
+<p>In simple terms, there is really no activation mechanism, everyone is activated straight away. But, if you use this, you should pay attention to BOT. BOT may register and submit SPAM automatically. Therefore, this choice is good for closed segment.</p>
+
+<h6>Activation by administrators</h6>
+<p>A user can only be activated by direct approval from the group specified by the next option. This selection may force hard work to activators.</p>
+
+<h5>Select the level of strictness for username filtering</h5>
+<p>Select amount of freedom for username form following choises.</p>
+
+<h6>Strict (Only alphabets and numbers)</h6>
+<p>With this choice, your site allows the following characters for user name.</p>
+<ul>
+  <li>Alphabets without case sensitive.</li>
+  <li>Numbers.</li>
+  <li>Under score (_).</li>
+  <li>Hyphen (-).</li>
+</ul>
+
+<h6>Medium</h6>
+<p>With this choice, your site allows the following characters for user name.</p>
+<ul>
+  <li>Alphabets without case sensitive.</li>
+  <li>Numbers</li>
+  <li>Underscore(_).</li>
+  <li>Hyphen(-).</li>
+  <li>Less than character(&lt;).</li>
+  <li>Greater than character(&gt;).</li>
+  <li>Comma(,).</li>
+  <li>Period(.).</li>
+  <li>Dollar($).</li>
+  <li>Percent(%).</li>
+  <li>Sharp(#).</li>
+  <li>At sign(@).</li>
+  <li>Exclamation point(!).</li>
+  <li>Single quotation(').</li>
+  <li>Double quotation(&quot;).</li>
+</ul>
+
+<h6>Light - allow 2byte characters</h6>
+<p>With this choice, your site allows all characters except control code. But, the choice may cause troubles for some modules. Therefore, this module doesn't recommend the choice.</p>
+
+<h5>Allow custom avatar upload?</h5>
+<p>Specifies whether a user can upload his favorite image file as his avatar to this site. Even if case of No, a user can choose his avatar from system avatars which administrators prepare.</p>
+
+<h5>Minimum posts required</h5>
+<p>If allow custom avatar upload, you don't need to touch this option.</p>
+
+<p>This is the minimum number of posts which users can get right of uploading custom avatar. It may have have poor taste. Zero is good.</p>
+
+<h5>Avatar image max width (pixel)</h5>
+<p>If you don't allow custom avatar upload, you don't need to touch this option.</p>
+
+<p>Specifies the limit width for custom avatar. In the case where a user upload a wider image than this value, this module displays error messages.</p>
+
+<h5>Avatar image max hight (pixel)</h5>
+<p>If you don't allow custom avatar upload, you don't need to touch this option.</p>
+
+<p>Specifies the limit height for custom avatar. In the case where a user upload a higher image than this value, this module displays error messages.</p>
+
+<h5>Avatar image max filesize (byte)</h5>
+<p>If you don't allow custom avatar upload, you don't need to touch this option.</p>
+
+<p>Specifies the limit filesize for custom avatar. In the case where a user upload a larger image file than this value, this module displays error messages.</p>
+
+<h5>Allow users to delete own account?</h5>
+<p>Specifies whether users can delete own account in the user profile edit. In case of Yes, users can go to the account delete dialog through the link from the user profile (userinfo.php). Because these dialogs about deleting are very simple, you should edit templates of them --- user_delete.html, user_delete_success.html.</p>
+
+<h5>Execution confirmation message</h5>
+<p>This is the message displayed in the account delete dialog. If you don't allow users to delete own account, you don't need to touch this option.</p>
+
+<h5>Enter names that should not be selected as username</h5>
+<p>This is patterns which your site doesn't permit as username. Separate each with a |. This is case insensitive and regex enabled. In addition, this rule does not apply to the user management in the control panel.</p>
+
+<p>If you don't allow anonymous users to register to this site, you don't need to touch this option.</p>
+
+<h5>Enter emails that should not be used in user profile</h5>
+<p>This is patterns which your site doesn't permit as email address. Separate each with a |. This is case insensitive and regex enabled. In addition, this rule does not apply to the user management in the control panel.</p>
+
+<h5>Display disclaimer?</h5>
+<p>Specify whether the user registration shows the disclaimer specified by the next option.</p>
+
+<h5>Registration disclaimer</h5>
+<p>This is the disclaimer shown in the user registration for anonymous user. If the previous option is No, you don't need to touch this option.</p>
+
+<h5>Name for user cookies</h5>
+<p>Specifies the cookie name for web browsers. In most of cases, you don't need to change this.</p>
+
+<h5>Use SSL for login?</h5>
+<p>You must install the special additional login script to activate SSL login. In case of YES, <span class="highlight_block_name">Login Block</span> shows the link whose name is "SSL Login" specified by next options. These options are for the compatibility with XOOPS2 JP. Perhaps, you can find better solutions than this for SSL Login. The script is in "/extra" directory.</p>
+
+<h5>SSL Post variable name</h5>
+<p>This option is for SSL Login, too. Specifies a name of the POST-request variable.</p>
+
+<h5>URL where SSL login page is located</h5>
+<p>This option is for SSL Login, too. Specifies URL where you have installed the special additional login script.</p>
Index: xoops2jp/html/modules/user/language/english/help/help.html
diff -u xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1 xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1.2.1
--- xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1	Mon Jun  5 18:30:32 2006
+++ xoops2jp/html/modules/user/language/english/help/help.html	Mon Nov 20 18:23:39 2006
@@ -1,55 +1,17 @@
-<h4>Outline</h4>
-<ul>
-  <li>User module has general function of user and group management. It provides functions of 'Edit Users' and 'Groups' in XOOPS 2.0. System Configuration. By using the User Module, you can edit user accounts, change group permission, modify user rank, allow or disallow new user registration, send email messages to users and so on.</li>
-</ul>
-
-<h4>User Administration(Edit User)</h4>
-<ul>
-  <li>Administrators can add new user and edit registered user information.</li>
-  <li>To add new user to your site, please go to 'Add User'.</li>
-  <li>To modify registered user information, click a command button (pencil icon) at the right of the listed user.</li>
-  <li>To delete a user form your site, click a delete button (X marked icon) at the right of the listed user.</li>
-</ul>
-
-<h4>User Ranks</h4>
-<ul>
-  <li>Administrators can edit User Rank settings. User Rank is displayed on posts in forums and user profiles.</li>
-  <li>To modify a registered user rank setting, click a command button (pencil icon) at the right of the listed rank.</li>
-  <li>To delete a registered user rank setting, click delete button (X marked icon) at the right of the listed rank.</li>
-</ul>
-
-<h4>Edit Groups</h4>
-<ul>
-  <li>Administrators can edit group settings including permission to access blocks, modules and administration functions to each group.</li>
-  <li>To add new group to your site, please go to 'Add Group' at upper right of the page.</li>
-  <li>If you add new group to your site, name of the new group would be listed. After adding a new group, you need to modify the group settings.</li>
-  <li>To modify a registered user rank setting, click a command button (pencil icon) at the right of the listed groups.</li>
-  <li>To add a new user to the group, click a command button (add member) at the right of the listed groups.</li>
-  <li>To delete users from group, select a user from group members list, then click delete button.</li>
-</ul>
-
-<h5>(Tips)</h5>
-<ul>
-  <li>Each user may belong to multiple groups. For easy maintenance, we suggest to set up a general (standard) group, then add special groups which has minimum privileges as needed.</li>
-  <li>You can check the settings of each group by clicking command button (property) at the right of the listed groups. To check group settings, we recommend to check the property, to add test user ID for each group, then login with the test ID and see how your site looks in each group.</li>
-</ul>
-
-<h4>Mail Users</h4>
-<ul>
-  <li>Administrators can send mass email or newsletter to registered users. You may narrow down recipient of emails by registered date, last login date and so on. It may be useful to send welcome messages to new users, to send email notification to persons who has not accessed to your website for a certain period.</li>
-  <ul>
-    <li>At first, list up target users by <a href="<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch">User Search</a>.
-    <li>Check the list and click "Send mail by this condition".
-    <li>Input the subject and the content of the mail.
-    <li>Choose the mailjob in the list of mailjobs.
-    <li>Follow the guide message and click the submit button.
-  </ul>
-  <li>You can edit the mailjob anytime until you finish sending it.
-  <li>You can include names of the target user into the subject and the message by the special format.
-  <li>And, that function can be extended by custom files or custom modules. If you hope more functions, find such modules.
-</ul>
-
-<h4>Preferences</h4>
-<ul>
-  <li>Administrators may modify settings of accepting or rejecting new user registration, how to activate new user registration, minimum and maximum length of username/password, registration disclaimer at registration page and so on.</li>
-</ul>
+<h4>User module</h4>
+<h5>Overview</h5>
+<p>This module offers various feature about users to Legacy System base module. Offering feature are Xoops Authentication, User Registration, User Profile Edit, User Profile Display, Blocks about users, User Management and others.</p>
+
+<h5>Install</h5>
+You don't need to do something to install in most cases, because this package might have been already installed correctly. If you need more informations, go to "Installation Guide".
+
+<h5 class="new"><a href="<{'basic.html'|helpurl}>">Basic Knowledge</a></h5>
+<p>This section explains about five elemental things of user management.</p>
+
+<h5>Features in Control Panel</h5>
+
+<h5 class="new"><a href="<{'preferences.html'|helpurl}>">Preferences</a></h5>
+
+<h5>Features in the homepage</h5>
+
+<h5 class="new"><a href="<{'blocks.html'|helpurl}>">Blocks in the public</a></h5>
Index: xoops2jp/html/modules/user/language/english/help/blocks.html
diff -u /dev/null xoops2jp/html/modules/user/language/english/help/blocks.html:1.1.2.1
--- /dev/null	Mon Nov 20 18:23:39 2006
+++ xoops2jp/html/modules/user/language/english/help/blocks.html	Mon Nov 20 18:23:39 2006
@@ -0,0 +1,43 @@
+<h4>User module - Blocks in the public</h4>
+<h5 class='highlight_block_name'>Login</h5>
+<h6>Overview</h6>
+<p>This block shows the login-form for only anonymous users who still are not passing the authentication. If the user registration is allowed, it shows the link to register.php. And, if the SSL login is allowed, it shows the link specified by options of preferences.</p>
+
+<h6>Note</h6>
+<p>You can do login in user.php without this block,  if you has uninstalled this block by mistake.</p>
+
+<h5 class='highlight_block_name'>Who's Online</h5>
+<h6>Overview</h6>
+<p>This block shows a name of users who may be accessing to your site and numbers of them.</p>
+
+<h6>Note</h6>
+<p>Getting correct informations for online users is too heavy process. For that, this block doesn't try to find the correct results. But, it's enough to make your site exciting.</p>
+
+<h5 class='highlight_block_name'>New Members</h5>
+<h6>Overview</h6>
+<p>This block shows a name of users who are registered to your site recently.</p>
+
+<h6>Options</h6>
+<dl>
+  <dt>Display x members</dt>
+  <dd>Specifies limit number of displaying recently users.</dd>
+
+  <dt>Display member avatars</dt>
+  <dd>In case of YES, displays user's avatars on the name of the users.</dd>
+</dl>
+
+<h5 class='highlight_block_name'>Top posters</h5>
+<h6>Overview</h6>
+<p>This block shows the ranking of the top posters.</p>
+
+<h6>Options</h6>
+<dl>
+  <dt>Display x members</dt>
+  <dd>Specifies limit number of displaying users.</dd>
+
+  <dt>Display member avatars</dt>
+  <dd>In case of YES, displays user's avatars on the name of the users.</dd>
+
+  <dt>Do not display users whose rank is x</dt>
+  <dd>You can remove users belonging to specific groups from the ranking.</dd>
+</dl>

From minahito ＠ users.sourceforge.jp  Mon Nov 20 18:23:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 18:23:59 +0900
Subject: [xoops-cvslog 5901] CVS update:
	xoops2jp/html/modules/user/language/japanese/help
Message-ID: <20061120092359.685912AC109@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/help/help.html
diff -u xoops2jp/html/modules/user/language/japanese/help/help.html:1.1.2.1 xoops2jp/html/modules/user/language/japanese/help/help.html:removed
--- xoops2jp/html/modules/user/language/japanese/help/help.html:1.1.2.1	Mon Jun  5 18:30:33 2006
+++ xoops2jp/html/modules/user/language/japanese/help/help.html	Mon Nov 20 18:23:59 2006
@@ -1,56 +0,0 @@
-<h4>概要</h4>
-<ul>
-  <li>ユーザーモジュールは、ユーザー管理・グループ管理に関する機能全般を提供します。個々のユーザーアカウントの追加・編集、ユーザーグループの管理、ユーザーランクの設定、ユーザーの新規登録可否の設定、登録ユーザー向けに一括してメールを配信する機能など、XOOPS
-  2.0.xでシステムモジュール内に含まれていたユーザー管理用の機能が移行されています。</li>
-</ul>
-
-<h4>ユーザー管理</h4>
-<ul>
-  <li>ユーザーの登録・登録情報の編集を行なうことが出来ます。</li>
-  <li>新規のユーザー登録を行う際には、ページの右上の「ユーザー新規登録」からユーザーの新規登録を行って下さい。</li>
-  <li>ユーザーの方のパスワードやプロフィール等を管理者の方が編集する必要がある場合は、一覧中の該当ユーザーの右側にある操作ボタン（鉛筆アイコン）をクリックするとユーザー情報の編集を行えます。</li>
-  <li>ユーザーを削除する時には同様に、削除ボタン（×印）をクリックすると確認画面が表示され「はい」をクリックすると登録されているユーザーが削除されます。</li>
-</ul>
-
-<h4>ユーザーランク管理</h4>
-<ul>
-  <li>フォーラムの投稿記事やユーザープロフィール等で表示されるユーザーランクを設定・編集出来ます。一覧中の該当ランク右側にある操作ボタン（鉛筆アイコン）をクリックするとユーザーランクの設定・編集を行うことができ、ユーザーランクを削除する時には削除ボタン（×印）をクリックします。</li>
-  <li>ページ右上の「ユーザーランク新規登録」を押すと、新規のユーザーランクを追加できます。</li>
-</ul>
-
-<h4>ユーザーグループ管理</h4>
-<ul>
-  <li>旧システム管理モジュールの「グループ管理」に相当する機能を提供します。それぞれのグループ毎に、モジュール・ブロック毎のアクセス権限、システムとモジュールの管理者権限を割り振る事で、ユーザー毎に柔軟なアクセス制御を実現します。</li>
-  <li>新規にユーザーグループを割り振る場合は、ページ右上の「ユーザーグループ新規追加」から、新規グループを追加して下さい。</li>
-  <li>新規のグループ追加に成功すると、一覧にグループ名が表示されるので、該当グループ名の「操作」欄にあるコマンドボタン「パーミッション(手の絵)」を押して該当グループに必要なパーミッションを追加します。</li>
-  <li>グループにユーザーを割り当てる際には、右側のコマンドボタン「メンバーの登録(旗の絵)」を押して、該当するユーザー名を一覧から選び「登録」ボタンを押します。グループからユーザーを削除(グループ権限を剥奪)する際には、こちらのメンバー登録画面の「登録されているユーザー一覧」からユーザー名を選び「削除」ボタンを押します。</li>
-</ul>
-
-<h5>(Tips)</h5>
-<ul>
-  <li>個々のユーザーは複数のグループに所属できます。複数のグループに所属するユーザーは、どちらか一方のグループでアクセス権が与えられていれば、該当のコンテンツにアクセスすることが出来ます。管理を容易にするためには、一つの基準となるグループを作成し、追加で作成するユーザーグループでは、必要最小限のアクセス権限を付加・管理されることをおすすめします。</li>
-  <li>ユーザーグループ一覧にあるコマンドボタン「プロパティ(スマイリーの絵)」にて、該当グループの設定情況を一覧で確認できます。グループパーミッションの設定情況を確認するためには、こちらの一覧で確認した上で、該当グループに属するテスト用のユーザーIDを作成し、実際にアクセスして確認することをおすすめします。</li>
-</ul>
-
-<span style="color:red;">New</span>
-<h4>一斉メール送信</h4>
-<p>複数のユーザーに対してメールやメッセージを送信することができます。<br/>
-XOOPS 2.0.x 系とは操作手順、処理の考え方が異なり、メールの内容と対象ユーザーを「メールジョブ」というデータに保存し、好きなときに送信することが出来ます。<br/>
-また、cronで処理することも可能です（予定）。</p>
-<ol>
-  <li>まず送信するユーザーを<strong>ユーザー検索</strong>で絞り込みましょう。
-  <li>検索結果を確認し、「この条件でメールを送信」をクリックしてください。
-  <li>メールの内容を入力し、保存してください。
-  <li>メールジョブの画面から送信するメールジョブを選択してください。
-  <li>ガイドに従い、送信ボタンを押してください。
-</ol>
-<p>
-メールジョブは送信開始前であれば件名や本文を修正することができ、送信後も履歴として残すことができます。<br/>
-メールタイトルや本文では、特殊な記法を使うことで、送信先のユーザーのユーザー名などをメッセージに含めることが出来ます。<br/>
-物足りない場合は、記法や送信方法を拡張するカスタム・ファイルやモジュールが配布されていないか探してみましょう。
-</p>
-
-<h4>一般設定</h4>
-<ul>
-  <li>サイトが新規ユーザの登録を許可するかどうか、ユーザー登録画面の利用許諾文、新規登録ユーザアカウントの有効化の方法、ユーザー名の最低・最大文字数やアバター画像のアップロード許可、ユーザ登録時のemailアドレスとして使用できない文字列などを設定できます。</li>
-</ul>

From minahito ＠ users.sourceforge.jp  Mon Nov 20 19:46:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 19:46:23 +0900
Subject: [xoops-cvslog 5902] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061120104623.C29552AC032@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php
diff -u xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.14 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.15
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.14	Thu Nov 16 19:10:25 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Mon Nov 20 19:46:23 2006
@@ -101,12 +101,12 @@
 	{
 		$info = array();
 		
-		$filepath = XOOPS_MODULE_PATH . "/modules/${dirname}/xoops_version.php";
+		$filepath = XOOPS_MODULE_PATH . "/${dirname}/xoops_version.php";
 		if (file_exists($filepath)) {
 			@include $filepath;
 			$info = $modversion;
 		}
-		
+
 		if (isset($info['legacy_installer']) && is_array($info['legacy_installer']) && isset($info['legacy_installer'][$mode])) {
 			$updateInfo = $info['legacy_installer'][$mode];
 				

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:39 +0900
Subject: [xoops-cvslog 5903] CVS update: xoops2jp/extras/XUpgrade
Message-ID: <20061120111939.DE7432AC10F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5904] CVS update: xoops2jp/extras/XUpgrade/admin
Message-ID: <20061120111940.121D72AC11E@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5905] CVS update: xoops2jp/extras/XUpgrade/admin/class
Message-ID: <20061120111940.3C8A02AC10F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5906] CVS update: xoops2jp/extras/XUpgrade/images
Message-ID: <20061120111940.651BC2AC11E@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5907] CVS update: xoops2jp/extras/XUpgrade/language
Message-ID: <20061120111940.8BD922AC10F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5908] CVS update:
	xoops2jp/extras/XUpgrade/language/english
Message-ID: <20061120111940.B2ABD2AC11E@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:40 +0900
Subject: [xoops-cvslog 5909] CVS update:
	xoops2jp/extras/XUpgrade/language/english/help
Message-ID: <20061120111940.DE0422AC10F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:41 +0900
Subject: [xoops-cvslog 5910] CVS update:
	xoops2jp/extras/XUpgrade/language/japanese
Message-ID: <20061120111941.1434A2AC11E@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:41 +0900
Subject: [xoops-cvslog 5911] CVS update:
	xoops2jp/extras/XUpgrade/language/japanese/help
Message-ID: <20061120111941.3B9D02AC10F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5912] CVS update: xoops2jp/extras/XUpgrade
Message-ID: <20061120111948.3701F2AC11E@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/xoops_version.php
diff -u /dev/null xoops2jp/extras/XUpgrade/xoops_version.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/xoops_version.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,40 @@
+<?php
+
+if (!defined('XUPGRADE_ENABLE_TEMPLATEPORTING')) {
+	define('XUPGRADE_ENABLE_TEMPLATEPORTING', false);
+}
+
+//
+// Define a basic manifesto.
+//
+$modversion['name'] = _MI_XUPGRADE_LANG_XUPGRADE;
+$modversion['version'] = 0.13;
+$modversion['description'] = _MI_XUPGRADE_DESC_XUPGRADE;
+$modversion['author'] = "";
+$modversion['credits'] = "";
+$modversion['help'] = "help.html";
+$modversion['license'] = "GPL";
+$modversion['official'] = 0;
+$modversion['image'] = "images/XUpgrade.png";
+$modversion['dirname'] = "XUpgrade";
+
+$modversion['cube_style'] = true;
+
+$modversion['legacy_installer']['installer']['class'] = "Installer";
+$modversion['legacy_installer']['updater']['class'] = "Updater";
+
+//
+// Admin panel setting
+//
+$modversion['hasAdmin'] = 1;
+$modversion['adminindex'] = "admin/index.php";
+$modversion['adminmenu'] = "admin/menu.php";
+
+//
+// Public side control setting
+//
+$modversion['hasMain'] = 0;
+// $modversion['sub'][]['name'] = "";
+// $modversion['sub'][]['url'] = "";
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5913] CVS update:
	xoops2jp/extras/XUpgrade/language/english
Message-ID: <20061120111948.0E2852AC10F@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/english/modinfo.php
diff -u /dev/null xoops2jp/extras/XUpgrade/language/english/modinfo.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:47 2006
+++ xoops2jp/extras/XUpgrade/language/english/modinfo.php	Mon Nov 20 20:19:47 2006
@@ -0,0 +1,27 @@
+<?php
+
+define('_MI_XUPGRADE_DESC_INSTALLER_1', "This module supports you upgrade form XOOPS2 to XOOPS Cube Legacy 2.1.");
+define('_MI_XUPGRADE_DESC_INSTALLER_2', "If you have already done upgrade, this module will do nothing.");
+define('_MI_XUPGRADE_DESC_INSTALLER_3', "This module will upgrade your site when you install this module. So, you don't need to operate any on this module after module install. Of course, you may uninstall it.");
+define('_MI_XUPGRADE_DESC_INSTALLER_4', "This module has the migration guide as the help for XOOPS2 users. It's possible to install this module to XOOPS Cube Legacy 2.1 for getting this help. Even if you have installed XOOPS Cube Legacy 2.1 from zero, this upgrade-module doesn't give any effects to your site.");
+define('_MI_XUPGRADE_DESC_INSTALLER_5', "This module will copy configs of the general preference to new modules of XOOPS Cube Legacy, and delete these old configs.");
+define('_MI_XUPGRADE_DESC_INSTALLER_6', "Also, this module will copy templates of old system module to templates of Legacy module, if you have custom templates.");
+define('_MI_XUPGRADE_DESC_INSTALLER_7', "The status of this module is Alpha! Try it and report bugs, please!");
+define('_MI_XUPGRADE_DESC_XUPGRADE', "Supprt upgrade from XOOPS2 to XOOPS Cube Legacy 2.1.");
+define('_MI_XUPGRADE_ERROR_CONFIGS_WRONG', "The value of configs is a wrong.");
+define('_MI_XUPGRADE_ERROR_DELETED_CATEGORY', "Could not deleted {0}.");
+define('_MI_XUPGRADE_ERROR_DELETED_CONFIG', "Could not delete the '{0}' config in the global.");
+define('_MI_XUPGRADE_ERROR_FIND_CONFIG', "Could not find the '{0}' config in {1} module.");
+define('_MI_XUPGRADE_ERROR_PORTED_CONFIG', "Could not Ported the '{0}' config to the config of {1} module.");
+define('_MI_XUPGRADE_ERROR_PORTED_TEMPLATE', "Cound not port '{0}' template of the '{1}' tplset to Legacy.");
+define('_MI_XUPGRADE_LANG_GPL', "The GNU General Public License");
+define('_MI_XUPGRADE_LANG_METEFOOTER_CATEGORY', "Meta Tags and Footer");
+define('_MI_XUPGRADE_LANG_USER_CATEGORY', "User Info Settings");
+define('_MI_XUPGRADE_LANG_XUPGRADE', "X UPGRADE");
+define('_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY', "Deleted '{0}'.");
+define('_MI_XUPGRADE_MESSAGE_DELETED_CONFIG', "Deleted the '{0}' config in the global.");
+define('_MI_XUPGRADE_MESSAGE_PORTED_CONFIG', "Ported the '{0}' config to the config of {1} module.");
+define('_MI_XUPGRADE_MESSAGE_PORTED_TEMPLATE', "Ported '{0}' template of the '{1}' tplset to Legacy.");
+define('_MI_XUPGRADE_MESSAGE_START_PORTING', "Start porting configs & templates...");
+
+?>
Index: xoops2jp/extras/XUpgrade/language/english/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/english/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/english/index.html	Mon Nov 20 20:19:47 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5914] CVS update: xoops2jp/extras/XUpgrade/admin/class
Message-ID: <20061120111948.5D0712AC129@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/admin/class/UpgradeProcessor.class.php
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/class/UpgradeProcessor.class.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/class/UpgradeProcessor.class.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,286 @@
+<?php
+/**
+ * @package XUpgrade
+ * @version $Id: UpgradeProcessor.class.php,v 1.1.2.1 2006/11/20 11:19:48 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * The processor to upgrade the site. It has a public member function to
+ * delegate and some private member functions.
+ */
+class XUpgrade_UpgradeProcessor
+{
+	/**
+	 * @var XoopsConfigHandler
+	 */
+	var $mConfigHandler = null;
+	
+	/**
+	 * @var Legacy_ModuleInstallLog
+	 */
+	var $mLog = null;
+	
+	function XUpgrade_UpgradeProcessor()
+	{
+		$this->mConfigHandler =& xoops_gethandler('config');
+	}
+	
+	/**
+	 * Do execute porting. This member function is added to Delegate.
+	 * 
+	 * @access public
+	 * @param XoopsModule $module
+	 * @param Legacy_ModuleInstallLog $log
+	 */
+	function execute(&$module, &$log)
+	{
+		if ($module->get('dirname') != 'XUpgrade') {
+			return;
+		}
+	
+		$this->mLog =& $log;
+		
+		$log->add(_MI_XUPGRADE_MESSAGE_START_PORTING);
+		$this->_portConfigs();
+		
+		if (XUPGRADE_ENABLE_TEMPLATEPORTING == true) {
+			$this->_portTemplates();
+		}
+	}
+	
+	/**
+	 * Execute porting configs items. Config items of XOOPS_CONF_USER and
+	 * XOOPS_CONF_METAFOOTER are ported to the user module and the legacyRender
+	 * module. Plus, some config items of XOOPS_CONF are ported to some modules.
+	 * Then, deleted original config items.
+	 * 
+	 * @access private
+	 */
+	function _portConfigs()
+	{
+		$generalConfigs =& $this->_getOldConfigs(XOOPS_CONF);
+		
+		//
+		// User
+		//
+		$oldConfigs =& $this->_getOldConfigs(XOOPS_CONF_USER);
+		$cubeConfigs =& $this->_getCubeConfigs('user');
+		$this->_fullCopy($oldConfigs, $cubeConfigs, 'user');
+
+		// $userItems = array('usercookie', 'use_mysession', 'session_name', 'session_expire', 'use_ssl', 'sslpost_name', 'sslloginlink');
+		$userItems = array('usercookie', 'use_ssl', 'sslpost_name', 'sslloginlink');
+		
+		foreach ($userItems as $key) {
+			if (isset($generalConfigs[$key])) {
+				$this->_copy($generalConfigs[$key], $cubeConfigs[$key], 'user');
+			}
+		}
+		
+		//
+		// legacyRender
+		//
+		$oldConfigs =& $this->_getOldConfigs(XOOPS_CONF_METAFOOTER);
+		$cubeConfigs =& $this->_getCubeConfigs('legacyRender');
+		$this->_fullCopy($oldConfigs, $cubeConfigs, 'legacyRender');
+		if (isset($generalConfigs['banners'])) {
+			$this->_copy($generalConfigs['banners'], $cubeConfigs['banners'], 'legacyRender');
+		}
+		
+		//
+		// Delete category
+		//
+		require_once XOOPS_ROOT_PATH . "/kernel/configcategory.php";
+		$root =& XCube_Root::getSingleton();
+		$handler =& new XoopsConfigCategoryHandler($root->mController->mDB);
+		$category =& $handler->get(XOOPS_CONF_USER);
+		if (is_object($category)) {
+			if ($handler->delete($category)) {
+				$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
+			}
+			else {
+				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_USER_CATEGORY));
+			}
+		}
+		
+		$category =& $handler->get(XOOPS_CONF_METAFOOTER);
+		if (is_object($category)) {
+			if ($handler->delete($category)) {
+				$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
+			}
+			else {
+				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CATEGORY, _MI_XUPGRADE_LANG_METEFOOTER_CATEGORY));
+			}
+		}
+	}
+
+	/**
+	 * Execute porting template files.
+	 * 
+	 * @access private
+	 */
+	function _portTemplates()
+	{
+		$targetTemplates = array(
+			'system_comment.html' => 'legacy_comment.html',
+			'system_comments_flats.html' => 'legacy_comments_flats.html',
+			'system_comments_next.html' => 'legacy_comments_next.html',
+			'system_comments_thread.html' => 'system_comments_thread.html',
+			'system_dummy.html' => 'legacy_dummy.html',
+			'system_notification_list.html' => 'legacy_notification_list.html',
+			'system_notification_select.html' => 'system_notification_select_form.html',
+			'system_redirect.html' => 'legacy_redirect.html',
+			'system_rss.html' => 'legacy_rss.html',
+			'system_siteclosed.html' => 'legacy_site_closed.html'
+			//, 'system_siteclosed.html' => 'legacy_site_closed.html'
+		);
+		
+		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
+			
+		foreach ($targetTemplates as $srcName => $descName) {
+			$criteria =& new CriteriaCompo();
+			$criteria->add(new Criteria('tpl_module', 'system'));
+			$criteria->add(new Criteria('tpl_tplset', 'default', '<>'));
+			$criteria->add(new Criteria('tpl_file', $srcName));
+				
+			$src_tplfileArr =& $handler->getObjects($criteria);
+			
+			foreach ($src_tplfileArr as $src_tplfile) {
+				$src_tplfile->loadSource();
+				
+				$criteria =& new CriteriaCompo();
+				$criteria->add(new Criteria('tpl_module', 'base'));
+				$criteria->add(new Criteria('tpl_tplset', $src_tplfile->get('tpl_tplset')));
+				$criteria->add(new Criteria('tpl_file', $descName));
+				
+				$desc_tplfileArr =& $handler->getObjects($criteria);
+				
+				//
+				// count($sec_tplfileArr) is 1. But, use foreach() here, to skip error checks.
+				//
+				foreach (array_keys($desc_tplfileArr) as $key) {
+					$desc_tplfileArr[$key]->loadSource();
+					$desc_tplfileArr[$key]->Source->set('tpl_source', $src_tplfile->Source->get('tpl_source'));
+					
+					if ($handler->insert($desc_tplfileArr[$key])) {
+						$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
+					}
+					else {
+						$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_PORTED_TEMPLATE, $src_tplfile->get('tpl_file'), $src_tplfile->get('tpl_tplset')));
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Fetch configs by $categoryid, and make them Hash, return it.
+	 * 
+	 * @access private
+	 * @param  string $categoryid ID of the specified category.
+	 * @return Array of config items.
+	 */
+	function &_getOldConfigs($categoryid)
+	{
+		$criteria =& new Criteria('conf_catid', $categoryid);
+		$t_configs =& $this->mConfigHandler->getConfigs($criteria);
+		
+		$oldConfigs = array();
+		foreach (array_keys($t_configs) as $key) {
+			$oldConfigs[$t_configs[$key]->get('conf_name')] =& $t_configs[$key];
+		}
+		
+		return $oldConfigs;
+	}
+	
+	/**
+	 * Fetch configs by $dirname, and make them Hash, return it.
+	 * 
+	 * @access private
+	 * @param  string $dirname A dirname of the specified module
+	 * @return Array of config items.
+	 */
+	function &_getCubeConfigs($dirname)
+	{
+		$cubeConfigs = array();
+		
+		$handler =& xoops_gethandler('module');
+		$module =& $handler->getByDirname($dirname);
+		
+		if (!is_object($module)) {
+			return $cubeConfigs;
+		}
+		
+		$criteria =& new Criteria('conf_modid', $module->get('mid'));
+		$t_configs =& $this->mConfigHandler->getConfigs($criteria);
+		
+		foreach (array_keys($t_configs) as $key) {
+			$cubeConfigs[$t_configs[$key]->get('conf_name')] =& $t_configs[$key];
+		}
+		
+		return $cubeConfigs;
+
+	}
+
+	/**
+	 * Copy the value of $oldConfig to the value of $cubeConfig, and try saving
+	 * it.
+	 * 
+	 * @access private
+	 * @param XoopsConfigItem $oldConfig
+	 * @param XoopsConfigItem $cubeConfig
+	 * @param string $dirname A name of module directory for logging.
+	 */
+	function _copy(&$oldConfig, &$cubeConfig, $dirname)
+	{
+		if (!is_object($oldConfig) || !is_object($cubeConfig)) {
+			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_CONFIGS_WRONG));
+			return;
+		}
+		
+		$value =& $oldConfig->getConfValueForOutput('conf_value');
+		if (is_array($value)) {
+			$value = implode('|', $value);
+		}
+		$cubeConfig->setConfValueForInput($value);
+		if ($this->mConfigHandler->insertConfig($cubeConfig)) {
+			$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
+		}
+		else {
+			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_PORTED_CONFIG, $cubeConfig->get('conf_name'), 'user'));
+		}
+		
+		if ($this->mConfigHandler->deleteConfig($oldConfig)) {
+			$this->mLog->add(XCube_Utils::formatMessage(_MI_XUPGRADE_MESSAGE_DELETED_CONFIG, $oldConfig->get('conf_name')));
+		}
+		else {
+			$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_DELETED_CONFIG, $oldConfig->get('conf_name')));
+		}
+	}
+	
+	/**
+	 * Copy from hash of oldConfig to hash of cubeConfig completely. This
+	 * member function is for the case that a module config is just clone of
+	 * the old config of the category.
+	 * 
+	 * @access private
+	 * @param array $oldConfigs hash array of config items. see _getOldConfigs().
+	 * @param array $cubeConfigs hash array of config items. see _getCubeConfigs().
+	 * @param string $dirname A name of module directory for logging.
+	 * @see _copy()
+	 */	
+	function _fullCopy(&$oldConfigs, &$cubeConfigs, $dirname)
+	{
+		foreach (array_keys($oldConfigs) as $key) {
+			if (isset($cubeConfigs[$key])) {
+				$this->_copy($oldConfigs[$key], $cubeConfigs[$key], $dirname);
+			}
+			else {
+				$this->mLog->addError(XCube_Utils::formatMessage(_MI_XUPGRADE_ERROR_FIND_CONFIG, $key, 'user'));
+			}
+		}
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/admin/class/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/class/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/class/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/admin/class/Installer.class.php
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/class/Installer.class.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/class/Installer.class.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package XUpgrade
+ * @version $Id: Installer.class.php,v 1.1.2.1 2006/11/20 11:19:48 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/modules/XUpgrade/admin/class/UpgradeProcessor.class.php";
+
+class XUpgrade_Installer extends Legacy_ModuleInstaller
+{
+	function _processScript()
+	{
+		$procedure =& new XUpgrade_UpgradeProcessor();
+		$procedure->execute($this->_mXoopsModule, $this->mLog);
+	}
+}
+
+?>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/admin/class/Updater.class.php
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/class/Updater.class.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/class/Updater.class.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package XUpgrade
+ * @version $Id: Updater.class.php,v 1.1.2.1 2006/11/20 11:19:48 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/modules/XUpgrade/admin/class/UpgradeProcessor.class.php";
+
+class XUpgrade_Updater extends Legacy_ModulePhasedUpgrader
+{
+	function _processScript()
+	{
+		$procedure =& new XUpgrade_UpgradeProcessor();
+		$procedure->execute($this->_mTargetXoopsModule, $this->mLog);
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5915] CVS update:
	xoops2jp/extras/XUpgrade/language/english/help
Message-ID: <20061120111948.AA4B22AC11E@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/english/help/help.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/english/help/help.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/english/help/help.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,110 @@
+<p>Welcome to "The Migration Guide for XOOPS2JP Users".</p>
+
+<p>
+XOOPS Cube Legacy is the package which has compatibility with XOOPS2 JP.
+But, the control panel you are accessing now has been remaked.
+Some concepts were changed. You may not be able to install modules, because you aren't good at Cube Legacy yet.
+</p>
+
+<p>
+This migration guide lets you from XOOPS2 JP to XOOPS Cube Legacy 2.1.
+Do learn Cube Legacy with this help and other helps.
+</p>
+
+<h4>Control</h4>
+<h5>Where did the pop-up menu go?</h5>
+<p>
+The pop-up menu said good-bye.
+The default admin theme of XOOPS Cube Legacy 2.1 doesn't have the pop-up menu.
+All of menu is showed in the side menu.
+You can open and close a menu of each modules by clicking [+] icon or [-] icon.
+Yes, you don't need to move your mouse carefully to move the cursor on the pop-up layer.
+</p>
+
+<h5>How to find the menu</h5>
+<p>
+Menu of XOOPS2 JP has been divided to some modules.
+You may use ActionSearch while you aren't good at Cube Legacy.
+By ActionSearch, you can search the keyword you input, from menu of the control panel and help.
+Try inputting 'User', you will get some menu about user management.
+</p>
+
+<h5>How to use List Table</h5>
+<p>
+Most of the pages which has item list has been changed to unified List Table UI.
+</p>
+<ul>
+ <li>To control sorting, click the arrow icon. It changes the sort field, and ASC or DESC. Do try it!
+ <li>To flip pages, use the page navigator. You can use it at most list table. 
+ <li>To edit or delete item, click each icons in the control field, which is in the most right column.
+ <li>To create new item, click the 'Create new' link, which is on the top of the table.
+</ul>
+
+<p>
+All of tables doesn't work these functions. Do read each help or tips for more informations.
+</p>
+
+<h6>Note</h6>
+<p>
+In Multi-Byte language, you have to set up MySQL correctly.
+If you haven't done it, the sort function may not work correctly for MultiByte field.
+For more informations, go to the official site of MySQL.
+</p>
+
+<h4>Management</h4>
+<h5>How to select the theme</h5>
+<p>
+<a href='<{$smarty.const.XOOPS_URL}>/base/admin/index.php?action=ThemeList'>'Theme management'</a> is good for you. Or, you may select it in the preference.
+</p>
+
+<h5>How to install module</h5>
+<p>
+The module management in Cube Legacy lists installed modules only.
+To install new modules, you have to visit the <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=InstallList'>'Install module'</a>.
+</p>
+
+<h5>How to switch the visible flag of blocks</h5>
+<p>
+The concept of blocks is one of the most changed features from XOOPS2 JP.
+At first, you have to know that blocks have gotten 'Install' and 'Uninstall'.
+When you install new modules, new blocks of the module are listed in the uninstalled block list.
+</p>
+
+<ul>
+ <li>If you want to turn a block on, you have to visit <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>'Install block'</a>.
+ <li>If you want to turn a block off, you have to uninstall it in <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockList'>'block management'</a>.
+</ul>
+<p>
+ Also, the custom block has the concept of install.
+ To create your custom block, click the <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=CustomBlockEdit'>'Add Custom Block'</a> link in <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>'Install block'</a>.
+</p>
+
+<p>
+ Blocks are deleted if you uninstall them. You can install them again anytime.
+ To delete your custom block, you need to make it uninstalled once.
+ Next, delete it in <a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>'Install block'</a>. Blocks of the module are deleted when you uninstall the module.
+</p>
+
+<h5>How to send mail or PM to many users</h5>
+<p>
+That's changed all. And, that became more useful. (Developes think so. How do you think?)
+</p>
+
+</p>
+ Well, you can send mail in <a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>'Mailjob management'</a>.
+ The mailjob is new concept in Cube Legacy.
+ A mailjob has the mail body and the send list.
+ At first, you have to make the send list by the <a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch'>'Search users'</a>.
+</p>
+
+<ol>
+ <li><a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch'>Search users</a> to list users which you want to send mail to.
+ <li>If you get the result you hope, click the 'Send mail by this condition' link, which is on the top of the table.
+ <li>Write the subject and the body, and select Mail or PM.
+ <li>After you finish it, the mailjob item is created and listed in the <a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>'Mailjob management'</a>.
+ <li>Click a name of the mailjob to send mails. Of course, you can keep the mailjob un-send.
+</ol>
+
+<p>
+For more informations, let's read <a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=Help&amp;dirname=user'>the help of the user module</a>.
+</p>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/language/english/help/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/english/help/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/english/help/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5916] CVS update: xoops2jp/extras/XUpgrade/images
Message-ID: <20061120111948.87A342AC10F@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/images/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/images/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/images/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/images/XUpgrade.png

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5917] CVS update: xoops2jp/extras/XUpgrade/admin
Message-ID: <20061120111948.F1C3E2AC10F@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/admin/menu.php
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/menu.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/menu.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @version $Id: menu.php,v 1.1.2.1 2006/11/20 11:19:48 minahito Exp $
+ */
+
+?>
Index: xoops2jp/extras/XUpgrade/admin/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/extras/XUpgrade/admin/index.php
diff -u /dev/null xoops2jp/extras/XUpgrade/admin/index.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/admin/index.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,11 @@
+<?php
+
+require_once "../../../mainfile.php";
+require_once XOOPS_ROOT_PATH . "/header.php";
+
+$root =& XCube_Root::getSingleton();
+$root->mController->executeForward($root->mController->getHelpViewUrl($root->mContext->mModule->mXoopsModule));
+
+require_once XOOPS_ROOT_PATH . "/footer.php";
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:48 +0900
Subject: [xoops-cvslog 5918] CVS update:
	xoops2jp/extras/XUpgrade/language/japanese
Message-ID: <20061120111948.CD1042AC129@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/japanese/modinfo.php
diff -u /dev/null xoops2jp/extras/XUpgrade/language/japanese/modinfo.php:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/japanese/modinfo.php	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,27 @@
+<?php
+
+define('_MI_XUPGRADE_DESC_INSTALLER_1', "このモジュールはあなたが XOOPS2 から XOOPS Cube Legacy 2.1 にアップグレードすることを支援します。");
+define('_MI_XUPGRADE_DESC_INSTALLER_2', "あなたが既にアップグレードを済ませたのであれば、このモジュールは何もしません。");
+define('_MI_XUPGRADE_DESC_INSTALLER_3', "このモジュールをインストールするときに、サイトはアップグレードされます。ですから、モジュール・インストールの後に、このモジュールで何か操作する必要はありません。もちろん、このモジュールをアンインストールしても構いません。");
+define('_MI_XUPGRADE_DESC_INSTALLER_4', "このモジュールは、XOOPS2ユーザーのヘルプとしてマイグレーション・ガイドを備えています。このヘルプを目当てに XOOPS Cube Legacy 2.1 にこのモジュールをインストールすることもできます。ゼロから XOOPS Cube Legacy 2.1 をインストールしていたとしても、このアップグレードモジュールはあなたのサイトに一切影響を与えません。");
+define('_MI_XUPGRADE_DESC_INSTALLER_5', "このモジュールは、全体のコンフィグを XOOPS Cube Legacy の新しいモジュールのコンフィグへコピーして、これらの古いコンフィグ項目を削除します。");
+define('_MI_XUPGRADE_DESC_INSTALLER_6', "同様に、もしカスタムテンプレートがあれば、Legacyモジュールのテンプレートにシステム・モジュールの旧テンプレートをコピーします。");
+define('_MI_XUPGRADE_DESC_INSTALLER_7', "このモジュールのステータスはアルファです！　試して、バグをレポートしてくださいね！");
+define('_MI_XUPGRADE_DESC_XUPGRADE', "XOOPS2 から XOOPS Cube Legacy 2.1 へのアップグレードを支援します");
+define('_MI_XUPGRADE_ERROR_CONFIGS_WRONG', "コンフィグが不正です");
+define('_MI_XUPGRADE_ERROR_DELETED_CATEGORY', "{0}を削除できませんでした。");
+define('_MI_XUPGRADE_ERROR_DELETED_CONFIG', "全体設定から '{0}' コンフィグを削除できませんでした。");
+define('_MI_XUPGRADE_ERROR_FIND_CONFIG', "{1} モジュールから '{0}' コンフィグが見つかりませんでした。");
+define('_MI_XUPGRADE_ERROR_PORTED_CONFIG', "'{0}' コンフィグを '{0}' モジュールのコンフィグに移行できませんでした。");
+define('_MI_XUPGRADE_ERROR_PORTED_TEMPLATE', "'{1}' テンプレートセットの '{0}' ファイルを Legacy へ移行できませんでした。");
+define('_MI_XUPGRADE_LANG_GPL', "GNU 一般公衆利用許諾契約書");
+define('_MI_XUPGRADE_LANG_METEFOOTER_CATEGORY', "METAタグ/フッタ設定");
+define('_MI_XUPGRADE_LANG_USER_CATEGORY', "ユーザ情報設定");
+define('_MI_XUPGRADE_LANG_XUPGRADE', "X UPGRADE");
+define('_MI_XUPGRADE_MESSAGE_DELETED_CATEGORY', "'{0}' を削除しました。");
+define('_MI_XUPGRADE_MESSAGE_DELETED_CONFIG', "全体設定から '{0}' コンフィグを削除しました。");
+define('_MI_XUPGRADE_MESSAGE_PORTED_CONFIG', "全体設定の '{0}' コンフィグ値を '{1}' モジュールへ移行しました。");
+define('_MI_XUPGRADE_MESSAGE_PORTED_TEMPLATE', "'{1}' テンプレートセットの '{0}' ファイルを Legacy へ移行しました。");
+define('_MI_XUPGRADE_MESSAGE_START_PORTING', "設定とテンプレートの移行作業を開始します...");
+
+?>
Index: xoops2jp/extras/XUpgrade/language/japanese/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/japanese/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/japanese/index.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:49 +0900
Subject: [xoops-cvslog 5919] CVS update: xoops2jp/extras/XUpgrade/language
Message-ID: <20061120111949.41FD52AC129@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:49 2006
+++ xoops2jp/extras/XUpgrade/language/index.html	Mon Nov 20 20:19:49 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Nov 20 20:19:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 20 Nov 2006 20:19:49 +0900
Subject: [xoops-cvslog 5920] CVS update:
	xoops2jp/extras/XUpgrade/language/japanese/help
Message-ID: <20061120111949.2090D2AC11E@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/japanese/help/help.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/japanese/help/help.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:49 2006
+++ xoops2jp/extras/XUpgrade/language/japanese/help/help.html	Mon Nov 20 20:19:48 2006
@@ -0,0 +1,109 @@
+<p>「XOOPS2JP ユーザーのための移行ガイド」へようこそ。</p>
+
+<p>
+XOOPS Cube Legacy は XOOPS2 JP と互換性を持つパッケージです。<br/>
+しかし、今あなたが使っているこのコントロールパネルはリメイクされ、いくつかのコンセプトが変更されました。<br/>
+まだ Cube Legacy に慣れていないうちは、モジュールをインストールすることさえうまくいかないかもしれません。
+</p>
+
+<p>
+この移行ガイドは、あなたを XOOPS2 JP から XOOPS Cube Legacy 2.1 へ導きます。<br/>
+このヘルプと他のヘルプをあわせて、 Cube Legacy をキャッチアップしましょう。
+</p>
+
+<h4>操作</h4>
+<h5>ポップアップメニューはどこへ？</h5>
+<p>
+ポップアップメニューはお別れを告げたようです。<br/>
+XOOPS CUbe Legacy 2.1 のデフォルトの管理テーマはポップアップメニューを備えておらず、すべてのメニューはサイドメニューに表示されています。<br/>
+[+] や [-] のアイコンをクリックすれば、それぞれのモジュールのメニューを開いたり閉じたりすることができます。<br/>
+ポップアップメニューのレイヤーにうまくカーソルを乗せるために、マウスを慎重に動かす必要はなくなりました。
+</p>
+
+<h5>メニューを探そう</h5>
+<p>
+XOOPS2JP の管理メニューはいくつかのモジュールに分割されました。<br/>
+Cube Legacy に慣れないうちは、アクションサーチ機能が便利です。<br/>
+この機能によって、入力したキーワードをコントロールパネルのメニューやヘルプから検索することができます。<br/>
+たとえば、ちょっと、'User'と入力してみてください。ユーザー管理に関するメニューをリストアップすることができると思います。
+</p>
+
+<h5>リストテーブルの使い方</h5>
+<p>
+項目をリストアップするページは、ほとんどが、リストテーブルに見た目と使い方が統一されました。
+</p>
+<ul>
+ <li>ソートを制御するには、矢印アイコンをクリックします。ソート項目とソート順序が変わります。一度やってみましょう！
+ <li>ページをめくるにはページナビゲータを使ってください。ほとんどのリストテーブルが、ページナビゲータを備えています。
+ <li>項目を編集したり削除するには、一番右の列の操作フィールドにあるそれぞれのアイコンをクリックします。
+ <li>新しい項目を作るには、テーブルの上にある「新規作成」リンクをクリックします。
+</ul>
+
+<p>
+すべてのテーブルでこれらの機能が使えるというわけではありません。詳細は、それぞれのヘルプや表示される Tips を読んで確認しましょう。
+</p>
+
+<h6>ノート</h6>
+<p>
+マルチバイト言語では、MySQL を正しく設定しておく必要があります。<br/>
+そうしないと、ソート機能がマルチバイト言語のフィールドで正しく動作しない場合があります。<br/>
+詳細は、 MySQL の公式ホームページで確認して下さい。
+</p>
+
+<h4>管理</h4>
+<h5>テーマの選び方</h5>
+<p>
+<a href='<{$smarty.const.XOOPS_URL}>/base/admin/index.php?action=ThemeList'>「テーマの管理」</a>が便利です。また、一般設定でも選択できます。
+</p>
+
+<h5>モジュールをインストールするには？</h5>
+<p>
+Cube Legacy では、「モジュール管理」はインストール済みモジュールのみをリストアップするようになっています。<br/>
+新しいモジュールをインストールするには、<a href='<{$smarty.const.XOOPS_URL}>/modules/base/admin/index.php?action=InstallList'>「モジュールのインストール」</a>というメニューから行うようになっています。
+</p>
+
+<h5>ブロックの可視フラグを制御するには？</h5>
+<p>
+ブロックのコンセプトは XOOPS2 JP から大きく変更されたもののひとつです。<br/>
+まずはじめに、ブロックも「インストール」と「アンインストール」の概念を持つようになったことを覚えておきましょう。<br/>
+新しいモジュールをインストールすると、そのモジュールの新しいブロックが「インストールされていないブロックのリスト」にリストアップされます。
+</p>
+
+<ul>
+ <li>XOOPS2 JP でいうところの「ブロックの可視＝ＯＮ」を行うには、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>「ブロックのインストール」</a>を使います。
+ <li>XOOPS2 JP でいうところの「ブロックの可視＝ＯＦＦ」を行うには、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockList'>「ブロックの管理」</a>でブロックのアンインストールをします。
+</ul>
+<p>
+カスタムブロックも同様にインストールの概念を持つようになりました。<br/>
+カスタムブロックを作るには、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>「ブロックのインストール」</a>で<a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=CustomBlockEdit'>「カスタムブロック追加」</a>をクリックしてください。
+</p>
+
+<p>
+ブロックをアンインストールしても、それは削除されるわけではないので、いつでも再インストールすることができます。<br/>
+カスタムブロックを削除するには、一度それをアンインストールしておく必要があります。
+アンインストールしてから、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/base/admin/index.php?action=BlockInstallList'>「ブロックのインストール」</a>でそれを削除します。<br/>
+モジュールのブロックはモジュールのアンインストールと一緒に削除されます。
+</p>
+
+<h5>メール/PMの一斉送信を使うには？</h5>
+<p>
+この機能はすっかり変わりました。そして、ちょっと便利になっています。（……と、開発チームは考えていますが、どうでしょうか？）
+</p>
+
+</p>
+さて、メール送信は<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>「メールジョブの管理」</a>で行います。<br/>
+メールジョブは Cube Legacy の新概念です。ひとつのメールジョブはメール文と送信先リストを持っています。<br/>
+そこで、まずはじめに、送信先リストを<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch'>ユーザー検索</a>で作る必要があります。
+</p>
+
+<ol>
+ <li>メールを送りたいユーザーをリストアップするために、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch'>ユーザーを検索します</a>。
+ <li>望む検索結果が得られたら、テーブルの上にある「この条件でメールを送信」をクリックして下さい。
+ <li>表題と本部を書き、メールかPMかを選択して下さい。
+ <li>それを終えると、新しいメールジョブが作成され<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>「メールジョブの管理」</a>にリストアップされます。
+ <li>メールを送るには、メールジョブのタイトルをクリックします。もちろん、送信しないままにしておくこともできます。
+</ol>
+
+<p>
+より詳細を知るためには、<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=Help&amp;dirname=user'>user モジュールのヘルプ</a>を参照しましょう。
+</p>
Index: xoops2jp/extras/XUpgrade/language/japanese/help/index.html
diff -u /dev/null xoops2jp/extras/XUpgrade/language/japanese/help/index.html:1.1.2.1
--- /dev/null	Mon Nov 20 20:19:49 2006
+++ xoops2jp/extras/XUpgrade/language/japanese/help/index.html	Mon Nov 20 20:19:49 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Mon Nov 20 21:29:15 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Mon, 20 Nov 2006 21:29:15 +0900
Subject: [xoops-cvslog 5921] CVS update:
	xoops2jp/html/modules/user/language/english/help
Message-ID: <20061120122915.4174F2AC117@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/help/help.html
diff -u xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1.2.1 xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1.2.2
--- xoops2jp/html/modules/user/language/english/help/help.html:1.1.2.1.2.1	Mon Nov 20 18:23:39 2006
+++ xoops2jp/html/modules/user/language/english/help/help.html	Mon Nov 20 21:29:15 2006
@@ -5,13 +5,13 @@
 <h5>Install</h5>
 You don't need to do something to install in most cases, because this package might have been already installed correctly. If you need more informations, go to "Installation Guide".
 
-<h5 class="new"><a href="<{'basic.html'|helpurl}>">Basic Knowledge</a></h5>
+<h5><a href="<{'basic.html'|helpurl}>" class="new">Basic Knowledge</a></h5>
 <p>This section explains about five elemental things of user management.</p>
 
 <h5>Features in Control Panel</h5>
 
-<h5 class="new"><a href="<{'preferences.html'|helpurl}>">Preferences</a></h5>
+<h5><a href="<{'preferences.html'|helpurl}>" class="new">Preferences</a></h5>
 
 <h5>Features in the homepage</h5>
 
-<h5 class="new"><a href="<{'blocks.html'|helpurl}>">Blocks in the public</a></h5>
+<h5><a href="<{'blocks.html'|helpurl}>" class="new">Blocks in the public</a></h5>

From nobunobu ＠ users.sourceforge.jp  Mon Nov 20 22:59:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 20 Nov 2006 22:59:44 +0900
Subject: [xoops-cvslog 5922] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061120135944.DB2642AC1D2@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.23 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.24
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.23	Wed Nov 15 19:45:03 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Mon Nov 20 22:59:44 2006
@@ -647,7 +647,8 @@
 		//
 		if ($this->mRoot->getSiteConfig('Legacy', 'AutoPreload') == 1) {
             $moduleHandler =& xoops_gethandler('module');
-            $moduleObjects =& $moduleHandler->getObjects();
+            $criteria =& new Criteria('isactive', 1);
+            $moduleObjects =& $moduleHandler->getObjects($criteria);
             foreach ($moduleObjects as $moduleObject) {
                 $mod_dir = $moduleObject->getVar('dirname');
                 $dir = XOOPS_ROOT_PATH . '/modules/' . $mod_dir . $dirname . '/';

From nobunobu ＠ users.sourceforge.jp  Mon Nov 20 23:55:53 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 20 Nov 2006 23:55:53 +0900
Subject: [xoops-cvslog 5923] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061120145553.E57CF2AC04B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/non_installation_module.php
diff -u xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.2 xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.3
--- xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.2	Sun Oct 15 01:34:16 2006
+++ xoops2jp/html/modules/legacy/class/non_installation_module.php	Mon Nov 20 23:55:53 2006
@@ -37,7 +37,9 @@
 					if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
 						$module =& $this->get($dir);
 						if ($module !== false ) {
-							$this->_mXoopsModules[] =& $module;
+							if (empty($modversion['disable_legacy_2nd_installer'])) {
+								$this->_mXoopsModules[] =& $module;
+							}
 							unset($module);
 						}
 					}

From minahito ＠ users.sourceforge.jp  Tue Nov 21 00:54:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Nov 2006 00:54:25 +0900
Subject: [xoops-cvslog 5924] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061120155425.7025D2AC14E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/non_installation_module.php
diff -u xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.3 xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.4
--- xoops2jp/html/modules/legacy/class/non_installation_module.php:1.1.2.3	Mon Nov 20 23:55:53 2006
+++ xoops2jp/html/modules/legacy/class/non_installation_module.php	Tue Nov 21 00:54:25 2006
@@ -37,11 +37,9 @@
 					if (!in_array($dir, $this->_mExclusions) && is_dir(XOOPS_MODULE_PATH . "/" . $dir)) {
 						$module =& $this->get($dir);
 						if ($module !== false ) {
-							if (empty($modversion['disable_legacy_2nd_installer'])) {
-								$this->_mXoopsModules[] =& $module;
-							}
-							unset($module);
+							$this->_mXoopsModules[] =& $module;
 						}
+						unset($module);
 					}
 				}
 			}
@@ -79,6 +77,19 @@
 	{
 		return $this->_mXoopsModules;
 	}
+	
+	function &getObjectsFor2ndInstaller()
+	{
+		$ret = array();
+		
+		foreach (array_keys($this->_mXoopsModules) as $key) {
+			if (empty($this->_mXoopsModules[$key]->modinfo['disable_legacy_2nd_installer'])) {
+				$ret[] =& $this->_mXoopsModules[$key];
+			}
+		}
+		
+		return $ret;
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Nov 21 00:54:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 21 Nov 2006 00:54:44 +0900
Subject: [xoops-cvslog 5925] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061120155444.4C6C02AC14E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.6 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.6	Sat Nov 11 17:38:00 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Tue Nov 21 00:54:44 2006
@@ -145,7 +145,7 @@
 				}
 				else {
 					$handler =& xoops_getmodulehandler('non_installation_module','legacy');
-					$objects = $handler->getObjects();
+					$objects = $handler->getObjectsFor2ndInstaller();
 					$optionModules = array();
 					foreach ($objects as $module) {
 						$dirname = $module->getVar('dirname');

From minahito ＠ users.sourceforge.jp  Wed Nov 22 20:31:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 22 Nov 2006 20:31:43 +0900
Subject: [xoops-cvslog 5926] CVS update: xoops2jp/html/include
Message-ID: <20061122113143.D1CA82AC11A@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.19.2.9 xoops2jp/html/include/functions.php:1.2.8.19.2.10
--- xoops2jp/html/include/functions.php:1.2.8.19.2.9	Thu Nov 16 19:26:17 2006
+++ xoops2jp/html/include/functions.php	Wed Nov 22 20:31:43 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.19.2.9 2006/11/16 10:26:17 minahito Exp $
+// $Id: functions.php,v 1.2.8.19.2.10 2006/11/22 11:31:43 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -542,7 +542,7 @@
 		// The following delegate is test at Alpha4-c.
 		//
 		$handler = null;
-		XCube_DelegateUtils::call('Legacy.Event.GetHandler', new XCube_Ref($handler), $optional);
+		XCube_DelegateUtils::call('Legacy.Event.GetHandler', new XCube_Ref($handler), $name, $optional);
 		if (is_object($handler)) {
 			$handlers[$name] =& $handler;
 			return $handlers[$name];

From tom_g3x ＠ users.sourceforge.jp  Thu Nov 23 01:05:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 23 Nov 2006 01:05:29 +0900
Subject: [xoops-cvslog 5927] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061122160529.7EAD82AC0EE@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.2 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.3
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.2	Thu Nov 16 17:13:57 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Thu Nov 23 01:05:29 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.16.2.2 2006/11/16 08:13:57 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.16.2.3 2006/11/22 16:05:29 tom_g3x Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -42,13 +42,6 @@
 
 $modversion['cube_style'] = true;
 
-// Installer
-$modversion['installer']['image'] = "images/pm_splash.gif";
-$modversion['installer']['description'][] = _MI_PM_DESC_INSTALLER_1;
-$modversion['installer']['description'][] = _MI_PM_DESC_INSTALLER_2;
-$modversion['installer']['licence']['title'] = _MI_PM_LANG_GPL;
-$modversion['installer']['licence']['file'] = "licence.txt";
-
 // Admin things
 $modversion['hasAdmin'] = 1;
 $modversion['adminindex'] = "admin/index.php";

From tom_g3x ＠ users.sourceforge.jp  Thu Nov 23 01:05:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 23 Nov 2006 01:05:29 +0900
Subject: [xoops-cvslog 5928] CVS update: xoops2jp/html/modules/pm/images
Message-ID: <20061122160529.A34AE2AC10C@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/images/pm_splash.gif

From tom_g3x ＠ users.sourceforge.jp  Thu Nov 23 01:05:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 23 Nov 2006 01:05:29 +0900
Subject: [xoops-cvslog 5929] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20061122160529.C769F2AC0EE@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.6 xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.6.2.1
--- xoops2jp/html/modules/pm/language/japanese/modinfo.php:1.1.2.6	Thu Aug 17 18:09:51 2006
+++ xoops2jp/html/modules/pm/language/japanese/modinfo.php	Thu Nov 23 01:05:29 2006
@@ -3,9 +3,6 @@
 define('_MI_PM_CONF_SEND_TYPE', "送信先入力方法");
 define('_MI_PM_CONF_SEND_TYPE_COMBO', "コンボボックス(XOOPS 2.0.x互換)");
 define('_MI_PM_CONF_SEND_TYPE_TEXT', "ユーザー名を直接入力");
-define('_MI_PM_DESC_INSTALLER_1', "プライベートメッセージ機能を担当します。");
-define('_MI_PM_DESC_INSTALLER_2', "XOOPS 2.0.x 相当のプライベートメッセージ機能を提供します。");
-define('_MI_PM_LANG_GPL', "GNU 一般公衆利用許諾契約書");
 define('_MI_PM_NAME', "プライベートメッセージ");
 define('_MI_PM_NAME_DESC', "プライベートメッセージの機能を司るモジュール");
 
Index: xoops2jp/html/modules/pm/language/japanese/licence.txt
diff -u xoops2jp/html/modules/pm/language/japanese/licence.txt:1.1.2.1 xoops2jp/html/modules/pm/language/japanese/licence.txt:removed
--- xoops2jp/html/modules/pm/language/japanese/licence.txt:1.1.2.1	Thu Dec 29 16:22:31 2005
+++ xoops2jp/html/modules/pm/language/japanese/licence.txt	Thu Nov 23 01:05:29 2006
@@ -1,216 +0,0 @@
-0. この利用許諾契約書は、そのプログラム(またはその他の著作物)をこの一般
-   公衆利用許諾契約書の定める条件の下で頒布できる、という告知が著作権者
-   によって記載されたプログラムまたはその他の著作物全般に適用される。以
-   下では、「『プログラム』」とはそのようにしてこの契約書が適用されたプ
-   ログラムや著作物全般を意味し、また「『プログラム』を基にした著作物」
-   とは『プログラム』やその他著作権法の下で派生物と見なされるもの全般を
-   指す。すなわち、『プログラム』かその一部を、全く同一のままか、改変を
-   加えたか、あるいは他の言語に翻訳された形で含む著作物のことである(「改
-   変」という語の本来の意味からはずれるが、以下では翻訳も改変の一種と見
-   なす)。それぞれの契約者は「あなた」と表現される。
-
-   複製や頒布、改変以外の活動はこの契約書ではカバーされない。それらはこ
-   の契約書の対象外である。『プログラム』を実行する行為自体に制限はない。
-   また、そのような『プログラム』の出力結果は、その内容が『プログラム』
-   を基にした著作物を構成する場合のみこの契約書によって保護される(『プロ
-   グラム』を実行したことによって作成されたということとは無関係である)。
-   このような線引きの妥当性は、『プログラム』が何をするのかに依存する。
-
-1. それぞれの複製物において適切な著作権表示と保証の否認声明(disclaimer of
-   warranty)を目立つよう適切に掲載し、またこの契約書および一切の保証の不
-   在に触れた告知すべてをそのまま残し、そしてこの契約書の複製物を『プロ
-   グラム』のいかなる受領者にも『プログラム』と共に頒布する限り、あなた
-   は『プログラム』のソースコードの複製物を、あなたが受け取った通りの形
-   で複製または頒布することができる。媒体は問わない。
-
-   あなたは、物理的に複製物を譲渡するという行為に関して手数料を課しても
-   良いし、希望によっては手数料を取って交換における保護の保証を提供して
-   も良い。
-
-2. あなたは自分の『プログラム』の複製物かその一部を改変して『プログラム』
-   を基にした著作物を形成し、そのような改変点や著作物を上記第1節の定める
-   条件の下で複製または頒布することができる。ただし、そのためには以下の
-   条件すべてを満たしていなければならない:
-
-   a) あなたがそれらのファイルを変更したということと変更した日時が良く分
-      かるよう、改変されたファイルに告示しなければならない。
-
-   b) 『プログラム』またはその一部を含む著作物、あるいは『プログラム』か
-      その一部から派生した著作物を頒布あるいは発表する場合には、その全体
-      をこの契約書の条件に従って第三者へ無償で利用許諾しなければならない。
-
-   c) 改変されたプログラムが、通常実行する際に対話的にコマンドを読むよう
-      になっているならば、そのプログラムを最も一般的な方法で対話的に実行
-      する際、適切な著作権表示、無保証であること(あるいはあなたが保証を
-      提供するということ)、ユーザがプログラムをこの契約書で述べた条件の
-      下で頒布することができるということ、そしてこの契約書の複製物を閲覧
-      するにはどうしたらよいかというユーザへの説明を含む告知が印 刷され
-      るか、あるいは画面に表示されるようにしなければならない(例外として、
-      『プログラム』そのものは対話的であっても通常そのような告知を印刷し
-      ない場合には、『プログラム』を基にしたあなたの著作物にそのような告
-      知を印刷させる必要はない)。 
-
-   以上の必要条件は全体としての改変された著作物に適用される。著作物の一
-   部が『プログラム』から派生したものではないと確認でき、それら自身別の
-   独立した著作物であると合理的に考えられるならば、あなたがそれらを別の
-   著作物として分けて頒布する場合、そういった部分にはこの契約書とその条
-   件は適用されない。しかし、あなたが同じ部分を『プログラム』を基にした
-   著作物全体の一部として頒布するならば、全体としての頒布物は、この契約
-   書が課す条件に従わなければならない。というのは、この契約書が他の契約
-   者に与える許可は『プログラム』丸ごと全体に及び、誰が書いたかは関係な
-   く各部分のすべてを保護するからである。
-
-   よって、すべてあなたによって書かれた著作物に対し、権利を主張したりあ
-   なたの権利に異議を申し立てることはこの節の意図するところではない。む
-   しろ、その趣旨は『プログラム』を基にした派生物ないし集合著作物の頒布
-   を管理する権利を行使するということにある。
-
-   また、『プログラム』を基にしていないその他の著作物を『プログラム』(あ
-   るいは『プログラム』を基にした著作物)と一緒に集めただけのものを一巻の
-   保管装置ないし頒布媒体に収めても、その他の著作物までこの契約書が保護
-   する対象になるということにはならない。
-
-3. あなたは上記第1節および2節の条件に従い、『プログラム』(あるいは第2節
-   における派生物)をオブジェクトコードないし実行形式で複製または頒布する
-   ことができる。ただし、その場合あなたは以下のうちどれか一つを実施しな
-   ければならない:
-
-   a) 著作物に、『プログラム』に対応した完全かつ機械で読み取り可能なソー
-      スコードを添付する。ただし、ソースコードは上記第1節および2節の条件
-      に従いソフトウェアの交換で習慣的に使われる媒体で頒布しなければなら
-      ない。あるいは、
-
-   b) 著作物に、いかなる第三者に対しても、『プログラム』に対応した完全か
-      つ機械で読み取り可能なソースコードを、頒布に要する物理的コストを上
-      回らない程度の手数料と引き換えに提供する旨述べた少なくとも3年間は
-      有効な書面になった申し出を添える。ただし、ソースコードは上記第1節
-      および2節の条件に従いソフトウェアの交換で習慣的に使われる媒 体で頒
-      布しなければならない。あるいは、
-
-   c) 対応するソースコード頒布の申し出に際して、あなたが得た情報を一緒に
-      引き渡す(この選択肢は、営利を目的としない頒布であって、かつあなた
-      が上記小節bで指定されているような申し出と共にオブジェクトコードあ
-      るいは実行形式のプログラムしか入手していない場合に限り許可される)。 
-
-   著作物のソースコードとは、それに対して改変を加える上で好ましいとされ
-   る著作物の形式を意味する。ある実行形式の著作物にとって完全なソースコー
-   ドとは、それが含むモジュールすべてのソースコード全部に加え、関連する
-   インターフェース定義ファイルのすべてとライブラリのコンパイルやインス
-   トールを制御するために使われるスクリプトをも加えたものを意味する。し
-   かし特別な例外として、そのコンポーネント自体が実行形式に付随するので
-   は無い限り、頒布されるものの中に、実行形式が実行されるオペレーティン
-   グシステムの主要なコンポーネント(コンパイラやカーネル等)と通常一緒に
-   (ソースかバイナリ形式のどちらかで)頒布されるものを含んでいる必要はな
-   いとする。
-
-   実行形式またはオブジェクトコードの頒布が、指定された場所からコピーす
-   るためのアクセス手段を提供することで為されるとして、その上でソースコー
-   ドも同等のアクセス手段によって同じ場所からコピーできるようになってい
-   るならば、第三者がオブジェクトコードと一緒にソースも強制的にコピーさ
-   せられるようになっていなくてもソースコード頒布の条件を満たしているも
-   のとする。
-
-4. あなたは『プログラム』を、この契約書において明確に提示された行為を除
-   き複製や改変、サブライセンス、あるいは頒布してはならない。他に『プロ
-   グラム』を複製や改変、サブライセンス、あるいは頒布する企てはすべて無
-   効であり、この契約書の下でのあなたの権利を自動的に終結させることにな
-   ろう。しかし、複製物や権利をこの契約書に従ってあなたから得た人々に関
-   しては、そのような人々がこの契約書に完全に従っている限り彼らのライセ
-   ンスまで終結することはない。
-
-5. あなたはこの契約書を受諾する必要は無い。というのは、あなたはこれに署
-   名していないからである。しかし、この契約書以外にあなたに対して『プロ
-   グラム』やその派生物を改変または頒布する許可を与えるものは存在しない。
-   これらの行為は、あなたがこの契約書を受け入れない限り法によって禁じら
-   れている。そこで、『プログラム』(あるいは『プログラム』を基にした著作
-   物全般) を改変ないし頒布することにより、あなたは自分がそのような行為
-   を行うためにこの契約書を受諾したということ、そして『プログラム』とそ
-   れに基づく著作物の複製や頒布、改変についてこの契約書が課す制約と条件
-   をすべて受け入れたということを示したものと見なす。
-
-6. あなたが『プログラム』(または『プログラム』を基にした著作物全般)を再
-   頒布するたびに、その受領者は元々のライセンス許可者から、この契約書で
-   指定された条件と制約の下で『プログラム』を複製や頒布、あるいは改変す
-   る許可を自動的に得るものとする。あなたは、受領者がここで認められた権
-   利を行使することに関してこれ以上他のいかなる制限も課してはならない。
-   あなたには、第三者がこの契約書に従うことを強制する責任はない。
-
-7. 特許侵害あるいはその他の理由(特許関係に限らない)から、裁判所の判決あ
-   るいは申し立ての結果としてあなたに(裁判所命令や契約などにより)このラ
-   イセンスの条件と矛盾する制約が課された場合でも、あなたがこの契約書の
-   条件を免除されるわけではない。もしこの契約書の下であなたに課せられた
-   責任と他の関連する責任を同時に満たすような形で頒布できないならば、結
-   果としてあなたは『プログラム』を頒布することが全くできないということ
-   である。例えば特許ライセンスが、あなたから直接間接を問わずコピーを受
-   け取った人が誰でも『プログラム』を使用料無料で再頒布することを認めて
-   いない場合、あなたがその制約とこの契約書を両方とも満たすには『プログ
-   ラム』の頒布を完全に中止するしかないだろう。
-
-   この節の一部分が特定の状況の下で無効ないし実施不可能な場合でも、節の
-   残りの部分は適用されるよう意図されている。その他の状況では節が全体と
-   して適用されるよう意図されている。
-
-   特許やその他の財産権を侵害したり、そのような権利の主張の効力に異議を
-   唱えたりするようあなたを誘惑することがこの節の目的ではない。この節に
-   は、人々によってライセンス慣行として実現されてきた、フリーソフトウェ
-   ア頒布のシステムの完全性を護るという目的しかない。多くの人々が、フリー
-   ソフトウェアの頒布システムが首尾一貫して適用されているという信頼に基
-   づき、このシステムを通じて頒布される多様なソフトウェアに寛大な貢献を
-   してきたのは事実であるが、人がどのようなシステムを通じてソフトウェア
-   を頒布したいと思うかはあくまでも作者/寄与者次第であり、あなたが選択を
-   押しつけることはできない。
-
-   この節は、この契約書のこの節以外の部分の一帰結になると考えられるケー
-   スを徹底的に明らかにすることを目的としている。
-
-8. 『プログラム』の頒布や利用が、ある国においては特許または著作権が主張
-   されたインターフェースのいずれかによって制限されている場合、『プログ
-   ラム』にこの契約書を適用した元の著作権者は、そういった国々を排除した
-   明確な地理的頒布制限を加え、そこで排除されていない国の中やそれらの国々
-   の間でのみ頒布が許可されるようにしても構わない。その場合、そのような
-   制限はこの契約書本文で書かれているのと同様に見なされる。
-
-9. フリーソフトウェア財団は、時によって改訂または新版の一般公衆利用許諾
-   書を発表することができる。そのような新版は現在のバージョンとその精神
-   においては似たものになるだろうが、新たな問題や懸念を解決するため細部
-   では異なる可能性がある。
-
-   それぞれのバージョンには、見分けが付くようにバージョン番号が振られて
-   いる。『プログラム』においてそれに適用されるこの契約書のバージョン番
-   号が指定されていて、更に「それ以降のいかなるバージョン(any later
-    version)」も適用して良いとなっていた場合、あなたは従う条件と制約とし
-   て、指定のバージョンか、フリーソフトウェア財団によって発行された指定
-   のバージョン以降の版のどれか一つのどちらかを選ぶことが出来る。『プロ
-   グラム』でライセンスのバージョン番号が指定されていないならば、あなた
-   は今までにフリーソフトウェア財団から発行されたバージョンの中から好き
-   に選んで構わない。
-
-10. もしあなたが『プログラム』の一部を、その頒布条件がこの契約書と異な
-    る他のフリーなプログラムと統合したいならば、作者に連絡して許可を求
-    めよ。フリーソフトウェア財団が著作権を保有するソフトウェアについて
-    は、フリーソフトウェア財団に連絡せよ。私たちは、このような場合のた
-    めに特別な例外を設けることもある。私たちが決定を下すにあたっては、
-    私たちのフリーソフトウェアの派生物すべてがフリーな状態に保たれると
-    いうことと、一般的にソフトウェアの共有と再利用を促進するという二つ
-    の目標を規準に検討されるであろう。
-
-無保証について
-
-11. 『プログラム』は代価無しに利用が許可されるので、適切な法が認める限
-    りにおいて、『プログラム』に関するいかなる保証も存在しない。書面で
-    別に述べる場合を除いて、著作権者、またはその他の団体は、『プログラ
-    ム』を、表明されたか言外にかは問わず、商業的適性を保証するほのめか
-    しやある特定の目的への適合性(に限られない)を含む一切の保証無しに
-    「あるがまま」で提供する。『プログラム』の質と性能に関するリスクの
-    すべてはあなたに帰属する。『プログラム』に欠陥があると判明した場合、
-    あなたは必要な保守点検や補修、修正に要するコストのすべてを引き受け
-    ることになる。
-
-12. 適切な法か書面での同意によって命ぜられない限り、著作権者、または上
-    記で許可されている通りに『プログラム』を改変または再頒布したその他
-    の団体は、あなたに対して『プログラム』の利用ないし利用不能で生じた
-    通常損害や特別損害、偶発損害、間接損害(データの消失や不正確な処理、
-    あなたか第三者が被った損失、あるいは『プログラム』が他のソフトウェ
-    アと一緒に動作しないという不具合などを含むがそれらに限らない)に一切
-    の責任を負わない。そのような損害が生ずる可能性について彼らが忠告さ
-    れていたとしても同様である。 
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Thu Nov 23 01:05:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 23 Nov 2006 01:05:29 +0900
Subject: [xoops-cvslog 5930] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20061122160529.ED2432AC10C@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/modinfo.php
diff -u xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.8 xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.8.2.1
--- xoops2jp/html/modules/pm/language/english/modinfo.php:1.1.2.8	Sun Sep 10 19:40:51 2006
+++ xoops2jp/html/modules/pm/language/english/modinfo.php	Thu Nov 23 01:05:29 2006
@@ -3,9 +3,6 @@
 define('_MI_PM_CONF_SEND_TYPE', "How to specify recipient address?");
 define('_MI_PM_CONF_SEND_TYPE_COMBO', "Combo box (XOOPS 2.0.x compatible)");
 define('_MI_PM_CONF_SEND_TYPE_TEXT', "Direct typing (input username directly)");
-define('_MI_PM_DESC_INSTALLER_1', "This module provides private message functionality.");
-define('_MI_PM_DESC_INSTALLER_2', "It is compatible with XOOPS 2.0.X.");
-define('_MI_PM_LANG_GPL', "The GNU General Public License");
 define('_MI_PM_NAME', "Private Message");
 define('_MI_PM_NAME_DESC', "This module provides Private Message functionality.");
 
Index: xoops2jp/html/modules/pm/language/english/licence.txt
diff -u xoops2jp/html/modules/pm/language/english/licence.txt:1.1.2.1 xoops2jp/html/modules/pm/language/english/licence.txt:removed
--- xoops2jp/html/modules/pm/language/english/licence.txt:1.1.2.1	Sun Jan 29 16:10:49 2006
+++ xoops2jp/html/modules/pm/language/english/licence.txt	Thu Nov 23 01:05:29 2006
@@ -1,222 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Nov 24 13:58:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 24 Nov 2006 13:58:09 +0900
Subject: [xoops-cvslog 5930] CVS update:
	xoops2jp/html/modules/legacy/admin/forms
Message-ID: <20061124045809.049DA2AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.3	Sun Oct 15 02:18:39 2006
+++ xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php	Fri Nov 24 13:58:09 2006
@@ -112,7 +112,6 @@
 	function update(&$obj)
 	{
 		$obj->set('bid', $this->get('bid'));
-		$obj->set('options', implode('|', $this->get('options')));
 		$obj->set('title', $this->get('title'));
 		$obj->set('side', $this->get('side'));
 		$obj->set('weight', $this->get('weight'));
@@ -120,6 +119,18 @@
 
 		$obj->set('last_modified', time());
 		
+		//
+		// Update options (XOOPS2 compatible)
+		//
+		$optionArr = $this->get('options');
+		for ($i = 0; $i < count($optionArr); $i++) {
+			if (is_array($optionArr[$i])) {
+				$optionArr[$i] = implode($optionArr[$i]);
+			}
+		}
+		
+		$obj->set('options', implode('|', $optionArr));
+		
 		$obj->mBmodule = array();
 		$handler =& xoops_getmodulehandler('block_module_link', 'legacy');
 		foreach ($this->get('bmodule') as $mid) {

From minahito ＠ users.sourceforge.jp  Fri Nov 24 13:58:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 24 Nov 2006 13:58:47 +0900
Subject: [xoops-cvslog 5931] CVS update:
	xoops2jp/html/modules/legacy/admin/forms
Message-ID: <20061124045847.325322AC0DC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php:1.1.2.4	Fri Nov 24 13:58:09 2006
+++ xoops2jp/html/modules/legacy/admin/forms/BlockEditForm.class.php	Fri Nov 24 13:58:47 2006
@@ -125,7 +125,7 @@
 		$optionArr = $this->get('options');
 		for ($i = 0; $i < count($optionArr); $i++) {
 			if (is_array($optionArr[$i])) {
-				$optionArr[$i] = implode($optionArr[$i]);
+				$optionArr[$i] = implode(',', $optionArr[$i]);
 			}
 		}
 		

From minahito ＠ users.sourceforge.jp  Fri Nov 24 18:19:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 24 Nov 2006 18:19:55 +0900
Subject: [xoops-cvslog 5932] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061124091955.A78B92AC0ED@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.24 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.25
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.24	Mon Nov 20 22:59:44 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Fri Nov 24 18:19:55 2006
@@ -314,6 +314,7 @@
 					if ($blockProcedure->isDisplay()) {
 						$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
 						$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
+							'id' => $blockProcedure->getId(),
 							'name' => $blockProcedure->getName(),
 							'title'   => $blockProcedure->getTitle(),
 							'content' => $content,
@@ -808,7 +809,6 @@
 			$screenTarget->setAttribute('xoops_contents', $resultRenderTarget->getResult());
 		}
 
-
 		$screenTarget->setTemplateName($theme->get('dirname'));
 
 		//

From minahito ＠ users.sourceforge.jp  Fri Nov 24 18:20:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 24 Nov 2006 18:20:44 +0900
Subject: [xoops-cvslog 5933] CVS update: xoops2jp/html/modules/user
Message-ID: <20061124092044.EE2232AC0ED@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.8 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.9
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.8	Wed Nov 15 19:43:02 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Fri Nov 24 18:20:44 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.8 2006/11/15 10:43:02 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.9 2006/11/24 09:20:44 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -315,7 +315,7 @@
 $modversion['blocks'][2]['description'] = _MI_USER_BLOCK_ONLINE_DESC;
 $modversion['blocks'][2]['show_func'] = "b_user_online_show";
 $modversion['blocks'][2]['template'] = 'user_block_online.html';
-$modversion['blocks'][3]['show_all_module'] = true;
+$modversion['blocks'][2]['show_all_module'] = true;
 
 $modversion['blocks'][3]['file'] = "user_newusers.php";
 $modversion['blocks'][3]['name'] = _MI_USER_BLOCK_NEWUSERS_NAME;

From minahito ＠ users.sourceforge.jp  Sat Nov 25 19:01:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 25 Nov 2006 19:01:22 +0900
Subject: [xoops-cvslog 5934] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061125100122.900362AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.6 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.6	Sat Nov 11 18:34:44 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Sat Nov 25 19:01:22 2006
@@ -233,7 +233,8 @@
 		}
 		
 		$render =& $this->getRenderTarget();
-		$render->setAttribute("mid", $this->getId());
+		$render->setAttribute("mid", $this->_mBlock->get('mid'));
+		$render->setAttribute("bid", $this->_mBlock->get('bid'));
 		
 		if ($this->_mBlock->get('template') == null) {
 			$render->setTemplateName('system_dummy.html');

From minahito ＠ users.sourceforge.jp  Sat Nov 25 19:01:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 25 Nov 2006 19:01:30 +0900
Subject: [xoops-cvslog 5935] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061125100130.F00B02AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.14 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.15
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.14	Fri Nov 17 22:31:37 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Sat Nov 25 19:01:30 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.14 2006/11/17 13:31:37 nobunobu Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.15 2006/11/25 10:01:30 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -256,7 +256,7 @@
 			$this->mXoopsTpl->assign($key,$value);
 		}
 
-		$result=&$this->mXoopsTpl->fetchBlock($target->getTemplateName(),$target->getAttribute("mid"));
+		$result=&$this->mXoopsTpl->fetchBlock($target->getTemplateName(),$target->getAttribute("bid"));
 		$target->setResult($result);
 		
 		//

From minahito ＠ users.sourceforge.jp  Sat Nov 25 19:11:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 25 Nov 2006 19:11:02 +0900
Subject: [xoops-cvslog 5936] CVS update: xoops2jp/html/kernel
Message-ID: <20061125101102.ED8492AC10E@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.10.2.1 xoops2jp/html/kernel/block.php:1.2.8.10.2.2
--- xoops2jp/html/kernel/block.php:1.2.8.10.2.1	Sun Nov 12 02:49:30 2006
+++ xoops2jp/html/kernel/block.php	Sat Nov 25 19:11:02 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.10.2.1 2006/11/11 17:49:30 minahito Exp $
+// $Id: block.php,v 1.2.8.10.2.2 2006/11/25 10:11:02 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -417,7 +417,9 @@
                 return $block;
             }
         }
-        return false;
+		
+		$ret = false;	//< You may think this should be null. But this is the compatibility with X2.
+        return $ret;
     }
 
     /**

From minahito ＠ users.sourceforge.jp  Sat Nov 25 19:12:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 25 Nov 2006 19:12:32 +0900
Subject: [xoops-cvslog 5937] CVS update: xoops2jp/html/kernel
Message-ID: <20061125101232.178082AC0A6@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.10.2.2 xoops2jp/html/kernel/block.php:1.2.8.10.2.3
--- xoops2jp/html/kernel/block.php:1.2.8.10.2.2	Sat Nov 25 19:11:02 2006
+++ xoops2jp/html/kernel/block.php	Sat Nov 25 19:12:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.10.2.2 2006/11/25 10:11:02 minahito Exp $
+// $Id: block.php,v 1.2.8.10.2.3 2006/11/25 10:12:31 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -408,7 +408,8 @@
         if ($id > 0) {
             $sql = 'SELECT * FROM '.$this->db->prefix('newblocks').' WHERE bid='.$id;
             if (!$result = $this->db->query($sql)) {
-                return false;
+				$ret = false;	//< You may think this should be null. But this is the compatibility with X2.
+				return $ret;
             }
             $numrows = $this->db->getRowsNum($result);
             if ($numrows == 1) {

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:14:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:14:35 +0900
Subject: [xoops-cvslog 5938] CVS update: xoops2jp/html/modules/legacy/blocks
Message-ID: <20061127051435.234B62AC169@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/blocks/legacy_themes.php
diff -u xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.3 xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.4
--- xoops2jp/html/modules/legacy/blocks/legacy_themes.php:1.1.2.3	Fri Nov 17 19:41:24 2006
+++ xoops2jp/html/modules/legacy/blocks/legacy_themes.php	Mon Nov 27 14:14:34 2006
@@ -16,14 +16,20 @@
 	$block['isEnableChanger'] = 1;
 	
     $theme_options = array();
-    foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
-        $theme_option['name'] = $theme;
-        if ($theme == $xoopsConfig['theme_set']) {
-            $theme_option['selected'] = 'selected="selected"';
-        } else {
-            $theme_option['selected'] = '';
-        }
-        $theme_options[] = $theme_option;
+	$handler =& xoops_getmodulehandler('theme', 'legacy');
+    foreach ($xoopsConfig['theme_set_allowed'] as $name) {
+		$theme =& $handler->get($name);
+		if ($theme != null) {
+			$theme_option['name'] = $name;
+			$theme_option['screenshot'] = $theme->getShow('screenshot');
+			$theme_option['screenshotUrl'] = XOOPS_THEME_URL . "/" . $name . "/" . $theme->getShow('screenshot');
+	        if ($name == $xoopsConfig['theme_set']) {
+	            $theme_option['selected'] = 'selected="selected"';
+	        } else {
+	            $theme_option['selected'] = '';
+	        }
+	        $theme_options[] = $theme_option;
+		}
     }
 	
     $block['count'] = count($xoopsConfig['theme_set_allowed']);

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:54:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:54:18 +0900
Subject: [xoops-cvslog 5939] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061127055418.951E02AC175@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/theme_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/theme_list.html	Mon Nov 27 14:54:18 2006
@@ -44,6 +44,9 @@
           <li><{$smarty.const._AD_LEGACY_LANG_RENDER}> : <{$theme->getShow('render_system')}></li>
           <li><{$smarty.const._AD_LEGACY_LANG_FORMAT}> : <{$theme->getShow('format')}></li>
           <li><{$smarty.const._AD_LEGACY_LANG_AUTHOR}> : <{$theme->getShow('author')}></li>
+          <{if $theme->get('licence')}>
+            <li><{$smarty.const._AD_LEGACY_LANG_LICENCE}> : <{$theme->getShow('licence')}></li>
+          <{/if}>
           <{if $theme->get('url') != null}>
             <li><a href="<{$theme->getShow('url')}>"><{$smarty.const._AD_LEGACY_LANG_GET_THE_LATEST_VERSION}></a></li>
           <{/if}>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:54:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:54:38 +0900
Subject: [xoops-cvslog 5940] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061127055438.9A1E62AC171@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/theme.php
diff -u xoops2jp/html/modules/legacy/class/theme.php:1.1.2.2 xoops2jp/html/modules/legacy/class/theme.php:1.1.2.3
--- xoops2jp/html/modules/legacy/class/theme.php:1.1.2.2	Sun Oct 15 01:34:50 2006
+++ xoops2jp/html/modules/legacy/class/theme.php	Mon Nov 27 14:54:38 2006
@@ -17,6 +17,7 @@
 		$this->initVar('version', XOBJ_DTYPE_STRING, '', true, 32);
 		$this->initVar('author', XOBJ_DTYPE_STRING, '', true, 64);
 		$this->initVar('url', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('licence', XOBJ_DTYPE_STRING, '', true, 255);
 	}
 }
 
@@ -81,6 +82,7 @@
 				$obj->set('version', $theme->mVersion);
 				$obj->set('author', $theme->mAuthor);
 				$obj->set('url', $theme->mUrl);
+				$obj->set('licence', $theme->mLicence);
 				$this->_mResults[] =& $obj;
 				unset($obj);
 			}

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:54:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:54:51 +0900
Subject: [xoops-cvslog 5941] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061127055451.477432AC169@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.6 xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.7
--- xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.6	Wed Nov  8 20:59:51 2006
+++ xoops2jp/html/modules/legacy/language/japanese/admin.php	Mon Nov 27 14:54:51 2006
@@ -137,6 +137,7 @@
 define('_AD_LEGACY_LANG_LASTUPDATE', "最終更新日");
 define('_AD_LEGACY_LANG_LCR', "左-中央-右");
 define('_AD_LEGACY_LANG_LIST', "一覧");
+define('_AD_LEGACY_LANG_LICENCE', "ライセンス");
 define('_AD_LEGACY_LANG_MAINMENU_HAS_MAIN', "メインメニュー");
 define('_AD_LEGACY_LANG_MAINMENU_INFO', "メインメニュー情報");
 define('_AD_LEGACY_LANG_MOD_AUTHOR', "モジュール作者");

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:54:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:54:51 +0900
Subject: [xoops-cvslog 5942] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061127055451.6B90A2AC171@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/admin.php
diff -u xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.5 xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.6
--- xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.5	Wed Nov  8 20:59:52 2006
+++ xoops2jp/html/modules/legacy/language/english/admin.php	Mon Nov 27 14:54:51 2006
@@ -136,6 +136,7 @@
 define('_AD_LEGACY_LANG_LAST_MODIFIED', "Last modified");
 define('_AD_LEGACY_LANG_LASTUPDATE', "Last update");
 define('_AD_LEGACY_LANG_LCR', "L-CNTR-R");
+define('_AD_LEGACY_LANG_LICENCE', "Licence");
 define('_AD_LEGACY_LANG_LIST', "List");
 define('_AD_LEGACY_LANG_MAINMENU_HAS_MAIN', "Main Menu");
 define('_AD_LEGACY_LANG_MAINMENU_INFO', "Information about the Main Menu");

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:57:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:57:00 +0900
Subject: [xoops-cvslog 5943] CVS update:
	xoops2jp/extras/XUpgrade/language/japanese/help
Message-ID: <20061127055700.C58792AC028@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/japanese/help/help.html
diff -u xoops2jp/extras/XUpgrade/language/japanese/help/help.html:1.1.2.1 xoops2jp/extras/XUpgrade/language/japanese/help/help.html:1.1.2.2
--- xoops2jp/extras/XUpgrade/language/japanese/help/help.html:1.1.2.1	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/japanese/help/help.html	Mon Nov 27 14:57:00 2006
@@ -90,7 +90,7 @@
 この機能はすっかり変わりました。そして、ちょっと便利になっています。（……と、開発チームは考えていますが、どうでしょうか？）
 </p>
 
-</p>
+<p>
 さて、メール送信は<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>「メールジョブの管理」</a>で行います。<br/>
 メールジョブは Cube Legacy の新概念です。ひとつのメールジョブはメール文と送信先リストを持っています。<br/>
 そこで、まずはじめに、送信先リストを<a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=UserSearch'>ユーザー検索</a>で作る必要があります。

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:57:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:57:00 +0900
Subject: [xoops-cvslog 5944] CVS update:
	xoops2jp/extras/XUpgrade/language/english/help
Message-ID: <20061127055700.EE3442AC02F@users.sourceforge.jp>

Index: xoops2jp/extras/XUpgrade/language/english/help/help.html
diff -u xoops2jp/extras/XUpgrade/language/english/help/help.html:1.1.2.1 xoops2jp/extras/XUpgrade/language/english/help/help.html:1.1.2.2
--- xoops2jp/extras/XUpgrade/language/english/help/help.html:1.1.2.1	Mon Nov 20 20:19:48 2006
+++ xoops2jp/extras/XUpgrade/language/english/help/help.html	Mon Nov 27 14:57:00 2006
@@ -90,7 +90,7 @@
 That's changed all. And, that became more useful. (Developes think so. How do you think?)
 </p>
 
-</p>
+<p>
  Well, you can send mail in <a href='<{$smarty.const.XOOPS_MODULE_URL}>/user/admin/index.php?action=MailjobList'>'Mailjob management'</a>.
  The mailjob is new concept in Cube Legacy.
  A mailjob has the mail body and the send list.

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:58:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:58:30 +0900
Subject: [xoops-cvslog 5945] CVS update:
	xoops2jp/html/modules/legacy/language/english/help
Message-ID: <20061127055830.7F18A2AC02F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/xoops2.html
diff -u xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.1 xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.2
--- xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.1	Sat Oct 14 23:55:23 2006
+++ xoops2jp/html/modules/legacy/language/english/help/xoops2.html	Mon Nov 27 14:58:30 2006
@@ -1,6 +1,8 @@
 <h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
 <h5>Getting first</h5>
-<p> All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p<p> These features will be ported to 'Legacy module' until stable release.</p>
+<p>All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p>
+
+<p>These features will be ported to 'Legacy module' until stable release.</p>
 
 <h5>Module management</h5>
 <ul>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:59:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:59:03 +0900
Subject: [xoops-cvslog 5946] CVS update:
	xoops2jp/html/modules/legacy/language/english/help
Message-ID: <20061127055903.BC8DF2AC02F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/abc_2nd.html
diff -u xoops2jp/html/modules/legacy/language/english/help/abc_2nd.html:1.1.2.7 xoops2jp/html/modules/legacy/language/english/help/abc_2nd.html:1.1.2.8
--- xoops2jp/html/modules/legacy/language/english/help/abc_2nd.html:1.1.2.7	Fri Oct 27 18:00:47 2006
+++ xoops2jp/html/modules/legacy/language/english/help/abc_2nd.html	Mon Nov 27 14:59:03 2006
@@ -88,7 +88,7 @@
   <dd>Common users who registered through the user registration system, belong to this group by default.</dd>
   
   <dt>Anonymous Users</dt>
-  <dd>This group is unregistered users, the general public.</dt>
+  <dd>This group is unregistered users, the general public.</dd>
 </dl>
 
 <p>In this case you don't need to hide this block from any user so specify all three groups.</p>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 14:59:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 14:59:59 +0900
Subject: [xoops-cvslog 5947] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061127055959.440E62AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/block_uninstall.html
diff -u xoops2jp/html/modules/legacy/admin/templates/block_uninstall.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/block_uninstall.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/block_uninstall.html:1.1.2.2	Sun Oct 15 01:14:22 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_uninstall.html	Mon Nov 27 14:59:59 2006
@@ -110,13 +110,13 @@
     <td class="<{cycle values="odd,even"}>"><{$object->getShow('template')}></td>
   </tr>
   <tr>
-    <td class="head"><{$smarty.const._AD_LEGACY_LANG_BCACHETIME}></th>
+    <td class="head"><{$smarty.const._AD_LEGACY_LANG_BCACHETIME}></td>
     <td class="<{cycle values="odd,even"}>">
       <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}>
     </td>
   </tr>
   <tr>
-    <td class="head"><{$smarty.const._AD_LEGACY_LANG_LAST_MODIFIED}></th>
+    <td class="head"><{$smarty.const._AD_LEGACY_LANG_LAST_MODIFIED}></td>
     <td class="<{cycle values="odd,even"}>"><{$object->get('last_modified')|xoops_formattimestamp:l}></td>
   </tr>
   <tr>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:00:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:00:26 +0900
Subject: [xoops-cvslog 5948] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061127060026.CBC652AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html
diff -u xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html:1.1.2.2	Sun Oct 15 01:17:33 2006
+++ xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html	Mon Nov 27 15:00:26 2006
@@ -109,7 +109,7 @@
     </td>
   </tr>
   <tr>
-    <td class="head"><{$smarty.const._AD_LEGACY_LANG_LAST_MODIFIED}></th>
+    <td class="head"><{$smarty.const._AD_LEGACY_LANG_LAST_MODIFIED}></td>
     <td class="<{cycle values="odd,even"}>"><{$object->get('last_modified')|xoops_formattimestamp:l}></td>
   </tr>
   <tr>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:01:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:01:19 +0900
Subject: [xoops-cvslog 5949] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20061127060119.6FA572AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.3 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.4
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.3	Thu Nov 16 17:16:46 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Mon Nov 27 15:01:19 2006
@@ -45,7 +45,6 @@
       <td style="vertical-align:middle;">
         <a href="<{$xoops_url}>/readpmsg.php?msg_id=<{$pm->getShow('msg_id')}>"><{$pm->getShow('subject')}></a>
       </td>
-      </td>
       <td style="text-align:center; vertical-align:middle;">
         <{$pm->get("msg_time")|xoops_formattimestamp:l}>
       </td>

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:02:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:02:19 +0900
Subject: [xoops-cvslog 5950] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061127060219.B61142AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_lostpass.html
diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7.2.1 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7.2.2
--- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.7.2.1	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_lostpass.html	Mon Nov 27 15:02:19 2006
@@ -25,7 +25,6 @@
       <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}>
     </td>
   </tr>
-  </tr>
   <tr>
     <td colspan="2" class="foot" style="text-align:center;">
       <input type="submit" value="<{$smarty.const._SEND}>" />

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:07:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:07:42 +0900
Subject: [xoops-cvslog 5951] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061127060742.AE11D2AC028@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleInfoAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleInfoAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ModuleInfoAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ModuleInfoAction.class.php:1.1.2.2	Sun Oct 15 00:54:46 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleInfoAction.class.php	Mon Nov 27 15:07:42 2006
@@ -20,7 +20,7 @@
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$dirname = xoops_getrequest('dirname');
-		if (!preg_match("/^[a-z\_]+$/i", $dirname)) {
+		if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $dirname)) {
 			return LEGACY_FRAME_VIEW_ERROR;
 		}
 

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:53:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:53:53 +0900
Subject: [xoops-cvslog 5952] CVS update: xoops2jp/html/core
Message-ID: <20061127065353.05D402AC171@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Theme.class.php
diff -u xoops2jp/html/core/XCube_Theme.class.php:1.1.2.2 xoops2jp/html/core/XCube_Theme.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_Theme.class.php:1.1.2.2	Sat Oct  7 17:54:31 2006
+++ xoops2jp/html/core/XCube_Theme.class.php	Mon Nov 27 15:53:52 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Theme.class.php,v 1.1.2.2 2006/10/07 08:54:31 ryuji_amano Exp $
+ * @version $Id: XCube_Theme.class.php,v 1.1.2.3 2006/11/27 06:53:52 minahito Exp $
  */
 
 /**
@@ -60,6 +60,8 @@
 	
 	var $mAuthor = null;
 	
+	var $mLicence = null;
+	
 	var $_mManifesto = array();
 
 	/**
@@ -90,6 +92,10 @@
 			
 			$this->mFormat = isset($this->_mManifesto['Theme']['Format']) ? $this->_mManifesto['Theme']['Format'] : "";
 			
+			if (isset($this->_mManifesto['Theme']['Licence'])) {
+				$this->mLicence = $this->_mManifesto['Theme']['Licence'];
+			}
+			
 			return true;
 		}
 		else {

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:54:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:54:52 +0900
Subject: [xoops-cvslog 5953] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061127065452.98C212AC171@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.25 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.26
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.25	Fri Nov 24 18:19:55 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Mon Nov 27 15:54:52 2006
@@ -661,7 +661,8 @@
 							if (preg_match("/(\w+)\.class\.php/", $file, $matches)) {
 								$className = ucfirst($mod_dir) . "_" . $matches[1];
 						
-								if (class_exists($className)) {
+								if (class_exists($className) && !isset($this->_mLoadedFilterNames[$className])) {
+									$this->_mLoadedFilterNames[$className] = true;
 									$instance =& new $className($this);
 									$this->addActionFilter($instance);
 								}
@@ -1227,7 +1228,8 @@
 		foreach ($primaryPreloads as $className => $classPath) {
 			if (file_exists(XOOPS_ROOT_PATH . $classPath)) {
 				require_once XOOPS_ROOT_PATH . $classPath;
-				if (class_exists($className)) {
+				if (class_exists($className) && !isset($this->_mLoadedFilterNames[$className])) {
+					$this->_mLoadedFilterNames[$className] = true;
 					$filter =& new $className($this->mController);
 					$this->mController->addActionFilter($filter);
 					unset($filter);

From minahito ＠ users.sourceforge.jp  Mon Nov 27 15:55:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 27 Nov 2006 15:55:01 +0900
Subject: [xoops-cvslog 5954] CVS update: xoops2jp/html/core
Message-ID: <20061127065501.7243C2AC171@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Controller.class.php
diff -u xoops2jp/html/core/XCube_Controller.class.php:1.1.2.6 xoops2jp/html/core/XCube_Controller.class.php:1.1.2.7
--- xoops2jp/html/core/XCube_Controller.class.php:1.1.2.6	Wed Oct 25 19:38:59 2006
+++ xoops2jp/html/core/XCube_Controller.class.php	Mon Nov 27 15:55:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Controller.class.php,v 1.1.2.6 2006/10/25 10:38:59 minahito Exp $
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.7 2006/11/27 06:55:01 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -62,10 +62,19 @@
 	 * Array of XCube_ActionFilter class object.
 	 *
 	 * @var Array
+	 * @protected
 	 */
 	var $_mFilterChain = array();
 	
 	/**
+	 * This is Map-Array to keep names of action filter classes which are
+	 * applied as filters.
+	 * 
+	 * @protected
+	 */
+	var $_mLoadedFilterNames = array();
+	
+	/**
 	 * The database object which is abstract layer for the database.
 	 *
 	 * @var object
@@ -108,6 +117,7 @@
 	{
 		$this->_mBlockChain = array();
 		$this->_mFilterChain = array();
+		$this->_mLoadedFilterNames = array();
 		
 		$this->mSetupUser =& new XCube_Delegate();
 		$this->mExecute =& new XCube_Delegate();
@@ -385,7 +395,8 @@
 						require_once $path . $file;
 						$className = $matches[1];
 						
-						if (class_exists($className)) {
+						if (class_exists($className) && !isset($this->_mLoadedFilterNames[$className])) {
+							$this->_mLoadedFilterNames[$className] = true;
 							$instance =& new $className($this);
 							$this->addActionFilter($instance);
 						}

From nobunobu ＠ users.sourceforge.jp  Mon Nov 27 16:42:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 27 Nov 2006 16:42:21 +0900
Subject: [xoops-cvslog 5955] CVS update: xoops2jp/html/include
Message-ID: <20061127074221.6F9BB2AC02F@users.sourceforge.jp>

Index: xoops2jp/html/include/xoops.js
diff -u xoops2jp/html/include/xoops.js:1.1.8.1 xoops2jp/html/include/xoops.js:1.1.8.1.2.1
--- xoops2jp/html/include/xoops.js:1.1.8.1	Wed Oct 19 02:20:06 2005
+++ xoops2jp/html/include/xoops.js	Mon Nov 27 16:42:21 2006
@@ -194,6 +194,16 @@
     imgDom.src = xoopsUrl + "/"+ imgDir + "/" + selectDom.options[selectDom.selectedIndex].value + extra;
 }
 
+function showThemeScreenshot(imgId, selectId, xoopsUrl) {
+    if (xoopsUrl == null) {
+        xoopsUrl = "./";
+    }
+    imgDom = xoopsGetElementById(imgId);
+    selectDom = xoopsGetElementById(selectId);
+    serctValues = selectDom.options[selectDom.selectedIndex].value.split('!-!');
+    imgDom.src = xoopsUrl + "/themes/" + serctValues[0] + "/" + serctValues[1];
+}
+
 function xoopsCodeUrl(id, enterUrlPhrase, enterWebsitePhrase){
     if (enterUrlPhrase == null) {
         enterUrlPhrase = "Enter the URL of the link you want to add:";

From nobunobu ＠ users.sourceforge.jp  Mon Nov 27 16:42:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 27 Nov 2006 16:42:21 +0900
Subject: [xoops-cvslog 5956] CVS update:
	xoops2jp/html/modules/legacy/templates/blocks
Message-ID: <20061127074221.924172AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html
diff -u xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.3 xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.4
--- xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html:1.1.2.3	Fri Nov 17 19:42:13 2006
+++ xoops2jp/html/modules/legacy/templates/blocks/legacy_block_themes.html	Mon Nov 27 16:42:21 2006
@@ -5,12 +5,12 @@
   <form action="#" method="post">
   <{if $block.mode==1}>
     <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" title="screenshot" width="<{$block.width}>" /><br />
-    <select id="xoops_theme_select" name="xoops_theme_select" onchange="showImgSelected('xoops_theme_img','xoops_theme_select','themes','/screenshot.png', '<{$xoops_url}>');">
+    <select id="xoops_theme_select" name="xoops_theme_select" onchange="showThemeScreenshot('xoops_theme_img','xoops_theme_select', '<{$xoops_url}>');">
   <{else}>
     <select id="xoops_theme_select" name="xoops_theme_select" onchange="submit();" size="3">
   <{/if}>
   <{foreach item=theme_option from=$block.theme_options}>
-      <option value="<{$theme_option.name}>" <{$theme_option.selected}> ><{$theme_option.name}></option>
+      <option value="<{$theme_option.name}>!-!<{$theme_option.screenshot}>" <{$theme_option.selected}> ><{$theme_option.name}></option>
   <{/foreach}>
     </select>
   <{if $block.mode==1}>

From tom_g3x ＠ users.sourceforge.jp  Wed Nov 29 20:34:40 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed, 29 Nov 2006 20:34:40 +0900
Subject: [xoops-cvslog 5957] CVS update:
	xoops2jp/html/modules/stdCache/language/english/help
Message-ID: <20061129113440.9F51E2AC021@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/language/english/help/help.html
diff -u xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.2 xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.3
--- xoops2jp/html/modules/stdCache/language/english/help/help.html:1.1.2.1.2.2	Thu Nov  9 14:15:06 2006
+++ xoops2jp/html/modules/stdCache/language/english/help/help.html	Wed Nov 29 20:34:40 2006
@@ -13,7 +13,7 @@
 
 <h5>The cache clear block</h5>
 <h6>Summary</h6>
-<p>This block is <strong>imvisible</strong> and deletes all of cache files including extra cache files, with interval timer.</p>
+<p>This block is <strong>invisible</strong> and deletes all of cache files including extra cache files, with interval timer.</p>
 
 <h6>Options</h6>
 <p><img src="<{'cacheclear_block_option.png'|helpimage}>" /></p>