From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:36:01 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:36:01 +0900
Subject: [xoops-cvslog 5958] CVS update: xoops2jp/html/core
Message-ID: <20061202153601.9C8612AC166@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Controller.class.php
diff -u xoops2jp/html/core/XCube_Controller.class.php:1.1.2.7 xoops2jp/html/core/XCube_Controller.class.php:1.1.2.8
--- xoops2jp/html/core/XCube_Controller.class.php:1.1.2.7	Mon Nov 27 15:55:01 2006
+++ xoops2jp/html/core/XCube_Controller.class.php	Sun Dec  3 00:36:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Controller.class.php,v 1.1.2.7 2006/11/27 06:55:01 minahito Exp $
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.8 2006/12/02 15:36:01 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -20,6 +20,7 @@
 require_once XOOPS_ROOT_PATH . "/core/XCube_LanguageManager.class.php";
 
 require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
+require_once XOOPS_ROOT_PATH . "/core/XCube_TextFilter.class.php";
 
 /**
  * Virtual or Actual front controller class.
@@ -113,6 +114,14 @@
 	 */
 	var $mExecute = null;
 	
+	/**
+	 * Make a instance of TextFilter.
+	 * void senupTextFilter(XCube_TextFilter &);
+	 * 
+	 * @var XCube_Delegate
+	 */
+	var $mSetupTextFilter = null;
+	
 	function XCube_Controller()
 	{
 		$this->_mBlockChain = array();
@@ -121,6 +130,8 @@
 		
 		$this->mSetupUser =& new XCube_Delegate();
 		$this->mExecute =& new XCube_Delegate();
+		$this->mSetupTextFilter =&  new XCube_Delegate();
+	    $this->mSetupTextFilter->add('XCube_TextFilter::getInstance',XCUBE_DELEGATE_PRIORITY_FINAL);
 	}
 	
 	/**
@@ -160,6 +171,8 @@
 
         $this->_setupLanguage();
 
+        $this->_setupTextFilter();
+
 		$this->_setupConfig();
 		
 		//
@@ -284,6 +297,21 @@
 		$this->mRoot->mLanguageManager =& new XCube_LanguageManager();
 	}
 	
+	
+	/**
+	 * Creates the instance of Text Filter class, and sets it to member
+	 * property.
+	 *
+	 * @access protected
+	 */
+	function _setupTextFilter()
+	{
+	    $textFilter = null;
+	    $this->mSetupTextFilter->call(new XCube_Ref($textFilter));
+	    $this->mRoot->setTextFilter($textFilter);
+	}
+	
+	
 	/**
 	 * This member function is overridden. Loads site configuration informations,
 	 * and sets them to the member property.
Index: xoops2jp/html/core/XCube_Root.class.php
diff -u xoops2jp/html/core/XCube_Root.class.php:1.1.2.4 xoops2jp/html/core/XCube_Root.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_Root.class.php:1.1.2.4	Sat Oct 21 20:08:53 2006
+++ xoops2jp/html/core/XCube_Root.class.php	Sun Dec  3 00:36:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Root.class.php,v 1.1.2.4 2006/10/21 11:08:53 minahito Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.5 2006/12/02 15:36:01 nobunobu Exp $
  */
 
 require_once XOOPS_ROOT_PATH . "/core/XCube_HttpContext.class.php";
@@ -43,6 +43,8 @@
 	
 	var $mCacheSystem = null;
 	
+	var $mTextFilter = null;
+	
 	/**
 	 * @var XCube_HttpContext
 	 */
@@ -291,6 +293,20 @@
 		return $this->mPermissionManager;
 	}
 	
+	function setTextFilter(&$textFilter)
+	{
+		$this->mTextFilter =& $textFilter;
+	}
+	
+	function &getTextFilter()
+	{
+	    if (!empty($this->mTextFilter)) return $this->mTextFilter;
+	    if (!empty($this->mController)) { //ToDo: This case is for _LEGACY_PREVENT_EXEC_COMMON_ status;
+    	    $this->mController->mSetupTextFilter->call(new XCube_Ref($this->mTextFilter));
+    	    return $this->mTextFilter;
+	    }
+	}
+	
 	/**
 	 * Sets the role manager object.
 	 */
Index: xoops2jp/html/core/XCube_TextFilter.class.php
diff -u /dev/null xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.1
--- /dev/null	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/core/XCube_TextFilter.class.php	Sun Dec  3 00:36:01 2006
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package XCube
+ * @version $Id: XCube_TextFilter.class.php,v 1.1.2.1 2006/12/02 15:36:01 nobunobu Exp $
+ */
+/**
+ *
+ * @final
+ */
+class XCube_TextFilter
+{
+    var $mDummy=null;  //Dummy member for preventing object be treated as empty.
+
+    function getInstance(&$instance) {
+       if (empty($instance)) {
+            $instance = new XCube_TextFilter();
+        }
+    }
+    
+    function ToShow($str) {
+        return htmlspecialchars($str, ENT_QUOTES);
+    }
+
+    function ToEdit($str) {
+        return htmlspecialchars($str, ENT_QUOTES);
+    }
+
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:36:01 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:36:01 +0900
Subject: [xoops-cvslog 5959] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061202153601.C9B612AC168@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.26 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.27
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.26	Mon Nov 27 15:54:52 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Sun Dec  3 00:36:01 2006
@@ -18,6 +18,7 @@
 
 require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_CacheInformation.class.php";
 require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_TextFilter.class.php";
 require_once XOOPS_ROOT_PATH . "/modules/legacy/class/Legacy_Debugger.class.php";
 
 /**
@@ -105,7 +106,9 @@
 		
 		$this->mSetupDebugger =& new XCube_Delegate();
 		$this->mSetupDebugger->add('Legacy_DebuggerManager::createInstance');
-		
+
+	    $this->mSetupTextFilter->add('Legacy_TextFilter::getInstance',XCUBE_DELEGATE_PRIORITY_FINAL-1);
+
 		set_magic_quotes_runtime(0);	// ^^;
 	}
 	
@@ -167,14 +170,14 @@
 
         $this->_setupLanguage();
 
+        $this->_setupTextFilter();
+
 		$this->_setupConfig();
 		
 		$this->_setupDebugger();
 
 		$this->_processPreBlockFilter();	// What's !?
 
-//      $this->_processHostAbstractLayer(); // Move it into prepare()
-
 		$this->_setupSession();
 
 		$this->_setupUser();
@@ -223,9 +226,9 @@
 	function _setupEnvironment()
 	{
 		parent::_setupEnvironment();
-		require_once XOOPS_ROOT_PATH."/include/version.php";
+		require_once XOOPS_ROOT_PATH.'/include/version.php';
 		
-		require_once XOOPS_ROOT_PATH."/settings/definition.inc.php";
+		require_once XOOPS_ROOT_PATH.'/settings/definition.inc.php';
 		define("XOOPS_LEGACY_PATH",XOOPS_MODULE_PATH."/".XOOPS_LEGACY_PROC_NAME);
 
 		require_once XOOPS_ROOT_PATH.'/include/functions.php';
@@ -233,11 +236,11 @@
 		require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 		require_once XOOPS_ROOT_PATH.'/class/criteria.php';
 		require_once XOOPS_ROOT_PATH.'/class/token.php';
-		require_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
+		require_once XOOPS_ROOT_PATH.'/class/module.textsanitizer.php';
 
-		require_once XOOPS_LEGACY_PATH."/kernel/object.php";				// ToDo (here?)
-		require_once XOOPS_LEGACY_PATH."/kernel/handler.php";				// ToDo
-		require_once XOOPS_ROOT_PATH."/core/XCube_Utils.class.php";	// ToDo
+		require_once XOOPS_LEGACY_PATH.'/kernel/object.php';				// ToDo (here?)
+		require_once XOOPS_LEGACY_PATH.'/kernel/handler.php';				// ToDo
+		require_once XOOPS_ROOT_PATH.'/core/XCube_Utils.class.php';	// ToDo
 
 		require_once XOOPS_ROOT_PATH.'/class/xoopssecurity.php';
 		$GLOBALS['xoopsSecurity'] =& new XoopsSecurity();
Index: xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php
diff -u /dev/null xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.1
--- /dev/null	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php	Sun Dec  3 00:36:01 2006
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.1 2006/12/02 15:36:01 nobunobu Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class Legacy_TextFilter extends XCube_TextFilter
+{
+    function getInstance(&$instance) {
+        if (empty($instance)) {
+            $instance = new Legacy_TextFilter();
+        }
+    }
+    
+    function ToShow($str) {
+        return preg_replace(array("/&amp;/i", "/&nbsp;/i"), array('&', '&amp;nbsp;'), htmlspecialchars($str, ENT_QUOTES));
+    }
+
+    function ToEdit($str) {
+        return preg_replace("/&amp;(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($str, ENT_QUOTES));
+    }
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:48:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:48:30 +0900
Subject: [xoops-cvslog 5960] CVS update: xoops2jp/html/class
Message-ID: <20061202154830.6EEFE2AC043@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.1 xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.2
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.1	Sat Oct 14 13:51:56 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Sun Dec  3 00:48:30 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.9.2.1 2006/10/14 04:51:56 minahito Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.9.2.2 2006/12/02 15:48:30 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -73,6 +73,21 @@
 	 */
 	var $mXoopsCodePostFilter = null;
 	
+	/**
+	 * @var XCube_Delegate
+	 */
+	var $mCodePreConvPre = null;
+
+	/**
+	 * @var XCube_Delegate
+	 */
+	var $mCodeConvPre = null;
+
+	/**
+	 * @var XCube_TextFilter
+	 */
+	var $mTextFilter = null;
+
     /*
     * Constructor of this class
     *
@@ -97,6 +112,16 @@
 		
 		$this->mXoopsCodePostFilter =& new XCube_Delegate();
 		$this->mXoopsCodePostFilter->register('MyTextSanitizer.XoopsCodePostFilter');
+
+		$this->mCodePreConvPre =& new XCube_Delegate();
+		$this->mCodePreConvPre->register('MyTextSanitizer.CodePreConvPre');
+
+		$this->mCodeConvPre =& new XCube_Delegate();
+		$this->mCodeConvPre->register('MyTextSanitizer.CodeConvPre');
+
+        $root =& XCube_Root::getSingleton();
+        $this->mTextFilter =& $root->getTextFilter();
+
     }
 
     /**
@@ -163,9 +188,9 @@
         $patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
         $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
 
-        // RaiseEvent 'MyTextSanitizer.MakeClickablePre' ('Legacy.TextSanitizer.MakeClicablePre')
+        // RaiseEvent 'MyTextSanitizer.MakeClickablePre'
         //  Delegate may replace makeClickable conversion table
-        //  varArgs : 
+        //  Args : 
         //      'patterns'     [I/O] : &Array of pattern RegExp
         //      'replacements' [I/O] : &Array of replacing string
         //
@@ -173,9 +198,9 @@
 
         $text = preg_replace($patterns, $replacements, $text);
 
-        // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter' ('Legacy.TextSanitizer.MakeClicablePostFilter')
+        // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
-        //  varArgs : 
+        //  Args : 
         //      'string'       [I/O] : Text to convert;
         //
         $this->mMakeClickablePostFilter->call(new XCube_Ref($text));
@@ -251,20 +276,20 @@
         $patterns[] = "/about:/si";
         $replacements[] = "about :";
 
-        // RaiseEvent 'MyTextSanitizer.XoopsCodePre' ('Legacy.TextSanitizer.XoopsCodePre')
+        // RaiseEvent 'MyTextSanitizer.XoopsCodePre'
         //  Delegate may replace conversion table
-        //  varArgs : 
+        //  Args : 
         //      'patterns'     [I/O] : &Array of pattern RegExp
         //      'replacements' [I/O] : &Array of replacing string
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
         $this->mXoopsCodePre->call(new XCube_Ref($patterns), new XCube_Ref($replacements), $allowimage);
-
+        
         $text = preg_replace($patterns, $replacements, $text);
         
-        // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter' ('Legacy.TextSanitizer.XoopsCodePostFilter')
+        // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
-        //  varArgs : 
+        //  Args : 
         //      'string'       [I/O] : Text to convert;
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
@@ -349,13 +374,17 @@
     *  for displaying data in html textbox forms
     *
     * @param    string  $text
+    * @param    bool    $forEdit (experimental)
     *
     * @return   string
     */
-    function &htmlSpecialChars($text)
+    function &htmlSpecialChars($text, $forEdit=false)
     {
-        //return preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
-        $ret = preg_replace(array("/&amp;/i", "/&nbsp;/i"), array('&', '&amp;nbsp;'), htmlspecialchars($text, ENT_QUOTES));
+        if (!$forEdit) {
+            $ret = $this->mTextFilter->ToShow($text);
+        } else {
+            $ret = $this->mTextFilter->ToEdit($text);
+        }
 		return $ret;
     }
 
@@ -385,11 +414,11 @@
      **/
     function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
+        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         if ($html != 1) {
             // html not allowed
-            $text =& $this->htmlSpecialChars($text);
+            $text = $this->mTextFilter->ToShow($text);
         }
-        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         $text =& $this->makeClickable($text);
         if ($smiley != 0) {
             // process smiley
@@ -426,11 +455,11 @@
     function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
         $text =& $this->stripSlashesGPC($text);
+        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         if ($html != 1) {
             // html not allowed
-            $text =& $this->htmlSpecialChars($text);
+            $text = $this->mTextFilter->ToShow($text);
         }
-        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
         $text =& $this->makeClickable($text);
         if ($smiley != 0) {
             // process smiley
@@ -493,8 +522,17 @@
      */
     function codePreConv($text, $xcode = 1) {
         if($xcode != 0){
-            $patterns = "/\[code](.*)\[\/code\]/esU";
-            $replacements = "'[code]'.base64_encode('$1').'[/code]'";
+            $patterns = array();
+            $replacements = array();
+            $patterns[] = "/\[code](.*)\[\/code\]/esU";
+            $replacements[] = "'[code]'.base64_encode('$1').'[/code]'";
+            // RaiseEvent 'MyTextSanitizer.CodePreConvePre'
+            //  Delegate may replace conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //
+            $this->mCodePreConvPre->call(new XCube_Ref($patterns), new XCube_Ref($replacements));
             $text =  preg_replace($patterns, $replacements, $text);
         }
         return $text;
@@ -502,16 +540,30 @@
 
     function codeConv($text, $xcode = 1, $image = 1){
         if($xcode != 0){
-            $patterns = "/\[code](.*)\[\/code\]/esU";
+            $patterns = array();
+            $replacements = array();
+            // RaiseEvent 'MyTextSanitizer.CodeConvPre'
+            //  Delegate may replace conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
+            //  Caution :
+            //     - Conversion table order should be reverse order with codePreConv conversion table.
+            //       So, conversion rule for[code] is defined after call delegate function.
+            //     - Conversion rule should treat input string as raw text(not sanitized).
+            //
+            $this->mCodeConvPre->call(new XCube_Ref($patterns), new XCube_Ref($replacements), $image);
+
+            $patterns[] = "/\[code](.*)\[\/code\]/esU";
             if ($image != 0) {
                 // image allowed
-                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
-                //$text =& $this->xoopsCodeDecode($text);
+                $replacements[] = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
             } else {
                 // image not allowed
-                $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
-                //$text =& $this->xoopsCodeDecode($text, 0);
+                $replacements[] = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
             }
+
             $text =  preg_replace($patterns, $replacements, $text);
         }
         return $text;
@@ -520,17 +572,16 @@
     function codeSanitizer($str, $image = 1){
         if($image != 0){
             $str = $this->xoopsCodeDecode(
-                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str)))
+                  htmlspecialchars(str_replace('\"', '"', base64_decode($str)),ENT_QUOTES)
                 );
         }else{
             $str = $this->xoopsCodeDecode(
-                $this->htmlSpecialChars(str_replace('\"', '"', base64_decode($str))),0
+                htmlspecialchars(str_replace('\"', '"', base64_decode($str)),ENT_QUOTES),0
                 );
         }
         return $str;
     }
 
-
     /**#@-*/
 
 
@@ -542,7 +593,7 @@
     function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
         if ( $allowhtml == 0 ) {
-            $text = $this->htmlSpecialChars($text);
+            $text = $this->mTextFilter->ToShow($text);
         } else {
             //$config =& $GLOBALS['xoopsConfig'];
             //$allowed = $config['allowed_html'];
@@ -563,7 +614,7 @@
     {
         $text = $this->oopsStripSlashesGPC($text);
         if ( $allowhtml == 0 ) {
-            $text = $this->htmlSpecialChars($text);
+            $text = $this->mTextFilter->ToShow($text);
         } else {
             //$config =& $GLOBALS['xoopsConfig'];
             //$allowed = $config['allowed_html'];
@@ -588,26 +639,26 @@
 
     function makeTboxData4Show($text, $smiley=0)
     {
-        $text = $this->htmlSpecialChars($text);
+        $text = $this->mTextFilter->ToShow($text);
         return $text;
     }
 
     function makeTboxData4Edit($text)
     {
-        return $this->htmlSpecialChars($text);
+        return $this->mTextFilter->ToEdit($text);
     }
 
     function makeTboxData4Preview($text, $smiley=0)
     {
         $text = $this->stripSlashesGPC($text);
-        $text = $this->htmlSpecialChars($text);
+        $text = $this->mTextFilter->ToShow($text);
         return $text;
     }
 
     function makeTboxData4PreviewInForm($text)
     {
         $text = $this->stripSlashesGPC($text);
-        return $this->htmlSpecialChars($text);
+        return $this->mTextFilter->ToShow($text);
     }
 
     function makeTareaData4Save($text)
@@ -623,7 +674,7 @@
 
     function makeTareaData4Edit($text)
     {
-        return $this->htmlSpecialChars($text);
+        return $this->mTextFilter->ToEdit($text);
     }
 
     function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
@@ -636,12 +687,12 @@
     {
         //if magic_quotes_gpc is on, do stipslashes
         $text = $this->stripSlashesGPC($text);
-        return $this->htmlSpecialChars($text);
+        return $this->mTextFilter->ToShow($text);
     }
 
     function makeTareaData4InsideQuotes($text)
     {
-        return $this->htmlSpecialChars($text);
+        return $this->mTextFilter->ToShow($text);
     }
 
     function &oopsStripSlashesGPC($text)
@@ -666,7 +717,7 @@
 
     function &oopsHtmlSpecialChars($text)
     {
-        $ret = $this->htmlSpecialChars($text);
+        $ret = $this->mTextFilter->ToShow($text);
         return $ret;
     }
 

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:48:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:48:30 +0900
Subject: [xoops-cvslog 5961] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061202154830.9CF682AC04D@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4 xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4	Thu Jul 13 17:24:46 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php	Sun Dec  3 00:48:30 2006
@@ -10,7 +10,7 @@
  *    used. For format xoops_xxxx functions, we may change XoopsForm class
  *    group.
  * 
- * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4 2006/07/13 08:24:46 minahito Exp $
+ * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4.2.1 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 /*
@@ -43,6 +43,8 @@
 	}
 	$form = null;
 
+    $root =& XCube_Root::getSingleton();
+    $textFilter =& $root->getTextFilter();
 	if (isset($params['name'])) {
 		//
 		// Fetch major elements from $params.
@@ -51,13 +53,13 @@
 		$class = isset($params['class']) ? trim($params['class']) : null;
 		$cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_DHTMLTAREA_DEFAULT_COLS;
 		$rows = isset($params['rows']) ? intval($params['rows']) : XOOPS_DHTMLTAREA_DEFAULT_ROWS;
-		$value = isset($params['value']) ? trim($params['value']) : null;
+		$value = isset($params['value']) ? $textFilter->ToEdit(trim($params['value'])) : null;
 		$id = isset($params['id']) ? trim($params['id']) : XOOPS_DHTMLTAREA_DEFID_PREFIX . $name;
 
 		//
 		// Build the object for output.
 		//
-		$form =& new XoopsFormDhtmlTextArea($name, $name, htmlspecialchars($value), $rows, $cols);
+		$form =& new XoopsFormDhtmlTextArea($name, $name, $value, $rows, $cols);
 		$form->setId($id);
 		if ($class != null) {
 			$form->setClass($class);
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.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.1	Sun Nov 12 14:11:24 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php	Sun Dec  3 00:48:30 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.2.1 2006/11/12 05:11:24 tom_g3x Exp $
+ * @version $Id: function.xoops_input.php,v 1.1.2.9.2.2 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 /*
@@ -44,10 +44,12 @@
 		//
 		// Fetch major elements from $params.
 		//
+        $root =& XCube_Root::getSingleton();
+        $textFilter =& $root->getTextFilter();
 		$name = trim($params['name']);
 		$key = isset($params['key']) ? trim($params['key']) : null;
 		$type = isset($params['type']) ? strtolower(trim($params['type'])) : "text";
-		$value = isset($params['value']) ? htmlspecialchars($params['value'], ENT_QUOTES) : null;
+		$value = isset($params['value']) ? $textFilter->ToEdit($params['value']) : null;
 		$class = isset($params['class']) ? trim($params['class']) : null;
 		$id = isset($params['id']) ? trim($params['id']) : XOOPS_INPUT_DEFID_PREFIX . $name;
 		$size = isset($params['size']) ? intval($params['size']) : null;
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.2 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.3
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.2	Sun Nov 12 14:11:24 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Sun Dec  3 00:48:30 2006
@@ -30,10 +30,11 @@
 	$objectArr =& $params['from'];
 	$default = isset($params['default']) ? $params['default'] : null;
 	$id = isset($params['id']) ? $params['id'] : null;
-
+    $root =& XCube_Root::getSingleton();
+    $textFilter =& $root->getTextFilter();
 	foreach ($objectArr as $object) {
-		$value = htmlspecialchars($object->get($params['value']), ENT_QUOTES);
-		$label = htmlspecialchars($object->get($params['label']), ENT_QUOTES);
+	    $value = $textFilter->ToShow($object->get($params['value']));
+	    $label = $textFilter->ToShow($object->get($params['label']));
 		
 		$selected = "";
 		if (is_array($default) && in_array($object->get($params['value']), $default)) {
Index: xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5	Tue Aug  8 17:29:00 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php	Sun Dec  3 00:48:30 2006
@@ -7,7 +7,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_textarea.php,v 1.1.2.5 2006/08/08 08:29:00 tom_g3x Exp $
+ * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.1 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 /*
@@ -37,6 +37,8 @@
 
 function smarty_function_xoops_textarea($params, &$smarty)
 {
+    $root =& XCube_Root::getSingleton();
+    $textFilter =& $root->getTextFilter();
 	if (isset($params['name'])) {
 		//
 		// Fetch major elements from $params.
@@ -45,7 +47,7 @@
 		$class = isset($params['class']) ? trim($params['class']) : null;
 		$cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_TEXTAREA_DEFAULT_COLS;
 		$rows = isset($params['rows']) ? intval($params['rows']) : XOOPS_TEXTAREA_DEFAULT_ROWS;
-		$value = isset($params['value']) ? htmlspecialchars($params['value'], ENT_QUOTES) : null;
+		$value = isset($params['value']) ? $textFilter->ToEdit($params['value']) : null;
 		$id = isset($params['id']) ? trim($params['id']) : XOOPS_TEXTAREA_DEFID_PREFIX . $name;
 		$readonly = isset($params['readonly']) ? trim($params['readonly']) : null;
 
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php
diff -u /dev/null xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php:1.1.2.1
--- /dev/null	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php	Sun Dec  3 00:48:30 2006
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Smarty plugin
+ * @package Smarty
+ * @subpackage plugins
+ */
+
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * Type:     modifier
+ * Name:     xoops_escape
+ * Author:   nobunobu
+ * Purpose:  Escape the string according to escapement type(XOOPS custom version)
+ * @param string
+ * @param show|edit|plain|link
+ * @return string
+ * 
+ * Examples: {$msg|xoops_excape}
+ * -------------------------------------------------------------
+ */
+
+function smarty_modifier_xoops_escape($string, $esc_type = 'show')
+{
+    $root =& XCube_Root::getSingleton();
+    $textFilter =& $root->getTextFilter();
+    switch ($esc_type) {
+        case 'show':
+            return $textFilter->ToShow($string);
+
+        case 'edit':
+            return $textFilter->ToEdit($string);
+
+        case 'plain':
+        case 'link':
+            return htmlspecialchars($string, ENT_QUOTES);
+
+        default:
+            return $string;
+    }
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:48:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:48:30 +0900
Subject: [xoops-cvslog 5962] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061202154830.C02B02AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/object.php
diff -u xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.1 xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.2
--- xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.1	Sat Oct 14 23:55:24 2006
+++ xoops2jp/html/modules/legacy/kernel/object.php	Sun Dec  3 00:48:30 2006
@@ -158,7 +158,9 @@
 				break;
 
 			case XOBJ_DTYPE_STRING:
-				$value = htmlspecialchars($this->mVars[$key]['value'], ENT_QUOTES);
+                $root =& XCube_Root::getSingleton();
+                $textFilter =& $root->getTextFilter();
+			    $value = $textFilter->ToShow($this->mVars[$key]['value']);
 				break;
 
 			case XOBJ_DTYPE_TEXT:

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:48:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:48:30 +0900
Subject: [xoops-cvslog 5963] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20061202154830.E67F62AC04D@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.15 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.16
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.15	Sat Nov 25 19:01:30 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Sun Dec  3 00:48:30 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.15 2006/11/25 10:01:30 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.16 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -118,6 +118,10 @@
 	{
 		parent::prepare($controller);
 		
+		$root =& $this->mController->mRoot;
+		$context =& $root->getContext();
+		$textFilter =& $root->getTextFilter();
+		
 		// XoopsTpl default setup
 		$this->mXoopsTpl =& new Legacy_XoopsTpl();
 		$this->mXoopsTpl->register_function("legacy_notifications_select", "LegacyRender_smartyfunction_notifications_select");
@@ -128,11 +132,6 @@
 		
 		$this->mXoopsTpl->xoops_setCaching(0);
 
-		$this->mXoopsTpl->assign(array('xoops_requesturi' => htmlspecialchars($GLOBALS['xoopsRequestUri'], ENT_QUOTES),	//@todo ?????????????
-									// 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"><!--'
-								));
-
 		// If debugger request debugging to me, send debug mode signal by any methods.
 		if ($controller->mDebugger->isDebugRenderSystem()) {
 			$this->mXoopsTpl->xoops_setDebugging(true);
@@ -142,10 +141,9 @@
 							// 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));
+		$this->mXoopsTpl->assign('xoops_sitename', $textFilter->ToShow($context->getAttribute('legacy_sitename')));
+		$this->mXoopsTpl->assign('xoops_pagetitle', $textFilter->ToShow($context->getAttribute('legacy_pagetitle')));
+		$this->mXoopsTpl->assign('xoops_slogan', $textFilter->ToShow($context->getAttribute('legacy_slogan')));
 
 		// --------------------------------------
 		// Meta tags
@@ -157,13 +155,13 @@
 			$configHandler =& xoops_gethandler('config');
 			$configs =& $configHandler->getConfigsByCat(0, $legacyRender->get('mid'));
 			
-			$this->mXoopsTpl->assign('xoops_meta_keywords', $configs['meta_keywords']);
-			$this->mXoopsTpl->assign('xoops_meta_description', $configs['meta_description']);
-			$this->mXoopsTpl->assign('xoops_meta_robots', $configs['meta_robots']);
-			$this->mXoopsTpl->assign('xoops_meta_rating', $configs['meta_rating']);
-			$this->mXoopsTpl->assign('xoops_meta_author', $configs['meta_author']);
-			$this->mXoopsTpl->assign('xoops_meta_copyright', $configs['meta_copyright']);
-			$this->mXoopsTpl->assign('xoops_footer', $configs['footer']);
+			$this->mXoopsTpl->assign('xoops_meta_keywords', $textFilter->ToShow($configs['meta_keywords']));
+			$this->mXoopsTpl->assign('xoops_meta_description', $textFilter->ToShow($configs['meta_description']));
+			$this->mXoopsTpl->assign('xoops_meta_robots', $textFilter->ToShow($configs['meta_robots']));
+			$this->mXoopsTpl->assign('xoops_meta_rating', $textFilter->ToShow($configs['meta_rating']));
+			$this->mXoopsTpl->assign('xoops_meta_author', $textFilter->ToShow($configs['meta_author']));
+			$this->mXoopsTpl->assign('xoops_meta_copyright', $textFilter->ToShow($configs['meta_copyright']));
+			$this->mXoopsTpl->assign('xoops_footer', $configs['footer']); // footer may be raw HTML text.
 			
 			//
 			// If this site has the setting of banner.
@@ -184,11 +182,11 @@
 		// Add User
 		// --------------------------------------
 		$arr = null;
-		if (is_object($this->mController->mRoot->mContext->mXoopsUser)) {
+		if (is_object($context->mXoopsUser)) {
 			$arr = array(
 				'xoops_isuser' => true,
-				'xoops_userid' => $this->mController->mRoot->mContext->mXoopsUser->getShow('uid'),
-				'xoops_uname' => $this->mController->mRoot->mContext->mXoopsUser->getShow('uname')
+				'xoops_userid' => $context->mXoopsUser->getShow('uid'),
+				'xoops_uname' => $context->mXoopsUser->getShow('uname')
 			);
 		}
 		else {
@@ -216,20 +214,24 @@
 	 */
 	function _commonPrepareRender()
 	{
-		$themeName = $this->mController->mRoot->mContext->getThemeName();
+		$root =& $this->mController->mRoot;
+		$context =& $root->getContext();
+		$textFilter =& $root->getTextFilter();
+
+		$themeName = $context->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->mXoopsTpl->assign('xoops_sitename', $textFilter->ToShow($context->getAttribute('legacy_sitename')));
+		$this->mXoopsTpl->assign('xoops_pagetitle', $textFilter->ToShow($context->getAttribute('legacy_pagetitle')));
+		$this->mXoopsTpl->assign('xoops_slogan', $textFilter->ToShow($context->getAttribute('legacy_slogan')));
 
 		//
 		// Assign module informations.
 		//
-		if($this->mController->mRoot->mContext->mModule != null) {	// The process of module
-			$xoopsModule =& $this->mController->mRoot->mContext->mXoopsModule;
+		if($context->mModule != null) {	// The process of module
+			$xoopsModule =& $context->mXoopsModule;
 			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
 			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
 		}

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:20 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:20 +0900
Subject: [xoops-cvslog 5964] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20061202155020.C34F42AC04D@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.2 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13.2.3
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.13.2.2	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Sun Dec  3 00:50:20 2006
@@ -18,7 +18,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.8.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.8	Sat Aug 19 17:37:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html	Sun Dec  3 00:50:20 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.8.2.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.8.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.8.2.1	Thu Oct 12 22:56:44 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html	Sun Dec  3 00:50:20 2006
@@ -44,8 +44,8 @@
       <td class="legacyRender_list_description"><{$obj->getShow('extrainfo')}></td>
       <td class="legacyRender_list_control">
         <{assign var=count value=count($obj->mBanners)}>
-        <a href="./index.php?action=BannerList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>(<{$obj->mBannerCount|escape}>)</a><br />
-        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|escape}>)</a><br />
+        <a href="./index.php?action=BannerList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>(<{$obj->mBannerCount|xoops_escape}>)</a><br />
+        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|xoops_escape}>)</a><br />
         <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->getShow('cid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <a href="./index.php?action=BannerclientDelete&amp;cid=<{$obj->getShow('cid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.8.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.8	Sun Aug 20 22:25:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html	Sun Dec  3 00:50:20 2006
@@ -24,7 +24,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -70,7 +70,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-        <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea"><{$actionForm->get('tpl_source')|escape}></textarea>
+        <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea"><{$actionForm->get('tpl_source')|xoops_escape:plain}></textarea>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.14 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.14.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.14	Sun Aug 20 22:25:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html	Sun Dec  3 00:50:20 2006
@@ -24,7 +24,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -69,7 +69,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-        <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea"><{$actionForm->get('tpl_source')|escape}></textarea>
+        <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea"><{$actionForm->get('tpl_source')|xoops_escape:plain}></textarea>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24.2.2 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24.2.3
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24.2.2	Fri Oct 13 14:09:34 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html	Sun Dec  3 00:50:20 2006
@@ -58,7 +58,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -147,13 +147,13 @@
               <{xoops_input type=file name=upload key=$obj->mOverride->get('tpl_id')}>
             </td>
           <{elseif $obj->mOverride == null && $targetTplset != null && $targetTplset != 'default'}>
-            <a href="index.php?action=TplfileClone&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$targetTplset|escape}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /></a>
+            <a href="index.php?action=TplfileClone&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$targetTplset|xoops_escape:link}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /></a>
             <td class="legacyRender_list_control">&nbsp;</td>
           <{else}>
             <{if $obj->get('tpl_tplset') == 'default'}>
               <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
             <{else}>
-              <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$obj->getShow('tpl_tplset')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+              <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$obj->getShow('tpl_tplset')|xoops_escape:link}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
             <{/if}>
             <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /></a>
           <{/if}>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.9.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.9	Sun Aug 20 22:25:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html	Sun Dec  3 00:50:20 2006
@@ -55,7 +55,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-      <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea" readonly="readonly"><{$object->Source->get('tpl_source')|escape}></textarea>
+      <textarea name=tpl_source id=tpl_source class="legacyRender_TemplateManager_textarea" readonly="readonly"><{$object->Source->get('tpl_source')|xoops_escape:plain}></textarea>
     </td>
   </tr>
     <tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.12 xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.12.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.12	Mon Aug 14 21:46:44 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html	Sun Dec  3 00:50:20 2006
@@ -10,7 +10,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.11 xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.11.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.11	Sun Aug 20 22:25:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html	Sun Dec  3 00:50:20 2006
@@ -29,7 +29,7 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->get('tplset_credits')|escape|nl2br}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->get('tplset_credits')|xoops_escape|nl2br}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREATED}></td>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.13 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.13.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.13	Sun Aug 20 22:25:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html	Sun Dec  3 00:50:20 2006
@@ -10,7 +10,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.28.2.1 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.28.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.28.2.1	Thu Oct 12 22:56:44 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html	Sun Dec  3 00:50:20 2006
@@ -28,7 +28,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -67,12 +67,12 @@
           <p class="legacyRender_list_description"><{$obj->getShow('tplset_desc')}></p>
         <{/if}>
       </td>
-      <td class="legacyRender_list_text"><{$obj->get('tplset_credits')|escape|nl2br}></td>
+      <td class="legacyRender_list_text"><{$obj->get('tplset_credits')|xoops_escape|nl2br}></td>
       <td class="legacyRender_list_date"><{$obj->get('tplset_created')|xoops_formattimestamp:l}></td>
       <td class="legacyRender_list_text">
         <ul>
         <{foreach item=moduletpl from=$obj->mModuleTemplates}>
-          <li><a href="./index.php?action=TplfileList&amp;tpl_tplset=<{$obj->get('tplset_name')|escape}>&amp;tpl_module=<{$moduletpl->get('dirname')|escape}>"><{$moduletpl->getShow('name')}></a> (<{$moduletpl->getShow('count')}>)</li>
+          <li><a href="./index.php?action=TplfileList&amp;tpl_tplset=<{$obj->get('tplset_name')|xoops_escape:link}>&amp;tpl_module=<{$moduletpl->get('dirname')|xoops_escape}>"><{$moduletpl->getShow('name')}></a> (<{$moduletpl->getShow('count')}>)</li>
         <{/foreach}>
         </ul>
       </td>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.7.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.7	Mon Aug 14 21:46:44 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html	Sun Dec  3 00:50:20 2006
@@ -14,7 +14,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload_error.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload_error.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload_error.html:1.1.2.5.2.1
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload_error.html:1.1.2.5	Mon Aug 14 21:05:18 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload_error.html	Sun Dec  3 00:50:20 2006
@@ -3,7 +3,7 @@
 <div class="error">
 <ul>
   <{foreach item=message from=$errorMessages}>
-    <li><{$message|escape}></li>
+    <li><{$message|xoops_escape}></li>
   <{/foreach}>
 </ul>
 </div>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:21 +0900
Subject: [xoops-cvslog 5965] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061202155021.28F522AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/block_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_edit.html	Sun Dec  3 00:50:20 2006
@@ -10,7 +10,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/block_list.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/block_list.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_list.html	Sun Dec  3 00:50:20 2006
@@ -18,7 +18,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html	Sun Dec  3 00:50:20 2006
@@ -10,7 +10,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/comment_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/comment_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_edit.html	Sun Dec  3 00:50:20 2006
@@ -20,7 +20,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/customblock_edit.html	Sun Dec  3 00:50:20 2006
@@ -28,7 +28,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/help.html
diff -u xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/help.html:1.1.2.2	Wed Nov  8 19:53:49 2006
+++ xoops2jp/html/modules/legacy/admin/templates/help.html	Sun Dec  3 00:50:20 2006
@@ -1,10 +1,10 @@
 <div class="adminnavi">
-  <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a>
+  <a href="<{$module->getAdminIndex()|xoops_escape:link}>"><{$module->mXoopsModule->getShow('name')}></a>
   &raquo;&raquo; <span class="adminnaviTitle"><{$smarty.const._HELP}></span>
 </div>
 
 <h3 class="admintitle"><{$smarty.const._HELP}>
- <a href="<{$module->getAdminIndex()|escape}>"><{$module->mXoopsModule->getShow('name')}></a>
+ <a href="<{$module->getAdminIndex()|xoops_escape:link}>"><{$module->mXoopsModule->getShow('name')}></a>
 </h3>
 
 <div class="help"><{$contents}></div>
Index: xoops2jp/html/modules/legacy/admin/templates/image_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/image_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/image_edit.html	Sun Dec  3 00:50:20 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html:1.1.2.4	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/imagecategory_edit.html	Sun Dec  3 00:50:20 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/imagecategory_list.html	Sun Dec  3 00:50:20 2006
@@ -61,7 +61,7 @@
       </td>
       <td class="legacy_list_order"><{$obj->getShow('imgcat_weight')}></td>
       <td class="legacy_list_type"><{$obj->getShow('imgcat_storetype')}></td>
-      <td class="legacy_list_number"><{$obj->getImageCount()|escape}></td>
+      <td class="legacy_list_number"><{$obj->getImageCount()|xoops_escape}></td>
       <td class="legacy_list_control">
         <a href="./index.php?action=ImageList&amp;imgcat_id=<{$obj->getShow('imgcat_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_LIST}>" title="<{$smarty.const._AD_LEGACY_LANG_LIST}>" /></a>
         <a href="./index.php?action=ImageCreate&amp;imgcat_id=<{$obj->getShow('imgcat_id')}>"><img src="<{"icons/add.gif"|theme}>" alt="<{$smarty.const._AD_LEGACY_LANG_IMAGE_NEW}>" title="<{$smarty.const._AD_LEGACY_LANG_IMAGE_NEW}>" /></a>
Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard.html
diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/install_wizard.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/install_wizard.html	Sun Dec  3 00:50:20 2006
@@ -20,13 +20,13 @@
   </tr>
   <tr>
     <td class="head legacy_list_image">
-      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.installer.image|escape}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" />
+      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.installer.image|xoops_escape:link}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" />
     </td>
     <td class="even">
       <h4 class="admintitle"><{$module->getShow('name')}></h4>
       <ul>
         <{foreach item=item from=$module->modinfo.installer.description}>
-          <li><{$item|escape}>
+          <li><{$item|xoops_escape}>
         <{/foreach}>
       </ul>
     </td>
Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html
diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html:1.1.2.2	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/install_wizard_error.html	Sun Dec  3 00:50:20 2006
@@ -3,11 +3,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li class="legacy_module_error"><{$msg.message|escape}></li>
+    <li class="legacy_module_error"><{$msg.message|xoops_escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li class="legacy_module_warning"><{$msg.message|escape}></li>
+    <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li>
   <{else}>
-    <li class="legacy_module_message"><{$msg.message|escape}></li>
+    <li class="legacy_module_message"><{$msg.message|xoops_escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html
diff -u xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html:1.1.2.3	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/install_wizard_licence.html	Sun Dec  3 00:50:20 2006
@@ -5,13 +5,13 @@
   &raquo;&raquo; <span class="adminnaviTitle"><{$smarty.const._AD_LEGACY_LANG_MODINSTALL_CONF}></span>
 </div>
 
-<h3 class="admintitle"><{$licence|escape}></h3>
+<h3 class="admintitle"><{$licence|xoops_escape}></h3>
 
 <{if $actionForm->hasError()}>
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -22,11 +22,11 @@
 <{xoops_input type=hidden name=dirname value=$actionForm->get('dirname')}>
 <table class="outer">
   <tr>
-    <th><{$licence|escape}></th>
+    <th><{$licence|xoops_escape}></th>
   </tr>
   <tr>
     <td class="head">
-      <textarea cols="75" rows="15"><{$licenceText|escape}></textarea>
+      <textarea cols="75" rows="15"><{$licenceText|xoops_escape:edit}></textarea>
     </td>
   <tr>
     <td class="foot">
Index: xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html
diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_form.html	Sun Dec  3 00:50:20 2006
@@ -10,7 +10,7 @@
 <form action="index.php" method="get">
   <{xoops_input type=hidden name=action value=ActSearch}>
   <{xoops_token form=$actionForm}>
-  <input type="text" size="40" name="keywords" <{if $actionForm}>value="<{$actionForm->get('keywords')|escape}>"<{/if}> />
+  <input type="text" size="40" name="keywords" <{if $actionForm}>value="<{$actionForm->get('keywords')|xoops_escape:edit}>"<{/if}> />
   <input type="submit" value="<{$smarty.const._SEARCH}>" class="formButton" />
 </form>
 </div>
\ No newline at end of file
Index: xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html
diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/legacy_admin_actionsearch_success.html	Sun Dec  3 00:50:20 2006
@@ -4,9 +4,9 @@
 
 <ul class="legacy_actionsearch_records">
   <{foreach item=record from=$records}>
-    <li>[ <{$record->mModuleName|escape}> ] &raquo;&raquo; <a href="<{$record->mActionUrl}>"><{$record->mTitle|escape}></a>
+    <li>[ <{$record->mModuleName|xoops_escape}> ] &raquo;&raquo; <a href="<{$record->mActionUrl}>"><{$record->mTitle|xoops_escape}></a>
       <{if $record->mDescription}>
-        <div class="legacy_actionsearch_records_desc"><{$record->mDescription|escape}></div>
+        <div class="legacy_actionsearch_records_desc"><{$record->mDescription|xoops_escape}></div>
       <{/if}>
     </li>
   <{/foreach}>
Index: xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html
diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html:1.1.2.2	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_confirm.html	Sun Dec  3 00:50:20 2006
@@ -1,11 +1,11 @@
 <div class='confirmMsg'>
   <h4 class="admintitle"><{$message}></h4>
-  <form method="post" action="<{$action|escape}>">
+  <form method="post" action="<{$action|xoops_escape}>">
     <{xoops_input type=hidden name=$tokenName value=$tokenValue}>
     <{foreach key=key item=value from=$hiddens}>
       <{if is_array($value)}>
         <{foreach key=radioName item=radioValue from=$value}>
-          <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|escape}></label><br/>
+          <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|xoops_escape}></label><br/>
         <{/foreach}>
       <{else}>
         <{xoops_input type=hidden name=$key value=$value}>
Index: xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html
diff -u xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.1 xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.2
--- xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html:1.1.2.1	Sat Oct 14 23:55:24 2006
+++ xoops2jp/html/modules/legacy/admin/templates/legacy_xoops_error.html	Sun Dec  3 00:50:20 2006
@@ -4,9 +4,9 @@
   <{/if}>
   <{if is_array($message)}>
     <{foreach item=msg from=$message}>
-      <{$msg|escape}><br/>
+      <{$msg|xoops_escape}><br/>
     <{/foreach}>
   <{else}>
-    <{$message|escape}>
+    <{$message|xoops_escape}>
   <{/if}>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/module_information.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/module_information.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_information.html	Sun Dec  3 00:50:20 2006
@@ -17,7 +17,7 @@
   <tr>
     <td class="head legacy_list_image" rowspan="6">
       <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" />
-      <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div>
+      <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div>
     </td>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td>
 	<td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
@@ -112,7 +112,7 @@
 <{foreach from=$module->modinfo.tables item=table key=table_key}>
   <tr class="<{cycle values='odd,even'}>">
 	<td class="head legacy_list_id"><{$table_key}></td>
-	<td><{$table|escape}></td>
+	<td><{$table|xoops_escape}></td>
 	<td></td>
   </tr>
 <{/foreach}>
@@ -172,15 +172,15 @@
   </tr>
   <tr class="<{cycle values='odd,even'}>">
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_ADMINMENU_INDEX}></td>
-	<td><{$module->modinfo.adminindex|escape}></td>
+	<td><{$module->modinfo.adminindex|xoops_escape}></td>
   </tr>
   <tr class="<{cycle values='odd,even'}>">
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_ADMINMENU_MENU}></td>
-	<td><{$module->modinfo.adminmenu|escape}></td>
+	<td><{$module->modinfo.adminmenu|xoops_escape}></td>
   </tr>
   <tr class="<{cycle values='odd,even'}>">
 	<td class="head"><{$smarty.const._HELP}></td>
-	<td><{$module->modinfo.help|escape}></td>
+	<td><{$module->modinfo.help|xoops_escape}></td>
   </tr>
 </table>
 <{if $module->adminmenu}>
@@ -193,9 +193,9 @@
   </tr>
   <{foreach from=$module->adminmenu item=admin key=admin_key}>
   <tr class="<{cycle values='odd,even'}>">
-	<td class="head legacy_list_id"><{$admin_key|escape}></td>
-    <td><{$admin.title|escape}></td>
-    <td><{$admin.link|escape}></td>
+	<td class="head legacy_list_id"><{$admin_key|xoops_escape}></td>
+    <td><{$admin.title|xoops_escape}></td>
+    <td><{$admin.link|xoops_escape}></td>
   </tr>
   <{/foreach}>
 </table>
@@ -231,8 +231,8 @@
 <{foreach from=$module->modinfo.templates item=template key=template_key}>
   <tr class="<{cycle values='odd,even'}>">
 	<td class="head legacy_list_id"><{$template_key}></td>
-	<td><{$template.file|escape}></td>
-	<td><{$template.description|escape}></td>
+	<td><{$template.file|xoops_escape}></td>
+	<td><{$template.description|xoops_escape}></td>
   </tr>
 <{/foreach}>
 </table>
@@ -247,16 +247,16 @@
 <{foreach from=$module->modinfo.blocks item=block key=block_num }>
 <table class="outer">
   <tr>
-	<th><{$smarty.const._AD_LEGACY_LANG_BLOCK_KEY}> (<{$block_num|escape}>)</th>
+	<th><{$smarty.const._AD_LEGACY_LANG_BLOCK_KEY}> (<{$block_num|xoops_escape}>)</th>
 	<th><{$smarty.const._AD_LEGACY_LANG_BLOCK_VAL}></th>
   </tr>
   <{foreach from=$block key=block_key item=block_val name=block }>
   <tr class="<{cycle values='odd,even' name=block}>">
-	<td class="head legacy_list_name" style="width:30%;"><{$block_key|escape}></td>
+	<td class="head legacy_list_name" style="width:30%;"><{$block_key|xoops_escape}></td>
 	<{if $block_key == "name" }>
-	  <td><b><{$block_val|escape}></b></td>
+	  <td><b><{$block_val|xoops_escape}></b></td>
 	<{else}>
-	  <td><{$block_val|escape}></td>
+	  <td><{$block_val|xoops_escape}></td>
 	<{/if}>
   </tr>
   <{/foreach}>
@@ -278,16 +278,16 @@
   </tr>
   <{foreach from=$config key=config_key item=config_val name=config}>
   <tr class="<{cycle values="odd,even" name=config}>">
-	<td class="head legacy_list_name" style="width:30%;"><{$config_key|escape}></td>
+	<td class="head legacy_list_name" style="width:30%;"><{$config_key|xoops_escape}></td>
 	<td>
 	  <{if $config_key == "name" }>
-	    <b><{$config_val|escape}></b>
+	    <b><{$config_val|xoops_escape}></b>
       <{elseif $config_key == options }>
 	    <{foreach from=$config_val item=opt key=opt_key }>
-	      <{$opt_key}> &raquo; <{$opt|escape}><br />
+	      <{$opt_key}> &raquo; <{$opt|xoops_escape}><br />
 	    <{/foreach}>
 	  <{else}>
-	    <{$config_val|escape}>
+	    <{$config_val|xoops_escape}>
 	  <{/if}>
 	</td>
   </tr>
Index: xoops2jp/html/modules/legacy/admin/templates/module_install.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/module_install.html:1.1.2.4	Wed Nov  1 23:56:56 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_install.html	Sun Dec  3 00:50:20 2006
@@ -13,7 +13,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -28,8 +28,8 @@
   </tr>
   <tr>
     <td class="head legacy_list_image" rowspan="6">
-      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->modinfo.name|escape}>" title="<{$module->modinfo.name|escape}>" />
-      <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div>
+      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->modinfo.name|xoops_escape}>" title="<{$module->modinfo.name|xoops_escape}>" />
+      <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div>
     </td>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td>
 	<td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
@@ -66,7 +66,7 @@
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td>
   </tr>
   <tr>
     <td class="foot" colspan="3">
Index: xoops2jp/html/modules/legacy/admin/templates/module_install_success.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/module_install_success.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_install_success.html	Sun Dec  3 00:50:20 2006
@@ -12,11 +12,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li class="legacy_modinstall_error"><{$msg.message|escape}></li>
+    <li class="legacy_modinstall_error"><{$msg.message|xoops_escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li class="legacy_modinstall_warning"><{$msg.message|escape}></li>
+    <li class="legacy_modinstall_warning"><{$msg.message|xoops_escape}></li>
   <{else}>
-    <li class="legacy_modinstall_message"><{$msg.message|escape}></li>
+    <li class="legacy_modinstall_message"><{$msg.message|xoops_escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/legacy/admin/templates/module_list.html
diff -u 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.7
--- xoops2jp/html/modules/legacy/admin/templates/module_list.html:1.1.2.6	Wed Nov  8 20:59:52 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_list.html	Sun Dec  3 00:50:20 2006
@@ -13,7 +13,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_list_confirm.html	Sun Dec  3 00:50:20 2006
@@ -22,16 +22,16 @@
     <td class="legacy_list_id"><{$mid}></td>
     <td class="legacy_list_name">
       <{if $actionForm->get('name',$mid) == $moduleObjects[$mid]->get('name')}>
-        <{$actionForm->get('name',$mid)|escape}>
+        <{$actionForm->get('name',$mid)|xoops_escape}>
       <{else}>
-         (<{$moduleObjects[$mid]->getShow('name')}>) &raquo; <b  class="legacy_module_error"><{$actionForm->get('name',$mid)|escape}></b>
+         (<{$moduleObjects[$mid]->getShow('name')}>) &raquo; <b  class="legacy_module_error"><{$actionForm->get('name',$mid)|xoops_escape}></b>
       <{/if}>
     </td>
     <td class="legacy_list_order">
       <{if $actionForm->get('weight',$mid) == $moduleObjects[$mid]->get('weight')}>
-        <{$actionForm->get('weight',$mid)|escape}>
+        <{$actionForm->get('weight',$mid)|xoops_escape}>
       <{else}>
-         (<{$moduleObjects[$mid]->getShow('weight')}>) &raquo; <b  class="legacy_module_error"><{$actionForm->get('weight',$mid)|escape}></b>
+         (<{$moduleObjects[$mid]->getShow('weight')}>) &raquo; <b  class="legacy_module_error"><{$actionForm->get('weight',$mid)|xoops_escape}></b>
       <{/if}>
     </td>
     <td class="legacy_list_select">
@@ -51,8 +51,8 @@
           <{$smarty.const._AD_LEGACY_LANG_DEACTIVATE}>
         <{/if}></b>
       <{/if}>
-      <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->get('name',$mid)|escape}>" />
-      <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->get('weight',$mid)|escape}>" />
+      <input type="hidden" name="name[<{$mid}>]" value="<{$actionForm->get('name',$mid)|xoops_escape:edit}>" />
+      <input type="hidden" name="weight[<{$mid}>]" value="<{$actionForm->get('weight',$mid)|xoops_escape:edit}>" />
       <{if $actionForm->get('isactive',$mid)}>
         <input type="hidden" name="isactive[<{$mid}>]" value="1" />
       <{else}>
Index: xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html
diff -u 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.7
--- xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html:1.1.2.6	Wed Nov  1 20:54:36 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_uninstall.html	Sun Dec  3 00:50:20 2006
@@ -12,7 +12,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -29,7 +29,7 @@
   <tr>
     <td rowspan="6" class="head legacy_list_image">
       <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" />
-      <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div>
+      <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div>
     </td>
     <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td>
     <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
@@ -66,7 +66,7 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td>
   </tr>
   <tr>
     <td class="foot" colspan="3">
Index: xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_uninstall_success.html	Sun Dec  3 00:50:20 2006
@@ -10,11 +10,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type == "error"}>
-    <li class="legacy_module_error"><{$msg.message|escape}></li>
+    <li class="legacy_module_error"><{$msg.message|xoops_escape}></li>
   <{elseif $msg.type == "warning"}>
-    <li class="legacy_module_warning"><{$msg.message|escape}></li>
+    <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li>
   <{else}>
-    <li class="legacy_module_message"><{$msg.message|escape}></li>
+    <li class="legacy_module_message"><{$msg.message|xoops_escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/legacy/admin/templates/module_update.html
diff -u 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.7
--- xoops2jp/html/modules/legacy/admin/templates/module_update.html:1.1.2.6	Fri Nov  3 10:35:52 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_update.html	Sun Dec  3 00:50:20 2006
@@ -18,7 +18,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -34,7 +34,7 @@
   <tr>
     <td class="head legacy_list_image" rowspan="6">
       <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getShow('name')}>" title="<{$module->getShow('name')}>" />
-      <div class="legacy_list_imagetitle"><{$module->modinfo.name|escape}></div>
+      <div class="legacy_list_imagetitle"><{$module->modinfo.name|xoops_escape}></div>
     </td>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_NAME}></td>
 	<td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
@@ -74,7 +74,7 @@
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._AD_LEGACY_LANG_MOD_DESC}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|escape}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->modinfo.description|xoops_escape}></td>
   </tr>
   <tr>
     <td class="foot" colspan="3">
Index: xoops2jp/html/modules/legacy/admin/templates/module_update_success.html
diff -u xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.4 xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/templates/module_update_success.html:1.1.2.4	Mon Oct 30 18:53:45 2006
+++ xoops2jp/html/modules/legacy/admin/templates/module_update_success.html	Sun Dec  3 00:50:20 2006
@@ -10,11 +10,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li class="legacy_module_error"><{$msg.message|escape}></li>
+    <li class="legacy_module_error"><{$msg.message|xoops_escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li class="legacy_module_warning"><{$msg.message|escape}></li>
+    <li class="legacy_module_warning"><{$msg.message|xoops_escape}></li>
   <{else}>
-    <li class="legacy_module_message"><{$msg.message|escape}></li>
+    <li class="legacy_module_message"><{$msg.message|xoops_escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/legacy/admin/templates/preference_edit.html
diff -u 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.7
--- xoops2jp/html/modules/legacy/admin/templates/preference_edit.html:1.1.2.6	Sun Nov 12 14:12:23 2006
+++ xoops2jp/html/modules/legacy/admin/templates/preference_edit.html	Sun Dec  3 00:50:20 2006
@@ -1,22 +1,22 @@
 <div class="adminnavi">
   <{if $module != null}>
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->getInfo('adminindex')|escape}>"><{$module->getShow('name')}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/<{$module->getShow('dirname')}>/<{$module->getInfo('adminindex')|xoops_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}>
+      &raquo;&raquo; <{$category->getName()|xoops_escape}>
     <{else}>
       &raquo;&raquo; <span class="adminnaviTitle"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></span>
     <{/if}>
   <{else}>
     <a href="<{$smarty.const.XOOPS_URL}>/modules/legacy/admin/index.php"><{$smarty.const._MI_LEGACY_NAME}></a>
     &raquo;&raquo; <a href="./index.php?action=PreferenceList"><{$smarty.const._MI_LEGACY_MENU_PREFERENCE}></a>
-    &raquo;&raquo; <span class="adminnaviTitle"><{$category->getName()|escape}></span>
+    &raquo;&raquo; <span class="adminnaviTitle"><{$category->getName()|xoops_escape}></span>
   <{/if}>
 </div>
 
 <h3 class="admintitle">
   <{if $category != null}>
-    <{$category->getName()|escape}>
+    <{$category->getName()|xoops_escape}>
   <{else}>
     <{$smarty.const._MI_LEGACY_MENU_PREFERENCE}>
   <{/if}>
@@ -26,7 +26,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -40,7 +40,7 @@
       <th colspan="2">
         <{$smarty.const._MI_LEGACY_MENU_PREFERENCE}>
         <{if $category != null}>
-           - <{$category->getName()|escape}>
+           - <{$category->getName()|xoops_escape}>
         <{/if}>
       </th>
     </tr>
@@ -62,7 +62,7 @@
           <{elseif $config->get('conf_formtype') == 'select'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach item=option from=$config->getOptionItems()}>
-                <option value='<{$option->getOptionKey()|escape}>' <{if $actionForm->get($config->get('conf_name')) == $option->getOptionKey()}>selected="selected"<{/if}>><{$option->getOptionLabel()|escape}></option>
+                <option value='<{$option->getOptionKey()|xoops_escape}>' <{if $actionForm->get($config->get('conf_name')) == $option->getOptionKey()}>selected="selected"<{/if}>><{$option->getOptionLabel()|xoops_escape}></option>
               <{/foreach}>
             </select>
 
@@ -74,7 +74,7 @@
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
                   <{if $option->getOptionKey() == $selected}><{assign var=flag value=1}><{/if}>
                 <{/foreach}>
-                <option value="<{$option->getOptionKey()|escape}>" <{if $flag}>selected="selected"<{/if}>><{$option->getOptionLabel()|escape}></option>
+                <option value="<{$option->getOptionKey()|xoops_escape}>" <{if $flag}>selected="selected"<{/if}>><{$option->getOptionLabel()|xoops_escape}></option>
               <{/foreach}>
             </select>
 
@@ -112,7 +112,7 @@
           <{elseif $config->get('conf_formtype') == 'language'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach item=language from=$languageArr}>
-                <option value="<{$language|escape}>" <{if $actionForm->get($config->get('conf_name')) == $language}>selected="selected"<{/if}>><{$language|escape}></option>
+                <option value="<{$language|xoops_escape}>" <{if $actionForm->get($config->get('conf_name')) == $language}>selected="selected"<{/if}>><{$language|xoops_escape}></option>
               <{/foreach}>
             </select>
 
@@ -145,7 +145,7 @@
           <{elseif $config->get('conf_formtype') == 'user'}>
             <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach key=value item=label from=$userArr}>
-                <option value="<{$value|escape}>" <{if $value == $actionForm->get($config->get('conf_name'))}>selected<{/if}>><{$label|escape}></option>
+                <option value="<{$value|xoops_escape}>" <{if $value == $actionForm->get($config->get('conf_name'))}>selected<{/if}>><{$label|xoops_escape}></option>
               <{/foreach}>
             </select>
 
@@ -157,7 +157,7 @@
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
                   <{if $value == $selected}><{assign var=flag value=1}><{/if}>
                 <{/foreach}>
-                <option value="<{$value|escape}>" <{if $flag}>selected="selected"<{/if}>><{$label|escape}></option>
+                <option value="<{$value|xoops_escape}>" <{if $flag}>selected="selected"<{/if}>><{$label|xoops_escape}></option>
               <{/foreach}>
             </select>
 
Index: xoops2jp/html/modules/legacy/admin/templates/preference_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/preference_list.html:1.1.2.3	Sun Oct 15 01:54:59 2006
+++ xoops2jp/html/modules/legacy/admin/templates/preference_list.html	Sun Dec  3 00:50:20 2006
@@ -14,7 +14,7 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td class="legacy_list_id"><{$obj->getVar('confcat_id')}></td>
-      <td class="legacy_list_title"><{$obj->getName()|escape}></td>
+      <td class="legacy_list_title"><{$obj->getName()|xoops_escape}></td>
       <td class="legacy_list_control">
         <a href="./index.php?action=PreferenceEdit&amp;confcat_id=<{$obj->getVar('confcat_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
       </td>
Index: xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html:1.1.2.3	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/admin/templates/smiles_edit.html	Sun Dec  3 00:50:20 2006
@@ -18,7 +18,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/admin/templates/theme_list.html
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/templates/theme_list.html:1.1.2.4	Mon Nov 27 14:54:18 2006
+++ xoops2jp/html/modules/legacy/admin/templates/theme_list.html	Sun Dec  3 00:50:20 2006
@@ -11,7 +11,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:21 +0900
Subject: [xoops-cvslog 5966] CVS update:
	xoops2jp/html/modules/legacy/admin/templates/blocks
Message-ID: <20061202155021.51B402AC168@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html
diff -u xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.2 xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html:1.1.2.2	Sun Oct 15 01:25:42 2006
+++ xoops2jp/html/modules/legacy/admin/templates/blocks/legacy_admin_block_sidemenu.html	Sun Dec  3 00:50:21 2006
@@ -3,7 +3,7 @@
   <{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>
+      <a href="<{$module->getAdminIndex()|xoops_escape:link}>"><{$module->mXoopsModule->getShow('name')}></a>
     </div>
 
     <div id="c<{$module->mXoopsModule->getShow('mid')}>" class="submenu">
@@ -11,7 +11,7 @@
       <{if $module->getAdminMenu()}>
         <{foreach item=menu from=$module->getAdminMenu()}>
           <{if $menu.show !== false}>
-            <li><a href="<{$menu.link|escape}>"><{$menu.title|escape}></a></li>
+            <li><a href="<{$menu.link|xoops_escape:link}>"><{$menu.title|xoops_escape}></a></li>
           <{/if}>
         <{/foreach}>
       <{else}>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:21 +0900
Subject: [xoops-cvslog 5967] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20061202155021.751A02AC04D@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.8 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.8	Sat Nov 18 17:44:09 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Sun Dec  3 00:50:21 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><{$legacy_sitename|escape}> : <{$smarty.const._CPHOME}> : <{$legacy_pagetitle|escape}></title>
+<title><{$legacy_sitename|xoops_escape}> : <{$smarty.const._CPHOME}> : <{$legacy_pagetitle|xoops_escape}></title>
 <script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
 <{stylesheet file=style.css}>
 <{stylesheet file=module.css}>
@@ -73,7 +73,7 @@
   <{if $currentModule->getAdminMenu()}>
     <ul class="submenunavi">
       <{foreach item=menu from=$currentModule->getAdminMenu()}>
-        <li><a href="<{$menu.link}>"><{$menu.title|escape}></a></li>
+        <li><a href="<{$menu.link}>"><{$menu.title|xoops_escape:link}></a></li>
       <{/foreach}>
     </ul>
   <{/if}>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:21 +0900
Subject: [xoops-cvslog 5968] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20061202155021.AF9732AC168@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_comment_edit.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment_edit.html:1.1.2.3 xoops2jp/html/modules/legacy/templates/legacy_comment_edit.html:1.1.2.4
--- xoops2jp/html/modules/legacy/templates/legacy_comment_edit.html:1.1.2.3	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment_edit.html	Sun Dec  3 00:50:21 2006
@@ -2,7 +2,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/templates/legacy_comment_navi.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_comment_navi.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_comment_navi.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_comment_navi.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_comment_navi.html	Sun Dec  3 00:50:21 2006
@@ -11,7 +11,7 @@
           <{xoops_input type=hidden name=$key value=$value}>
         <{/foreach}>
 		<{if $postcomment_link}>
-          <input type="button" onclick="self.location.href='<{$postcomment_link|escape}><{$link_extra|escape}>'" class="formButton" value="<{$smarty.const._CM_POSTCOMMENT}>" />
+          <input type="button" onclick="self.location.href='<{$postcomment_link|xoops_escape:link}><{$link_extra|xoops_escape:link}>'" class="formButton" value="<{$smarty.const._CM_POSTCOMMENT}>" />
         <{/if}>
     </td>
   </tr>
Index: xoops2jp/html/modules/legacy/templates/legacy_image_list.html
diff -u 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.4
--- xoops2jp/html/modules/legacy/templates/legacy_image_list.html:1.1.2.3	Sun Nov 12 14:12:23 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_image_list.html	Sun Dec  3 00:50:21 2006
@@ -26,7 +26,7 @@
 </form>
 
 <{if $hasUploadPerm}>
-  <div style="text-align:right; margin:5px;">[ <a href="<{$smarty.const.XOOPS_URL}>/imagemanager.php?op=upload&amp;imgcat_id=<{$category->getShow('imgcat_id')}>&amp;target=<{$target|escape}>"><{$smarty.const._MD_LEGACY_LANG_IMAGE_UPLOAD}></a> ]</div>
+  <div style="text-align:right; margin:5px;">[ <a href="<{$smarty.const.XOOPS_URL}>/imagemanager.php?op=upload&amp;imgcat_id=<{$category->getShow('imgcat_id')}>&amp;target=<{$target|xoops_escape}>"><{$smarty.const._MD_LEGACY_LANG_IMAGE_UPLOAD}></a> ]</div>
 <{/if}>
 
 <table class="outer" cellspacing="1">
Index: xoops2jp/html/modules/legacy/templates/legacy_image_upload.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_image_upload.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_image_upload.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_image_upload.html:1.1.2.2	Sun Oct 15 01:44:53 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_image_upload.html	Sun Dec  3 00:50:21 2006
@@ -2,7 +2,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/legacy/templates/legacy_notification_delete.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_notification_delete.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_notification_delete.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_notification_delete.html:1.1.2.2	Sun Oct 15 22:11:33 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_notification_delete.html	Sun Dec  3 00:50:21 2006
@@ -4,7 +4,7 @@
     <{xoops_token form=$actionForm}>
     <{xoops_input type=hidden name=delete value=1}>
     <{foreach item=ids from=$actionForm->mNotifiyIds}>
-      <input type="hidden" name="del_not[<{$ids.modid|escape}>][]" value="<{$ids.id|escape}>" />
+      <input type="hidden" name="del_not[<{$ids.modid|xoops_escape:plain}>][]" value="<{$ids.id|xoops_escape:plain}>" />
     <{/foreach}>
     <input type="submit" name="delete" value="<{$smarty.const._DELETE}>" />
     <input type="button" name="confirm_back" value="<{$smarty.const._CANCEL}>"  onclick="javascript:history.go(-1);" />
Index: xoops2jp/html/modules/legacy/templates/legacy_notification_select_form.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_notification_select_form.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_notification_select_form.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_notification_select_form.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_notification_select_form.html	Sun Dec  3 00:50:21 2006
@@ -29,7 +29,7 @@
   </tr>
 </table>
 <div align="center">
-<{$smarty.const._NOT_NOTIFICATIONMETHODIS}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url|escape}>"><{$smarty.const._NOT_CHANGE}></a>]
+<{$smarty.const._NOT_NOTIFICATIONMETHODIS}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url|xoops_escape:link}>"><{$smarty.const._NOT_CHANGE}></a>]
 </div>
 </form>
 <{/if}>
\ No newline at end of file
Index: xoops2jp/html/modules/legacy/templates/legacy_rss.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_rss.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_rss.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_rss.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_rss.html	Sun Dec  3 00:50:21 2006
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
   <channel>
-    <title><{$channel_title|escape}></title>
-    <link><{$channel_link|escape}></link>
-    <description><{$channel_desc|escape}></description>
-    <lastBuildDate><{$channel_lastbuild|escape}></lastBuildDate>
+    <title><{$channel_title|xoops_escape}></title>
+    <link><{$channel_link|xoops_escape}></link>
+    <description><{$channel_desc|xoops_escape}></description>
+    <lastBuildDate><{$channel_lastbuild|xoops_escape}></lastBuildDate>
     <docs>http://backend.userland.com/rss/</docs>
-    <generator><{$channel_generator|escape}></generator>
-    <managingEditor><{$channel_editor|escape}></managingEditor>
-    <webMaster><{$channel_webmaster|escape}></webMaster>
-    <language><{$channel_language|escape}></language>
+    <generator><{$channel_generator|xoops_escape}></generator>
+    <managingEditor><{$channel_editor|xoops_escape}></managingEditor>
+    <webMaster><{$channel_webmaster|xoops_escape}></webMaster>
+    <language><{$channel_language|xoops_escape}></language>
     <{if $image_url != ""}>
     <image>
-      <title><{$channel_title|escape}></title>
-      <url><{$image_url|escape}></url>
-      <link><{$channel_link|escape}></link>
-      <width><{$image_width|escape}></width>
-      <height><{$image_height|escape}></height>
+      <title><{$channel_title|xoops_escape}></title>
+      <url><{$image_url|xoops_escape}></url>
+      <link><{$channel_link|xoops_escape}></link>
+      <width><{$image_width|xoops_escape}></width>
+      <height><{$image_height|xoops_escape}></height>
     </image>
     <{/if}>
     <{foreach item=item from=$items}>
       <item>
-        <title><{$item.title|escape}></title>
-        <link><{$item.link|escape}></link>
+        <title><{$item.title|xoops_escape}></title>
+        <link><{$item.link|xoops_escape}></link>
         <{if $item.author}>
-          <author><{$item.author|escape}></author>
+          <author><{$item.author|xoops_escape}></author>
         <{/if}>
         <{if $item.category}>
-          <category><{$item.category|escape}></category>
+          <category><{$item.category|xoops_escape}></category>
         <{/if}>
         <{if $item.description}>
-          <description><{$item.description|escape}></description>
+          <description><{$item.description|xoops_escape}></description>
         <{/if}>
         <pubDate><{$item.pubdate|xoops_formattimestamp:rss}></pubDate>
-        <guid><{$item.guid|escape}></guid>
+        <guid><{$item.guid|xoops_escape}></guid>
       </item>
     <{/foreach}>
   </channel>
Index: xoops2jp/html/modules/legacy/templates/legacy_search_form.html
diff -u 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.4
--- xoops2jp/html/modules/legacy/templates/legacy_search_form.html:1.1.2.3	Sun Nov 12 14:12:23 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_search_form.html	Sun Dec  3 00:50:21 2006
@@ -2,7 +2,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -31,7 +31,7 @@
       <td class="head"><{$smarty.const._SR_SEARCHIN}></td>
       <td class="<{cycle values="odd,even"}>">
         <{foreach item=module from=$moduleArr}>
-          <label><input type="checkbox" name="mids[]" value="<{$module.mid|escape}>" <{if in_array($module.mid, $selectedMidArr)}>checked<{/if}>><{$module.name|escape}></label>
+          <label><input type="checkbox" name="mids[]" value="<{$module.mid|xoops_escape:plain}>" <{if in_array($module.mid, $selectedMidArr)}>checked<{/if}>><{$module.name|xoops_escape}></label>
         <{/foreach}>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacy/templates/legacy_search_results.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_search_results.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_search_results.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_search_results.html:1.1.2.2	Sun Oct 15 01:44:53 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_search_results.html	Sun Dec  3 00:50:21 2006
@@ -7,7 +7,7 @@
     <li><img src="<{$result.image}>" alt="<{$module.name}>" title="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br />
     <small>
       <{if $result.uid > 0}>
-        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|escape}>"><{$result.uid|xoops_user:uname}></a>
+        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|xoops_escape}>"><{$result.uid|xoops_user:uname}></a>
       <{/if}>
       (<{$result.time|xoops_formattimestamp:l}>)
     </small><li />
@@ -16,7 +16,7 @@
   <!-- end results item loop -->
 
   <{if $module.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|escape}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|escape}>"><{$smarty.const._MD_LEGACY_LANG_SHOW_ALL}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|xoops_escape:link}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|xoops_escape}>"><{$smarty.const._MD_LEGACY_LANG_SHOW_ALL}></a>
   <{/if}>
 <{/foreach}>
 
Index: xoops2jp/html/modules/legacy/templates/legacy_search_showall.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_search_showall.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_search_showall.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_search_showall.html:1.1.2.2	Sun Oct 15 01:44:53 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_search_showall.html	Sun Dec  3 00:50:21 2006
@@ -7,7 +7,7 @@
     <li><img src="<{$result.image}>" alt="<{$module.name}>" title="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br />
     <small>
       <{if $result.uid > 0}>
-        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|escape}>"><{$result.uid|xoops_user:uname}></a>
+        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|xoops_escape}>"><{$result.uid|xoops_user:uname}></a>
       <{/if}>
       (<{$result.time|xoops_formattimestamp:l}>)
     </small><li />
@@ -16,11 +16,11 @@
   <!-- end results item loop -->
 
   <{if $actionForm->get('start') > 0}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|escape}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|escape}>&amp;start=<{$prevStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_PREV_PAGE}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|xoops_escape:link}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|xoops_escape}>&amp;start=<{$prevStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_PREV_PAGE}></a>
   <{/if}>
 
   <{if $searchResults.0.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|escape}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|escape}>&amp;start=<{$nextStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_NEXT_PAGE}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|xoops_escape:link}>&amp;mid=<{$module.mid}>&amp;andor=<{$actionForm->get('andor')|xoops_escape}>&amp;start=<{$nextStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_NEXT_PAGE}></a>
   <{/if}>
 <{/if}>
 
Index: xoops2jp/html/modules/legacy/templates/legacy_search_showallbyuser.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_search_showallbyuser.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_search_showallbyuser.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_search_showallbyuser.html:1.1.2.2	Sun Oct 15 01:44:53 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_search_showallbyuser.html	Sun Dec  3 00:50:21 2006
@@ -7,7 +7,7 @@
     <li><img src="<{$result.image}>" alt="<{$module.name}>" title="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br />
     <small>
       <{if $result.uid > 0}>
-        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|escape}>"><{$result.uid|xoops_user:uname}></a>
+        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$result.uid|xoops_escape}>"><{$result.uid|xoops_user:uname}></a>
       <{/if}>
       (<{$result.time|xoops_formattimestamp:l}>)
     </small><li />
@@ -16,11 +16,11 @@
   <!-- end results item loop -->
 
   <{if $actionForm->get('start') > 0}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|escape}>&amp;mid=<{$module.mid}>&amp;uid=<{$actionForm->get('uid')}>&amp;andor=<{$actionForm->get('andor')|escape}>&amp;start=<{$prevStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_PREV_PAGE}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|xoops_escape:link}>&amp;mid=<{$module.mid}>&amp;uid=<{$actionForm->get('uid')}>&amp;andor=<{$actionForm->get('andor')|xoops_escape}>&amp;start=<{$prevStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_PREV_PAGE}></a>
   <{/if}>
 
   <{if $searchResults.0.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|escape}>&amp;mid=<{$module.mid}>&amp;uid=<{$actionForm->get('uid')}>&amp;andor=<{$actionForm->get('andor')|escape}>&amp;start=<{$nextStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_NEXT_PAGE}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall&amp;query=<{$actionForm->get('query')|xoops_escape:link}>&amp;mid=<{$module.mid}>&amp;uid=<{$actionForm->get('uid')}>&amp;andor=<{$actionForm->get('andor')|xoops_escape}>&amp;start=<{$nextStart}>"><a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showall"><{$smarty.const._MD_LEGACY_LANG_NEXT_PAGE}></a>
   <{/if}>
 <{/if}>
 
Index: xoops2jp/html/modules/legacy/templates/legacy_xoops_confirm.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoops_confirm.html:1.1.2.2 xoops2jp/html/modules/legacy/templates/legacy_xoops_confirm.html:1.1.2.3
--- xoops2jp/html/modules/legacy/templates/legacy_xoops_confirm.html:1.1.2.2	Mon Oct 16 00:29:46 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoops_confirm.html	Sun Dec  3 00:50:21 2006
@@ -1,11 +1,11 @@
 <div class='confirmMsg'>
   <h4><{$message}></h4>
-  <form method="post" action="<{$action|escape}>">
+  <form method="post" action="<{$action|xoops_escape}>">
     <{xoops_input type=hidden name=$tokenName value=$tokenValue}>
     <{foreach key=key item=value from=$hiddens}>
       <{if is_array($value)}>
         <{foreach key=radioName item=radioValue from=$value}>
-          <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|escape}></label><br/>
+          <label><{xoops_input type=radio name=$key value=$radioValue}><{$radioName|xoops_escape}></label><br/>
         <{/foreach}>
       <{else}>
         <{xoops_input type=hidden name=$key value=$value}>
Index: xoops2jp/html/modules/legacy/templates/legacy_xoops_error.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoops_error.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_xoops_error.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_xoops_error.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoops_error.html	Sun Dec  3 00:50:21 2006
@@ -4,9 +4,9 @@
   <{/if}>
   <{if is_array($message)}>
     <{foreach item=msg from=$message}>
-      <{$msg|escape}><br/>
+      <{$msg|xoops_escape}><br/>
     <{/foreach}>
   <{else}>
-    <{$message|escape}>
+    <{$message|xoops_escape}>
   <{/if}>
 </div>
Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.1 xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.2
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.1	Sat Oct 14 23:55:20 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html	Sun Dec  3 00:50:21 2006
@@ -1,7 +1,7 @@
 <a name='moresmiley'></a>
 <img onmouseover='style.cursor="hand"' src='<{$xoops_url}>/images/url.gif' alt='url' onclick='xoopsCodeUrl("<{$element->getId()}>", "<{$smarty.const._ENTERURL}>", "<{$smarty.const._ENTERWEBTITLE}>");' />&nbsp;
 <img onmouseover='style.cursor="hand"' src='<{$xoops_url}>/images/email.gif' alt='email' onclick='javascript:xoopsCodeEmail("<{$element->getId()}>", "<{$smarty.const._ENTEREMAIL}>");' />&nbsp;
-<img onclick='javascript:xoopsCodeImg("<{$element->getId()}>", "<{$smarty.const._ENTERIMGURL}>", "<{$smarty.const._ENTERIMGPOS}>", "<{$smarty.const._IMGPOSRORL|escape}>", "<{$smarty.const._ERRORIMGPOS}>");' onmouseover='style.cursor="hand"' src='<{$xoops_url}>/images/imgsrc.gif' alt='imgsrc' />&nbsp;
+<img onclick='javascript:xoopsCodeImg("<{$element->getId()}>", "<{$smarty.const._ENTERIMGURL}>", "<{$smarty.const._ENTERIMGPOS}>", "<{$smarty.const._IMGPOSRORL|xoops_escape}>", "<{$smarty.const._ERRORIMGPOS}>");' onmouseover='style.cursor="hand"' src='<{$xoops_url}>/images/imgsrc.gif' alt='imgsrc' />&nbsp;
 <img onmouseover='style.cursor="hand"' onclick='javascript:openWithSelfMain("<{$xoops_url}>/imagemanager.php?target=<{$element->getId()}>","imgmanager",400,430);' src='<{$xoops_url}>/images/image.gif' alt='image' />&nbsp;
 <img src='<{$xoops_url}>/images/code.gif' onmouseover='style.cursor="hand"' alt='code' onclick='javascript:xoopsCodeCode("<{$element->getId()}>", "<{$smarty.const._ENTERCODE}>");' />&nbsp;
 <img onclick='javascript:xoopsCodeQuote("<{$element->getId()}>", "<{$smarty.const._ENTERQUOTE}>");' onmouseover='style.cursor="hand"' src='<{$xoops_url}>/images/quote.gif' alt='quote' /><br />
Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html
diff -u 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.3
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html:1.1.2.2	Thu Nov  9 18:36:25 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_select.html	Sun Dec  3 00:50:21 2006
@@ -4,6 +4,6 @@
    <select size='<{$element->getSize()}>' name='<{$element->getName()}>' id='<{$element->getName()}>' <{$element->getExtra()}>>
 <{/if}>
 <{foreach from=$element->getOptions() key=value item=name}>
-  <option id='<{$element->getName()}>_<{$value|escape}>' value='<{$value|escape}>' <{if count($element->getValue()) > 0 && in_array($value, $element->getValue())}> selected='selected'<{/if}>><{$name}></option>
+  <option id='<{$element->getName()}>_<{$value|xoops_escape}>' value='<{$value|xoops_escape}>' <{if count($element->getValue()) > 0 && in_array($value, $element->getValue())}> selected='selected'<{/if}>><{$name}></option>
 <{/foreach}>
 </select>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:21 +0900
Subject: [xoops-cvslog 5969] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20061202155021.D95562AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/pmlite.html
diff -u xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10.2.1 xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10.2.2
--- xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.10.2.1	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/pm/templates/pmlite.html	Sun Dec  3 00:50:21 2006
@@ -2,7 +2,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u 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.5
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.12.2.4	Mon Nov 27 15:01:19 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Sun Dec  3 00:50:21 2006
@@ -37,7 +37,7 @@
         <{/if}>
       </td>
       <td style="text-align:center; vertical-align:top;">
-        <img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$pm->get('msg_image')|escape}>" alt='' />
+        <img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$pm->get('msg_image')|xoops_escape:link}>" alt='' />
       </td>
       <td style="vertical-align:middle;">
         <{$pm->get("from_userid")|xoops_user:"uname"}>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:22 +0900
Subject: [xoops-cvslog 5970] CVS update:
	xoops2jp/html/modules/stdCache/admin/templates
Message-ID: <20061202155022.0B6152AC168@users.sourceforge.jp>

Index: xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html
diff -u xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html:1.1.2.1 xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html:1.1.2.2
--- xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html:1.1.2.1	Tue Nov  7 16:30:30 2006
+++ xoops2jp/html/modules/stdCache/admin/templates/block_cacheclear_option.html	Sun Dec  3 00:50:21 2006
@@ -1 +1 @@
-<{$smarty.const._AD_STDCACHE_LANG_INTERVAL_TIMER}> <input type="text" name="options[]" value="<{$timer|escape}>" />
\ No newline at end of file
+<{$smarty.const._AD_STDCACHE_LANG_INTERVAL_TIMER}> <input type="text" name="options[]" value="<{$timer|xoops_escape:plain}>" />
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:22 +0900
Subject: [xoops-cvslog 5971] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20061202155022.577CF2AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.11.2.1 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.11.2.2
--- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.11.2.1	Mon Oct 16 00:29:45 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html	Sun Dec  3 00:50:22 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.18.2.1 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.18.2.2
--- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.18.2.1	Thu Oct 12 23:45:32 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_list.html	Sun Dec  3 00:50:22 2006
@@ -63,7 +63,7 @@
           <{$smarty.const._AD_USER_LANG_AVATAR_TYPE_S}>
         <{/if}>
       </td>
-      <td class="user_list_order"><{$obj->getUsingCount()|escape}></td>
+      <td class="user_list_order"><{$obj->getUsingCount()|xoops_escape}></td>
       <td class="user_list_control">
         <a href="index.php?action=AvatarEdit&amp;avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <a href="index.php?action=AvatarDelete&amp;avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
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.2.1 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16.2.2
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.16.2.1	Thu Nov  2 00:50:44 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Sun Dec  3 00:50:22 2006
@@ -15,7 +15,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -46,7 +46,7 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_AMMO}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getUserCount()|escape}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getUserCount()|xoops_escape}></td>
   </tr>
   <tr>
     <td class="foot" colspan="2">
Index: xoops2jp/html/modules/user/admin/templates/group_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.12.2.1
--- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.12	Sun Aug 20 11:57:49 2006
+++ xoops2jp/html/modules/user/admin/templates/group_edit.html	Sun Dec  3 00:50:22 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/group_list.html
diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.14.2.1 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.14.2.2
--- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.14.2.1	Thu Oct 12 23:45:32 2006
+++ xoops2jp/html/modules/user/admin/templates/group_list.html	Sun Dec  3 00:50:22 2006
@@ -34,7 +34,7 @@
       <td class="user_list_title"><{$group->getShow('name')}></td>
       <td class="user_list_description"><{$group->getShow('description')}></td>
       <td class="user_list_type"><{$group->getShow('group_type')}></td>
-      <td class="user_list_number"><{$group->getUserCount()|escape}></td>
+      <td class="user_list_number"><{$group->getUserCount()|xoops_escape}></td>
       <td class="user_list_control">
         <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.21 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.21.2.1
--- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.21	Thu Aug 24 20:22:35 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Sun Dec  3 00:50:22 2006
@@ -22,7 +22,7 @@
     <td class="user_list_title"><{$group->getShow('name')}></td>
     <td class="user_list_description"><{$group->getShow('description')}></td>
     <td class="user_list_type"><{$group->getShow('group_type')}></td>
-    <td class="user_list_number"><{$group->getUserCount()|escape}></td>
+    <td class="user_list_number"><{$group->getUserCount()|xoops_escape}></td>
     <td class="user_list_control">
       <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
       <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
@@ -42,7 +42,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.25.2.2 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.25.2.3
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.25.2.2	Fri Oct 20 02:01:49 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Sun Dec  3 00:50:22 2006
@@ -22,7 +22,7 @@
     <td class="user_list_title"><{$group->getShow('name')}></td>
     <td class="user_list_description"><{$group->getShow('description')}></td>
     <td class="user_list_type"><{$group->getShow('group_type')}></td>
-    <td class="user_list_number"><{$group->getUserCount()|escape}></td>
+    <td class="user_list_number"><{$group->getUserCount()|xoops_escape}></td>
     <td class="user_list_control">
       <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
       <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
@@ -44,7 +44,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
@@ -59,7 +59,7 @@
   </tr>
   <tr>
   <{foreach item=perm from=$systemPermissions key="perm_key" name="SysPer"}>
-    <td class="head" style="width:35%;">&nbsp;<{$perm->mItem->getName()|escape}></td>
+    <td class="head" style="width:35%;">&nbsp;<{$perm->mItem->getName()|xoops_escape}></td>
     <td class="even"><{assign var="getId" value=$perm->getId() }>
       <label><input type="checkbox" name="system[<{$getId}>]" value="2" <{if $perm->mValue==2}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}></label>
     </td>
@@ -78,7 +78,7 @@
   </tr>
   <tr>
   <{foreach item=perm from=$modulePermissions name="ModPer"}>
-    <td class="head" style="width:25%;">&nbsp;<{$perm->mItem->getName()|escape}></td>
+    <td class="head" style="width:25%;">&nbsp;<{$perm->mItem->getName()|xoops_escape}></td>
     <td class="even"><{assign var="getId" value=$perm->getId() }>
       <label><input type="checkbox" name="module[<{$getId}>]" value="1" <{if $perm->mValue & 1}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ACCESS}></label>
       <label><input type="checkbox" name="module_admin[<{$getId}>]" value="2" <{if $perm->mValue & 2}>checked="checked"<{/if}> /><{$smarty.const._AD_USER_LANG_PERM_ADMIN}></label>
@@ -109,9 +109,9 @@
   <{foreach item=perm from=$permissions name=$i}>
     <td class="head" style="width:35%;">&nbsp;
       <{if $perm->mItem->isActive()}>
-        <{$perm->mItem->getName()|escape}>
+        <{$perm->mItem->getName()|xoops_escape}>
       <{else}>
-        <span class="inactive"><{$perm->mItem->getName()|escape}></span>
+        <span class="inactive"><{$perm->mItem->getName()|xoops_escape}></span>
       <{/if}>
     </td>
     <td class="even"><{assign var="getId" value=$perm->getId() }>
Index: xoops2jp/html/modules/user/admin/templates/group_property.html
diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.20.2.1 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.20.2.2
--- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.20.2.1	Fri Oct 20 02:01:49 2006
+++ xoops2jp/html/modules/user/admin/templates/group_property.html	Sun Dec  3 00:50:22 2006
@@ -22,7 +22,7 @@
     <td class="user_list_title"><{$group->getShow('name')}></td>
     <td class="user_list_description"><{$group->getShow('description')}></td>
     <td class="user_list_type"><{$group->getShow('group_type')}></td>
-    <td class="user_list_number"><{$group->getUserCount()|escape}></td>
+    <td class="user_list_number"><{$group->getUserCount()|xoops_escape}></td>
     <td class="user_list_control">
       <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
       <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
@@ -83,7 +83,7 @@
   </tr>
   <tr>
   <{foreach item=perm from=$systemPermissions key="perm_key" name="SysPer"}>
-    <td class="head" style="width:35%;">&nbsp;<{$perm->mItem->getName()|escape}></td>
+    <td class="head" style="width:35%;">&nbsp;<{$perm->mItem->getName()|xoops_escape}></td>
     <td class="even"><{assign var="getId" value=$perm->getId() }>
       <{if $perm->mValue==2}>
         <{$smarty.const._AD_USER_LANG_PERM_ADMIN}>
@@ -106,7 +106,7 @@
   </tr>
   <tr>
   <{foreach item=perm from=$modulePermissions name="ModPer"}>
-    <td class="head" style="width:25%;">&nbsp;<{$perm->mItem->getName()|escape}></td>
+    <td class="head" style="width:25%;">&nbsp;<{$perm->mItem->getName()|xoops_escape}></td>
     <td class="even">
       <{assign var="getId" value=$perm->getId() }>
       <{if $perm->mValue & 1}>
@@ -146,9 +146,9 @@
   <{foreach item=perm from=$permissions name=$i}>
     <td class="head" style="width:35%;">&nbsp;
       <{if $perm->mItem->isActive()}>
-        <{$perm->mItem->getName()|escape}>
+        <{$perm->mItem->getName()|xoops_escape}>
       <{else}>
-        <span class="inactive"><{$perm->mItem->getName()|escape}></span>
+        <span class="inactive"><{$perm->mItem->getName()|xoops_escape}></span>
       <{/if}>
     </td>
     <td class="even"><{assign var="getId" value=$perm->getId() }>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.12.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.12.2.3
--- xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.12.2.2	Mon Oct 16 00:29:45 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html	Sun Dec  3 00:50:22 2006
@@ -18,7 +18,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html:1.1.2.3	Sun Oct 15 23:59:44 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_link_list.html	Sun Dec  3 00:50:22 2006
@@ -10,7 +10,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.3
--- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.12.2.2	Sat Oct 14 20:29:00 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html	Sun Dec  3 00:50:22 2006
@@ -50,7 +50,7 @@
       <td class="user_list_date"><{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}></td>
       <td class="user_list_number">
         <{if $obj->mUserCount > 0}>
-          <span class="user_mailjob_count"><{$obj->mUserCount|escape}></span>
+          <span class="user_mailjob_count"><{$obj->mUserCount|xoops_escape}></span>
         <{else}>
           <{$smarty.const._AD_USER_LANG_COMPLETED}>
         <{/if}>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_send.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.7.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.7.2.3
--- xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.7.2.2	Sat Oct 14 23:19:24 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_send.html	Sun Dec  3 00:50:22 2006
@@ -31,7 +31,7 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_TARGET_RETRY_NUMBER}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getCurrentRetry()|escape}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getCurrentRetry()|xoops_escape}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_FROM_NAME}></td>
Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.12.2.1 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.12.2.2
--- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.12.2.1	Mon Oct 16 00:29:45 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html	Sun Dec  3 00:50:22 2006
@@ -19,7 +19,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
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.2.1 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14.2.2
--- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.14.2.1	Thu Nov  2 00:50:44 2006
+++ xoops2jp/html/modules/user/admin/templates/user_delete.html	Sun Dec  3 00:50:22 2006
@@ -12,7 +12,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
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.3 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.4
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.21.2.3	Sun Nov 12 14:12:23 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Sun Dec  3 00:50:22 2006
@@ -22,7 +22,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/user_search.html
diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.10.2.1 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.10.2.2
--- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.10.2.1	Mon Oct 16 00:29:45 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search.html	Sun Dec  3 00:50:22 2006
@@ -9,7 +9,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/admin/templates/user_view.html
diff -u xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.1 xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.2
--- xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.7.2.1	Sat Oct  7 23:15:33 2006
+++ xoops2jp/html/modules/user/admin/templates/user_view.html	Sun Dec  3 00:50:22 2006
@@ -169,25 +169,25 @@
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_UMODE}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{$umode|escape}>
+      <{$umode|xoops_escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_UORDER}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{$uorder|escape}>
+      <{$uorder|xoops_escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{$notify_method|escape}>
+      <{$notify_method|xoops_escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_MODE}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{$notify_mode|escape}>
+      <{$notify_mode|xoops_escape}>
     </td>
   </tr>
   <tr>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:50:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:50:22 +0900
Subject: [xoops-cvslog 5972] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20061202155022.87F432AC168@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.2.2 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.3
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.14.2.2	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Sun Dec  3 00:50:22 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|escape}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
+<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|xoops_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>
 
@@ -8,7 +8,7 @@
 <div class="error">
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
+      <li><{$message|xoops_escape}></li>
     <{/foreach}>
   </ul>
 </div>
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u 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.7
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.12.2.6	Sun Nov 12 14:12:24 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Sun Dec  3 00:50:22 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|escape}>"><{$smarty.const._MD_USER_LANG_PROFILE}></a>
+<a href="<{$xoops_url}>/userinfo.php?uid=<{$actionForm->get('uid')|xoops_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>
 
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.2 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.7.2.3
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.7.2.2	Fri Nov 10 20:30:23 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Sun Dec  3 00:50:22 2006
@@ -3,13 +3,13 @@
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_NICKNAME}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->get('uname')|escape}>
+      <{$registForm->get('uname')|xoops_escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_USER_LANG_EMAIL}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->get('email')|escape}>
+      <{$registForm->get('email')|xoops_escape}>
     </td>
   </tr>
   <tr>
Index: xoops2jp/html/modules/user/templates/user_register_finish.html
diff -u xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.2.2.1 xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.2.2.2
--- xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.2.2.1	Sun Oct 15 23:16:41 2006
+++ xoops2jp/html/modules/user/templates/user_register_finish.html	Sun Dec  3 00:50:22 2006
@@ -1,5 +1,5 @@
 <div class="resultMsg">
- <h4><{$complete_message|escape}></h4>
+ <h4><{$complete_message|xoops_escape}></h4>
 
   <br />
   <br />
Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u 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.6
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.16.2.5	Wed Nov 15 19:43:02 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Sun Dec  3 00:50:22 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('<{$pmliteUrl|escape}>', 'pmlite', 480, 400);">
+            <a href="javascript:openWithSelfMain('<{$pmliteUrl|xoops_escape:link}>', '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>
@@ -150,7 +150,7 @@
   <!-- end results item loop -->
 
   <{if $module.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|escape}>&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_SHOWALL}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|xoops_escape}>&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_SHOWALL}></a>
   <{/if}>
   </p>
 <{/foreach}>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:54:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:54:31 +0900
Subject: [xoops-cvslog 5973] CVS update: xoops2jp/html/class
Message-ID: <20061202155431.87D492AC043@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopstopic.php
diff -u xoops2jp/html/class/xoopstopic.php:1.2 xoops2jp/html/class/xoopstopic.php:1.2.22.1
--- xoops2jp/html/class/xoopstopic.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/xoopstopic.php	Sun Dec  3 00:54:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopstopic.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: xoopstopic.php,v 1.2.22.1 2006/12/02 15:54:31 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -321,7 +321,7 @@
 		$ret = array();
 		$myts =& MyTextSanitizer::getInstance();
 		while ($myrow = $this->db->fetchArray($result)) {
-			$ret[$myrow['topic_id']] = array('title' => $myts->htmlspecialchars($myrow['topic_title']), 'pid' => $myrow['topic_pid']);
+			$ret[$myrow['topic_id']] = array('title' => $myts->htmlSpecialChars($myrow['topic_title']), 'pid' => $myrow['topic_pid']);
 		}
 		return $ret;
 	}

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:55:28 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:55:28 +0900
Subject: [xoops-cvslog 5974] CVS update: xoops2jp/html/kernel
Message-ID: <20061202155528.554EE2AC166@users.sourceforge.jp>

Index: xoops2jp/html/kernel/comment.php
diff -u xoops2jp/html/kernel/comment.php:1.2.8.3 xoops2jp/html/kernel/comment.php:1.2.8.3.2.1
--- xoops2jp/html/kernel/comment.php:1.2.8.3	Tue May 16 22:25:07 2006
+++ xoops2jp/html/kernel/comment.php	Sun Dec  3 00:55:28 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment.php,v 1.2.8.3 2006/05/16 13:25:07 nobunobu Exp $
+// $Id: comment.php,v 1.2.8.3.2.1 2006/12/02 15:55:28 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -391,7 +391,8 @@
             $criteria->add(new Criteria('com_status', intval($status)));
         }
         $criteria->setOrder($order);
-        return $this->getObjects($criteria);
+        $ret =& $this->getObjects($criteria);
+        return $ret;
     }
 
     /**

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:55:28 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:55:28 +0900
Subject: [xoops-cvslog 5975] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20061202155528.78C0C2AC168@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.16.2.3 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.16.2.4
--- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.16.2.3	Sat Oct  7 15:30:10 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php	Sun Dec  3 00:55:28 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserAdminEditForm.class.php,v 1.1.2.16.2.3 2006/10/07 06:30:10 ryuji_amano Exp $
+ * @version $Id: UserAdminEditForm.class.php,v 1.1.2.16.2.4 2006/12/02 15:55:28 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -299,7 +299,7 @@
 		
 		$this->_mIsNew = $obj->isNew();
 
-		$groups =& $obj->getGroups();
+		$groups = $obj->getGroups();
 		
 		if ($this->_mIsNew) {
 			$this->set('groups', 0, XOOPS_GROUP_USERS);

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:57:39 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:57:39 +0900
Subject: [xoops-cvslog 5976] CVS update: xoops2jp/html/kernel
Message-ID: <20061202155739.D9AF82AC092@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.10.2.3 xoops2jp/html/kernel/block.php:1.2.8.10.2.4
--- xoops2jp/html/kernel/block.php:1.2.8.10.2.3	Sat Nov 25 19:12:31 2006
+++ xoops2jp/html/kernel/block.php	Sun Dec  3 00:57:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.10.2.3 2006/11/25 10:12:31 minahito Exp $
+// $Id: block.php,v 1.2.8.10.2.4 2006/12/02 15:57:39 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -269,9 +269,10 @@
     function load($id) 
     {
         $handler =& xoops_gethandler('block');
-        $obj =& $handler->get($id);
-        foreach ($obj->vars as $k => $v) {
-            $this->assignVar($k, $v['value']);
+        if ($obj =& $handler->get($id)) {
+            foreach ($obj->vars as $k => $v) {
+                $this->assignVar($k, $v['value']);
+            }
         }
     }
 

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:58:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:58:31 +0900
Subject: [xoops-cvslog 5977] CVS update: xoops2jp/html/modules/legacyRender
Message-ID: <20061202155831.071292AC04D@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.3 xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.4
--- xoops2jp/html/modules/legacyRender/xoops_version.php:1.1.2.11.2.3	Sat Nov 18 17:44:09 2006
+++ xoops2jp/html/modules/legacyRender/xoops_version.php	Sun Dec  3 00:58:30 2006
@@ -1,11 +1,11 @@
 <?php
 /**
- * @version $Id: xoops_version.php,v 1.1.2.11.2.3 2006/11/18 08:44:09 nobunobu Exp $
+ * @version $Id: xoops_version.php,v 1.1.2.11.2.4 2006/12/02 15:58:30 nobunobu Exp $
  * @package legacyRender
  */
 
 $modversion['name']=_MI_LEGACYRENDER_NAME;
-$modversion['version']=2.01;
+$modversion['version']=2.02;
 $modversion['description']=_MI_LEGACYRENDER_NAME_DESC;
 $modversion['author']="";
 $modversion['credits']="The XOOPS Cube Project";

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:58:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:58:31 +0900
Subject: [xoops-cvslog 5978] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20061202155831.2D0412AC092@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.11 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.12
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.11	Sat Nov 18 17:44:09 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Sun Dec  3 00:58:31 2006
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.06;
+$modversion['version'] = 2.07;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:58:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:58:31 +0900
Subject: [xoops-cvslog 5979] CVS update: xoops2jp/html/modules/pm
Message-ID: <20061202155831.533BF2AC04D@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.3 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.4
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.16.2.3	Thu Nov 23 01:05:29 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Sun Dec  3 00:58:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.16.2.3 2006/11/22 16:05:29 tom_g3x Exp $
+// $Id: xoops_version.php,v 1.1.2.16.2.4 2006/12/02 15:58:31 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_PM_NAME;
-$modversion['version'] = 2.02;
+$modversion['version'] = 2.03;
 $modversion['description'] = _MI_PM_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:58:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:58:31 +0900
Subject: [xoops-cvslog 5980] CVS update: xoops2jp/html/modules/stdCache
Message-ID: <20061202155831.7649C2AC092@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.3 xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.4
--- xoops2jp/html/modules/stdCache/xoops_version.php:1.1.2.3.2.3	Tue Nov  7 16:31:23 2006
+++ xoops2jp/html/modules/stdCache/xoops_version.php	Sun Dec  3 00:58:31 2006
@@ -1,8 +1,8 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.3.2.3 2006/11/07 07:31:23 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.3.2.4 2006/12/02 15:58:31 nobunobu Exp $
 
 $modversion['name'] = _MI_STDCACHE_NAME;
-$modversion['version'] = 2.02;
+$modversion['version'] = 2.03;
 $modversion['description'] = _MI_STDCACHE_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 00:58:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 00:58:31 +0900
Subject: [xoops-cvslog 5981] CVS update: xoops2jp/html/modules/user
Message-ID: <20061202155831.9CBB32AC04D@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.9 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.10
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.9	Fri Nov 24 18:20:44 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sun Dec  3 00:58:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.9 2006/11/24 09:20:44 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.10 2006/12/02 15:58:31 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,7 @@
 //  ------------------------------------------------------------------------ //
 
 $modversion['name'] = _MI_USER_NAME;
-$modversion['version'] = 2.05;
+$modversion['version'] = 2.06;
 $modversion['description'] = _MI_USER_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
@@ -44,7 +44,7 @@
 // Tables created by sql file (without prefix!)
 $modversion['tables'][0] = "{prefix}_{dirname}_mailjob";
 $modversion['tables'][1] = "{prefix}_{dirname}_mailjob_link";
-
// Admin things
+// Admin things
 $modversion['hasAdmin'] = 1;
 $modversion['adminindex'] = "admin/index.php";
 $modversion['adminmenu'] = "admin/menu.php";

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:55 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:55 +0900
Subject: [xoops-cvslog 5982] CVS update: xoops2jp/html/class
Message-ID: <20061203044555.EC7F52AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5983] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061203044556.1B6DA2AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5984] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061203044556.448A02AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5985] CVS update: xoops2jp/html/include
Message-ID: <20061203044556.853D52AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5986] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061203044556.A73FD2AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5987] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061203044556.C8C4D2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:45:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:45:56 +0900
Subject: [xoops-cvslog 5988] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061203044556.F12352AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:20 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:20 +0900
Subject: [xoops-cvslog 5989] CVS update: xoops2jp/html/class
Message-ID: <20061203044720.C2BFE2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:20 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:20 +0900
Subject: [xoops-cvslog 5990] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061203044720.E68802AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:21 +0900
Subject: [xoops-cvslog 5991] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061203044721.1602C2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:21 +0900
Subject: [xoops-cvslog 5992] CVS update: xoops2jp/html/include
Message-ID: <20061203044721.380852AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:21 +0900
Subject: [xoops-cvslog 5993] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061203044721.59FD22AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:21 +0900
Subject: [xoops-cvslog 5994] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061203044721.7BF2E2AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:47:21 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:47:21 +0900
Subject: [xoops-cvslog 5995] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061203044721.9F65A2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:16 +0900
Subject: [xoops-cvslog 5996] CVS update: xoops2jp/html/class
Message-ID: <20061203045216.E5FC22AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 5997] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061203045217.2F8022AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 5998] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061203045217.5290B2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 5999] CVS update: xoops2jp/html/include
Message-ID: <20061203045217.73F552AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 6000] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061203045217.955692AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 6001] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061203045217.B6FB92AC02D@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 13:52:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 13:52:17 +0900
Subject: [xoops-cvslog 6002] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061203045217.DA45E2AC028@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:53 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:53 +0900
Subject: [xoops-cvslog 6003] CVS update: xoops2jp/html/class
Message-ID: <20061203074453.A61192AC12B@users.sourceforge.jp>

Index: xoops2jp/html/class/token.php
diff -u xoops2jp/html/class/token.php:1.3.6.3.2.3 xoops2jp/html/class/token.php:1.3.6.3.2.4
--- xoops2jp/html/class/token.php:1.3.6.3.2.3	Sun Dec  3 13:52:16 2006
+++ xoops2jp/html/class/token.php	Sun Dec  3 16:44:53 2006
@@ -1,409 +1,409 @@
-<?php
-// $Id: token.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
-
-define ( 'XOOPS_TOKEN_TIMEOUT', 0 );
-define ( 'XOOPS_TOKEN_PREFIX', "XOOPS_TOKEN_" );
-
-if(!defined('XOOPS_SALT'))
-    define('XOOPS_SALT',substr(md5(XOOPS_DB_PREFIX.XOOPS_DB_USER.XOOPS_ROOT_PATH),5,8));
-
-define ( 'XOOPS_TOKEN_SESSION_STRING', "X2_TOKEN");
-define ( 'XOOPS_TOKEN_MULTI_SESSION_STRING', "X2_MULTI_TOKEN");
-
-define('XOOPS_TOKEN_DEFAULT', 'XOOPS_TOKEN_DEFAULT');
-
-/**
- * This class express token. this has name, token's string for inquiry,
- * lifetime, serial number. this does not have direct validation method,
- * therefore this does not depend on $_Session and $_Request.
- *
- * You can refer to a handler class for this token. this token class
- * means ticket, and handler class means ticket agent. there is a strict
- * ticket agent type(XoopsSingleTokenHandler), and flexible ticket agent
- * for the tab browser(XoopsMultiTokenHandler).
- */
-class XoopsToken
-{
-    /**
-     * token's name. this is used for identification.
-     * @access protected
-     */
-    var $_name_;
-
-    /**
-     * token's string for inquiry. this should be a random code for security.
-     * @access private
-     */
-    var $_token_;
-
-    /**
-     * the unixtime when this token is effective.
-     *
-     * @access protected
-     */
-    var $_lifetime_;
-
-    /**
-     * unlimited flag. if this is true, this token is not limited in lifetime.
-     */
-    var $_unlimited_;
-
-    /**
-     * serial number. this used for identification of tokens of same name tokens.
-     *
-     * @access private
-     */
-    var $_number_=0;
-
-    /**
-     * @param   $name   this token's name string.
-     * @param   $timeout    effective time(if $timeout equal 0, this token will become unlimited)
-     */
-    function XoopsToken($name, $timeout = XOOPS_TOKEN_TIMEOUT)
-    {
-        $this->_name_ = $name;
-
-        if($timeout) {
-            $this->_lifetime_ = time() + $timeout;
-            $this->_unlimited_ = false;
-        }
-        else {
-            $this->_lifetime_ = 0;
-            $this->_unlimited_ = true;
-        }
-
-        $this->_token_ = $this->_generateToken();
-    }
-
-
-    /**
-     * Returns random string for token's string.
-     *
-     * @access protected
-     * @return string
-     */
-    function _generateToken()
-    {
-        srand(microtime()*100000);
-        return md5(XOOPS_SALT.$this->_name_.uniqid(rand(),true));
-    }
-
-    /**
-     * Returns this token's name.
-     *
-     * @access public
-     * @return string
-     */
-    function getTokenName()
-    {
-        return XOOPS_TOKEN_PREFIX.$this->_name_."_".$this->_number_;
-    }
-
-    /**
-     * Returns this token's string.
-     *
-     * @access public
-     * @return  string
-     */
-    function getTokenValue()
-    {
-        return $this->_token_;
-    }
-
-    /**
-     * Set this token's serial number.
-     *
-     * @access public
-     * @param   $serial_number  serial number
-     */
-    function setSerialNumber($serial_number)
-    {
-        $this->_number_ = $serial_number;
-    }
-
-    /**
-     * Returns this token's serial number.
-     *
-     * @access public
-     * @return  int
-     */
-    function getSerialNumber()
-    {
-        return $this->_number_;
-    }
-
-    /**
-     * Returns hidden tag string that includes this token. you can use it
-     * for <form> tag's member.
-     *
-     * @access public
-     * @return  string
-     */
-    function getHtml()
-    {
-        return @sprintf('<input type="hidden" name="%s" value="%s" />',$this->getTokenName(),$this->getTokenValue());
-    }
-
-    /**
-     * Returns url string that includes this token. you can use it for
-     * hyper link.
-     *
-     * @return  string
-     */
-    function getUrl()
-    {
-        return $this->getTokenName()."=".$this->getTokenValue();
-    }
-
-    /**
-     * If $token equals this token's string, true is returened.
-     *
-     * @return  bool
-    */
-    function validate($token=null)
-    {
-        return ($this->_token_==$token && ( $this->_unlimited_ || time()<=$this->_lifetime_));
-    }
-}
-
-/**
- * This class express ticket agent and ticket collector. this publishes
- * token, keeps a token to server to check it later(next request).
- *
- * You can create various agents by extending the derivative class. see
- * default(sample) classes.
- */
-class XoopsTokenHandler
-{
-    /**
-     * @access private
-     */
-    var $_prefix ="";
-
-
-    /**
-     * Create XoopsToken instance, regist(keep to server), and returns it.
-     *
-     * @access public
-     * @param   $name   this token's name string.
-     * @param   $timeout    effective time(if $timeout equal 0, this token will become unlimited)
-     */
-    function &create($name,$timeout = XOOPS_TOKEN_TIMEOUT)
-    {
-        $token =& new XoopsToken($name,$timeout);
-        $this->register($token);
-        return $token;
-    }
-
-    /**
-     * Fetches from server side, and returns it.
-     *
-     * @access public
-     * @param   $name   token's name string.
-     * @return XoopsToken
-     */
-    function &fetch($name)
-    {
-        $ret = null;
-        if(isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name])) {
-            $ret =& $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
-        }
-        return $ret;
-    }
-
-    /**
-     * Register token to session.
-     */
-    function register(&$token)
-    {
-        $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$token->_name_] = $token;
-    }
-
-    /**
-     * Unregister token to session.
-     */
-    function unregister(&$token)
-    {
-        unset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$token->_name_]);
-    }
-
-    /**
-     * If a token of the name that equal $name is registered on session,
-     * this method will return true.
-     *
-     * @access  public
-     * @param   $name   token's name string.
-     * @return  bool
-     */
-    function isRegistered($name)
-    {
-        return isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name]);
-    }
-
-    /**
-     * This method takes out token's string from Request, and validate
-     * token with it. if it passed validation, this method will return true.
-     *
-     * @access  public
-     * @param   $token  XoopsToken
-     * @param   $clearIfValid   If token passed validation, $token will be unregistered.
-     * @return  bool
-     */
-    function validate(&$token,$clearIfValid)
-    {
-        $req_token = isset($_REQUEST[ $token->getTokenName() ]) ?
-                trim($_REQUEST[ $token->getTokenName() ]) : null;
-
-        if($req_token) {
-            if($token->validate($req_token)) {
-                if($clearIfValid)
-                    $this->unregister($token);
-                return true;
-            }
-        }
-        return false;
-    }
-}
-
-class XoopsSingleTokenHandler extends XoopsTokenHandler
-{
-    function autoValidate($name,$clearIfValid=true)
-    {
-        if($token =& $this->fetch($name)) {
-            return $this->validate($token,$clearIfValid);
-        }
-        return false;
-    }
-
-    /**
-     * static method.
-     * This method was created for quick protection of default modules.
-     * this method will be deleted in the near future.
-     * @deprecated
-     * @return bool
-    */
-    function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
-    {
-        $handler =& new XoopsSingleTokenHandler();
-        $ret =& $handler->create($name,$timeout);
-        return $ret;
-    }
-
-    /**
-     * static method.
-     * This method was created for quick protection of default modules.
-     * this method will be deleted in the near future.
-     * @deprecated
-     * @return bool
-    */
-    function quickValidate($name,$clearIfValid=true)
-    {
-        $handler = new XoopsSingleTokenHandler();
-        return $handler->autoValidate($name,$clearIfValid);
-    }
-}
-
-/**
- * This class publish a token of the different same name of a serial number
- * for the tab browser.
- */
-class XoopsMultiTokenHandler extends XoopsTokenHandler
-{
-    function &create($name,$timeout=XOOPS_TOKEN_TIMEOUT)
-    {
-        $token =& new XoopsToken($name,$timeout);
-        $token->setSerialNumber($this->getUniqueSerial($name));
-        $this->register($token);
-        return $token;
-    }
-
-    function &fetch($name,$serial_number)
-    {
-        $ret = null;
-        if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number])) {
-            $ret =& $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
-        }
-        return $ret;
-    }
-
-    function register(&$token)
-    {
-        $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$token->_name_][$token->getSerialNumber()] = $token;
-    }
-
-    function unregister(&$token)
-    {
-        unset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$token->_name_][$token->getSerialNumber()]);
-    }
-
-    function isRegistered($name,$serial_number)
-    {
-        return isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number]);
-    }
-
-    function autoValidate($name,$clearIfValid=true)
-    {
-        $serial_number = $this->getRequestNumber($name);
-        if($serial_number!==null) {
-            if($token =& $this->fetch($name,$serial_number)) {
-                return $this->validate($token,$clearIfValid);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * static method.
-     * This method was created for quick protection of default modules.
-     * this method will be deleted in the near future.
-     * @deprecated
-     * @return bool
-    */
-    function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
-    {
-        $handler =& new XoopsMultiTokenHandler();
-        $ret =& $handler->create($name,$timeout);
-        return $ret;
-    }
-
-    /**
-     * static method.
-     * This method was created for quick protection of default modules.
-     * this method will be deleted in the near future.
-     * @deprecated
-     * @return bool
-    */
-    function quickValidate($name,$clearIfValid=true)
-    {
-        $handler = new XoopsMultiTokenHandler();
-        return $handler->autoValidate($name,$clearIfValid);
-    }
-
-    /**
-     * @param   $name   string
-     * @return  int
-     */
-    function getRequestNumber($name)
-    {
-        $str = XOOPS_TOKEN_PREFIX.$name."_";
-        foreach($_REQUEST as $key=>$val) {
-            if(preg_match("/".$str."(\d+)/",$key,$match))
-                return intval($match[1]);
-        }
-
-        return null;
-    }
-
-    function getUniqueSerial($name)
-    {
-        if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name])) {
-            if(is_array($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name])) {
-                for($i=0;isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name][$i]);$i++);
-                return $i;
-            }
-        }
-
-        return 0;
-    }
-}
+<?php
+// $Id: token.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
+
+define ( 'XOOPS_TOKEN_TIMEOUT', 0 );
+define ( 'XOOPS_TOKEN_PREFIX', "XOOPS_TOKEN_" );
+
+if(!defined('XOOPS_SALT'))
+    define('XOOPS_SALT',substr(md5(XOOPS_DB_PREFIX.XOOPS_DB_USER.XOOPS_ROOT_PATH),5,8));
+
+define ( 'XOOPS_TOKEN_SESSION_STRING', "X2_TOKEN");
+define ( 'XOOPS_TOKEN_MULTI_SESSION_STRING', "X2_MULTI_TOKEN");
+
+define('XOOPS_TOKEN_DEFAULT', 'XOOPS_TOKEN_DEFAULT');
+
+/**
+ * This class express token. this has name, token's string for inquiry,
+ * lifetime, serial number. this does not have direct validation method,
+ * therefore this does not depend on $_Session and $_Request.
+ *
+ * You can refer to a handler class for this token. this token class
+ * means ticket, and handler class means ticket agent. there is a strict
+ * ticket agent type(XoopsSingleTokenHandler), and flexible ticket agent
+ * for the tab browser(XoopsMultiTokenHandler).
+ */
+class XoopsToken
+{
+    /**
+     * token's name. this is used for identification.
+     * @access protected
+     */
+    var $_name_;
+
+    /**
+     * token's string for inquiry. this should be a random code for security.
+     * @access private
+     */
+    var $_token_;
+
+    /**
+     * the unixtime when this token is effective.
+     *
+     * @access protected
+     */
+    var $_lifetime_;
+
+    /**
+     * unlimited flag. if this is true, this token is not limited in lifetime.
+     */
+    var $_unlimited_;
+
+    /**
+     * serial number. this used for identification of tokens of same name tokens.
+     *
+     * @access private
+     */
+    var $_number_=0;
+
+    /**
+     * @param   $name   this token's name string.
+     * @param   $timeout    effective time(if $timeout equal 0, this token will become unlimited)
+     */
+    function XoopsToken($name, $timeout = XOOPS_TOKEN_TIMEOUT)
+    {
+        $this->_name_ = $name;
+
+        if($timeout) {
+            $this->_lifetime_ = time() + $timeout;
+            $this->_unlimited_ = false;
+        }
+        else {
+            $this->_lifetime_ = 0;
+            $this->_unlimited_ = true;
+        }
+
+        $this->_token_ = $this->_generateToken();
+    }
+
+
+    /**
+     * Returns random string for token's string.
+     *
+     * @access protected
+     * @return string
+     */
+    function _generateToken()
+    {
+        srand(microtime()*100000);
+        return md5(XOOPS_SALT.$this->_name_.uniqid(rand(),true));
+    }
+
+    /**
+     * Returns this token's name.
+     *
+     * @access public
+     * @return string
+     */
+    function getTokenName()
+    {
+        return XOOPS_TOKEN_PREFIX.$this->_name_."_".$this->_number_;
+    }
+
+    /**
+     * Returns this token's string.
+     *
+     * @access public
+     * @return  string
+     */
+    function getTokenValue()
+    {
+        return $this->_token_;
+    }
+
+    /**
+     * Set this token's serial number.
+     *
+     * @access public
+     * @param   $serial_number  serial number
+     */
+    function setSerialNumber($serial_number)
+    {
+        $this->_number_ = $serial_number;
+    }
+
+    /**
+     * Returns this token's serial number.
+     *
+     * @access public
+     * @return  int
+     */
+    function getSerialNumber()
+    {
+        return $this->_number_;
+    }
+
+    /**
+     * Returns hidden tag string that includes this token. you can use it
+     * for <form> tag's member.
+     *
+     * @access public
+     * @return  string
+     */
+    function getHtml()
+    {
+        return @sprintf('<input type="hidden" name="%s" value="%s" />',$this->getTokenName(),$this->getTokenValue());
+    }
+
+    /**
+     * Returns url string that includes this token. you can use it for
+     * hyper link.
+     *
+     * @return  string
+     */
+    function getUrl()
+    {
+        return $this->getTokenName()."=".$this->getTokenValue();
+    }
+
+    /**
+     * If $token equals this token's string, true is returened.
+     *
+     * @return  bool
+    */
+    function validate($token=null)
+    {
+        return ($this->_token_==$token && ( $this->_unlimited_ || time()<=$this->_lifetime_));
+    }
+}
+
+/**
+ * This class express ticket agent and ticket collector. this publishes
+ * token, keeps a token to server to check it later(next request).
+ *
+ * You can create various agents by extending the derivative class. see
+ * default(sample) classes.
+ */
+class XoopsTokenHandler
+{
+    /**
+     * @access private
+     */
+    var $_prefix ="";
+
+
+    /**
+     * Create XoopsToken instance, regist(keep to server), and returns it.
+     *
+     * @access public
+     * @param   $name   this token's name string.
+     * @param   $timeout    effective time(if $timeout equal 0, this token will become unlimited)
+     */
+    function &create($name,$timeout = XOOPS_TOKEN_TIMEOUT)
+    {
+        $token =& new XoopsToken($name,$timeout);
+        $this->register($token);
+        return $token;
+    }
+
+    /**
+     * Fetches from server side, and returns it.
+     *
+     * @access public
+     * @param   $name   token's name string.
+     * @return XoopsToken
+     */
+    function &fetch($name)
+    {
+        $ret = null;
+        if(isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name])) {
+            $ret =& $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name];
+        }
+        return $ret;
+    }
+
+    /**
+     * Register token to session.
+     */
+    function register(&$token)
+    {
+        $_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$token->_name_] = $token;
+    }
+
+    /**
+     * Unregister token to session.
+     */
+    function unregister(&$token)
+    {
+        unset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$token->_name_]);
+    }
+
+    /**
+     * If a token of the name that equal $name is registered on session,
+     * this method will return true.
+     *
+     * @access  public
+     * @param   $name   token's name string.
+     * @return  bool
+     */
+    function isRegistered($name)
+    {
+        return isset($_SESSION[XOOPS_TOKEN_SESSION_STRING][$this->_prefix.$name]);
+    }
+
+    /**
+     * This method takes out token's string from Request, and validate
+     * token with it. if it passed validation, this method will return true.
+     *
+     * @access  public
+     * @param   $token  XoopsToken
+     * @param   $clearIfValid   If token passed validation, $token will be unregistered.
+     * @return  bool
+     */
+    function validate(&$token,$clearIfValid)
+    {
+        $req_token = isset($_REQUEST[ $token->getTokenName() ]) ?
+                trim($_REQUEST[ $token->getTokenName() ]) : null;
+
+        if($req_token) {
+            if($token->validate($req_token)) {
+                if($clearIfValid)
+                    $this->unregister($token);
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+class XoopsSingleTokenHandler extends XoopsTokenHandler
+{
+    function autoValidate($name,$clearIfValid=true)
+    {
+        if($token =& $this->fetch($name)) {
+            return $this->validate($token,$clearIfValid);
+        }
+        return false;
+    }
+
+    /**
+     * static method.
+     * This method was created for quick protection of default modules.
+     * this method will be deleted in the near future.
+     * @deprecated
+     * @return bool
+    */
+    function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
+    {
+        $handler =& new XoopsSingleTokenHandler();
+        $ret =& $handler->create($name,$timeout);
+        return $ret;
+    }
+
+    /**
+     * static method.
+     * This method was created for quick protection of default modules.
+     * this method will be deleted in the near future.
+     * @deprecated
+     * @return bool
+    */
+    function quickValidate($name,$clearIfValid=true)
+    {
+        $handler = new XoopsSingleTokenHandler();
+        return $handler->autoValidate($name,$clearIfValid);
+    }
+}
+
+/**
+ * This class publish a token of the different same name of a serial number
+ * for the tab browser.
+ */
+class XoopsMultiTokenHandler extends XoopsTokenHandler
+{
+    function &create($name,$timeout=XOOPS_TOKEN_TIMEOUT)
+    {
+        $token =& new XoopsToken($name,$timeout);
+        $token->setSerialNumber($this->getUniqueSerial($name));
+        $this->register($token);
+        return $token;
+    }
+
+    function &fetch($name,$serial_number)
+    {
+        $ret = null;
+        if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number])) {
+            $ret =& $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number];
+        }
+        return $ret;
+    }
+
+    function register(&$token)
+    {
+        $_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$token->_name_][$token->getSerialNumber()] = $token;
+    }
+
+    function unregister(&$token)
+    {
+        unset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$token->_name_][$token->getSerialNumber()]);
+    }
+
+    function isRegistered($name,$serial_number)
+    {
+        return isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$this->_prefix.$name][$serial_number]);
+    }
+
+    function autoValidate($name,$clearIfValid=true)
+    {
+        $serial_number = $this->getRequestNumber($name);
+        if($serial_number!==null) {
+            if($token =& $this->fetch($name,$serial_number)) {
+                return $this->validate($token,$clearIfValid);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * static method.
+     * This method was created for quick protection of default modules.
+     * this method will be deleted in the near future.
+     * @deprecated
+     * @return bool
+    */
+    function &quickCreate($name,$timeout = XOOPS_TOKEN_TIMEOUT)
+    {
+        $handler =& new XoopsMultiTokenHandler();
+        $ret =& $handler->create($name,$timeout);
+        return $ret;
+    }
+
+    /**
+     * static method.
+     * This method was created for quick protection of default modules.
+     * this method will be deleted in the near future.
+     * @deprecated
+     * @return bool
+    */
+    function quickValidate($name,$clearIfValid=true)
+    {
+        $handler = new XoopsMultiTokenHandler();
+        return $handler->autoValidate($name,$clearIfValid);
+    }
+
+    /**
+     * @param   $name   string
+     * @return  int
+     */
+    function getRequestNumber($name)
+    {
+        $str = XOOPS_TOKEN_PREFIX.$name."_";
+        foreach($_REQUEST as $key=>$val) {
+            if(preg_match("/".$str."(\d+)/",$key,$match))
+                return intval($match[1]);
+        }
+
+        return null;
+    }
+
+    function getUniqueSerial($name)
+    {
+        if(isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name])) {
+            if(is_array($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name])) {
+                for($i=0;isset($_SESSION[XOOPS_TOKEN_MULTI_SESSION_STRING][$name][$i]);$i++);
+                return $i;
+            }
+        }
+
+        return 0;
+    }
+}
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/xoopssecurity.php
diff -u xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.3 xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.4
--- xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.3	Sun Dec  3 13:52:16 2006
+++ xoops2jp/html/class/xoopssecurity.php	Sun Dec  3 16:44:53 2006
@@ -1,66 +1,66 @@
-<?php
-// $Id: xoopssecurity.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
-
-/**
- * Class for xoops.org 2.0.10 compatibility
- *
- * @deprecated
- */
-class XoopsSecurity
-{
-    var $errors;
-
-    function check($clearIfValid = true, $tokenValue = false) {
-        return $this->validateToken($tokenValue, $clearIfValid);
-    }
-
-    function createToken($timeout = XOOPS_TOKEN_TIMEOUT)
-    {
-        $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT, $timeout);
-        return $token->getTokenValue();
-    }
-
-    function validateToken($tokenValue = false, $clearIfValid = true)
-    {
-        if (false !== $tokenValue) {
-            $handler = new XoopsSingleTokenHandler();
-            $token =& $handler->fetch(XOOPS_TOKEN_DEFAULT);
-            if($token->validate($tokenValue)) {
-                if ($clearIfValid) {
-                    $handler->unregister($token);
-                }
-                return true;
-            } else {
-                $this->setErrors('No token found');
-                return false;
-            }
-        }
-        return XoopsMultiTokenHandler::quickValidate(XOOPS_TOKEN_DEFAULT, $clearIfValid);
-    }
-
-    function getTokenHTML() {
-        $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
-        return $token->getHtml();
-    }
-
-    function setErrors($error)
-    {
-        $this->errors[] = trim($error);
-    }
-
-    function &getErrors($ashtml = false)
-    {
-        if (!$ashtml) {
-            return $this->errors;
-        } else {
-            $ret = '';
-            if (count($this->errors) > 0) {
-                foreach ($this->errors as $error) {
-                    $ret .= $error.'<br />';
-                }
-            }
-            return $ret;
-        }
-    }
-}
+<?php
+// $Id: xoopssecurity.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
+
+/**
+ * Class for xoops.org 2.0.10 compatibility
+ *
+ * @deprecated
+ */
+class XoopsSecurity
+{
+    var $errors;
+
+    function check($clearIfValid = true, $tokenValue = false) {
+        return $this->validateToken($tokenValue, $clearIfValid);
+    }
+
+    function createToken($timeout = XOOPS_TOKEN_TIMEOUT)
+    {
+        $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT, $timeout);
+        return $token->getTokenValue();
+    }
+
+    function validateToken($tokenValue = false, $clearIfValid = true)
+    {
+        if (false !== $tokenValue) {
+            $handler = new XoopsSingleTokenHandler();
+            $token =& $handler->fetch(XOOPS_TOKEN_DEFAULT);
+            if($token->validate($tokenValue)) {
+                if ($clearIfValid) {
+                    $handler->unregister($token);
+                }
+                return true;
+            } else {
+                $this->setErrors('No token found');
+                return false;
+            }
+        }
+        return XoopsMultiTokenHandler::quickValidate(XOOPS_TOKEN_DEFAULT, $clearIfValid);
+    }
+
+    function getTokenHTML() {
+        $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
+        return $token->getHtml();
+    }
+
+    function setErrors($error)
+    {
+        $this->errors[] = trim($error);
+    }
+
+    function &getErrors($ashtml = false)
+    {
+        if (!$ashtml) {
+            return $this->errors;
+        } else {
+            $ret = '';
+            if (count($this->errors) > 0) {
+                foreach ($this->errors as $error) {
+                    $ret .= $error.'<br />';
+                }
+            }
+            return $ret;
+        }
+    }
+}
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/mimetypes.inc.php
diff -u xoops2jp/html/class/mimetypes.inc.php:1.3.6.1.2.3 xoops2jp/html/class/mimetypes.inc.php:1.3.6.1.2.4
--- xoops2jp/html/class/mimetypes.inc.php:1.3.6.1.2.3	Sun Dec  3 13:52:16 2006
+++ xoops2jp/html/class/mimetypes.inc.php	Sun Dec  3 16:44:53 2006
@@ -1,118 +1,118 @@
-<?php
-// $Id: mimetypes.inc.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
-/**
-* Extension to mimetype lookup table
-*
-* This file is provided as an helper for objects who need to perform filename to mimetype translations.
-* Common types have been provided, but feel free to add your own one if you need it.
-* <br /><br />
-* See the enclosed file LICENSE for licensing information.
-* If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
-*
-* @copyright    The Xoops project http://www.xoops.org/
-* @license      http://www.fsf.org/copyleft/gpl.html GNU public license
-* @author       Skalpa Keo <skalpa ＠ xoops.org>
-* @since        2.0.9.3
-*/
-
-return array(
-     "hqx"      => "application/mac-binhex40",
-     "doc"      => "application/msword",
-     "dot"      => "application/msword",
-     "bin"      => "application/octet-stream",
-     "lha"      => "application/octet-stream",
-     "lzh"      => "application/octet-stream",
-     "exe"      => "application/octet-stream",
-     "class"    => "application/octet-stream",
-     "so"       => "application/octet-stream",
-     "dll"      => "application/octet-stream",
-     "pdf"      => "application/pdf",
-     "ai"       => "application/postscript",
-     "eps"      => "application/postscript",
-     "ps"       => "application/postscript",
-     "smi"      => "application/smil",
-     "smil"     => "application/smil",
-     "wbxml"    => "application/vnd.wap.wbxml",
-     "wmlc"     => "application/vnd.wap.wmlc",
-     "wmlsc"    => "application/vnd.wap.wmlscriptc",
-     "xla"      => "application/vnd.ms-excel",
-     "xls"      => "application/vnd.ms-excel",
-     "xlt"      => "application/vnd.ms-excel",
-     "ppt"      => "application/vnd.ms-powerpoint",
-     "csh"      => "application/x-csh",
-     "dcr"      => "application/x-director",
-     "dir"      => "application/x-director",
-     "dxr"      => "application/x-director",
-     "spl"      => "application/x-futuresplash",
-     "gtar"     => "application/x-gtar",
-     "php"      => "application/x-httpd-php",
-     "php3"     => "application/x-httpd-php",
-     "php5"     => "application/x-httpd-php",
-     "phtml"    => "application/x-httpd-php",
-     "js"       => "application/x-javascript",
-     "sh"       => "application/x-sh",
-     "swf"      => "application/x-shockwave-flash",
-     "sit"      => "application/x-stuffit",
-     "tar"      => "application/x-tar",
-     "tcl"      => "application/x-tcl",
-     "xhtml"    => "application/xhtml+xml",
-     "xht"      => "application/xhtml+xml",
-     "xhtml"    => "application/xml",
-     "ent"      => "application/xml-external-parsed-entity",
-     "dtd"      => "application/xml-dtd",
-     "mod"      => "application/xml-dtd",
-     "gz"       => "application/x-gzip",
-     "zip"      => "application/zip",
-     "au"       => "audio/basic",
-     "snd"      => "audio/basic",
-     "mid"      => "audio/midi",
-     "midi"     => "audio/midi",
-     "kar"      => "audio/midi",
-     "mp1"      => "audio/mpeg",
-     "mp2"      => "audio/mpeg",
-     "mp3"      => "audio/mpeg",
-     "aif"      => "audio/x-aiff",
-     "aiff"     => "audio/x-aiff",
-     "m3u"      => "audio/x-mpegurl",
-     "ram"      => "audio/x-pn-realaudio",
-     "rm"       => "audio/x-pn-realaudio",
-     "rpm"      => "audio/x-pn-realaudio-plugin",
-     "ra"       => "audio/x-realaudio",
-     "wav"      => "audio/x-wav",
-     "bmp"      => "image/bmp",
-     "gif"      => "image/gif",
-     "jpeg"     => "image/jpeg",
-     "jpg"      => "image/jpeg",
-     "jpe"      => "image/jpeg",
-     "png"      => "image/png",
-     "tiff"     => "image/tiff",
-     "tif"      => "image/tif",
-     "wbmp"     => "image/vnd.wap.wbmp",
-     "pnm"      => "image/x-portable-anymap",
-     "pbm"      => "image/x-portable-bitmap",
-     "pgm"      => "image/x-portable-graymap",
-     "ppm"      => "image/x-portable-pixmap",
-     "xbm"      => "image/x-xbitmap",
-     "xpm"      => "image/x-xpixmap",
-     "ics"      => "text/calendar",
-     "ifb"      => "text/calendar",
-     "css"      => "text/css",
-     "html"     => "text/html",
-     "htm"      => "text/html",
-     "asc"      => "text/plain",
-     "txt"      => "text/plain",
-     "rtf"      => "text/rtf",
-     "sgml"     => "text/x-sgml",
-     "sgm"      => "text/x-sgml",
-     "tsv"      => "text/tab-seperated-values",
-     "wml"      => "text/vnd.wap.wml",
-     "wmls"     => "text/vnd.wap.wmlscript",
-     "xsl"      => "text/xml",
-     "mpeg"     => "video/mpeg",
-     "mpg"      => "video/mpeg",
-     "mpe"      => "video/mpeg",
-     "qt"       => "video/quicktime",
-     "mov"      => "video/quicktime",
-     "avi"      => "video/x-msvideo",
-);
+<?php
+// $Id: mimetypes.inc.php,v 1.3 2005/08/03 12:39:11 onokazu Exp $
+/**
+* Extension to mimetype lookup table
+*
+* This file is provided as an helper for objects who need to perform filename to mimetype translations.
+* Common types have been provided, but feel free to add your own one if you need it.
+* <br /><br />
+* See the enclosed file LICENSE for licensing information.
+* If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+*
+* @copyright    The Xoops project http://www.xoops.org/
+* @license      http://www.fsf.org/copyleft/gpl.html GNU public license
+* @author       Skalpa Keo <skalpa ＠ xoops.org>
+* @since        2.0.9.3
+*/
+
+return array(
+     "hqx"      => "application/mac-binhex40",
+     "doc"      => "application/msword",
+     "dot"      => "application/msword",
+     "bin"      => "application/octet-stream",
+     "lha"      => "application/octet-stream",
+     "lzh"      => "application/octet-stream",
+     "exe"      => "application/octet-stream",
+     "class"    => "application/octet-stream",
+     "so"       => "application/octet-stream",
+     "dll"      => "application/octet-stream",
+     "pdf"      => "application/pdf",
+     "ai"       => "application/postscript",
+     "eps"      => "application/postscript",
+     "ps"       => "application/postscript",
+     "smi"      => "application/smil",
+     "smil"     => "application/smil",
+     "wbxml"    => "application/vnd.wap.wbxml",
+     "wmlc"     => "application/vnd.wap.wmlc",
+     "wmlsc"    => "application/vnd.wap.wmlscriptc",
+     "xla"      => "application/vnd.ms-excel",
+     "xls"      => "application/vnd.ms-excel",
+     "xlt"      => "application/vnd.ms-excel",
+     "ppt"      => "application/vnd.ms-powerpoint",
+     "csh"      => "application/x-csh",
+     "dcr"      => "application/x-director",
+     "dir"      => "application/x-director",
+     "dxr"      => "application/x-director",
+     "spl"      => "application/x-futuresplash",
+     "gtar"     => "application/x-gtar",
+     "php"      => "application/x-httpd-php",
+     "php3"     => "application/x-httpd-php",
+     "php5"     => "application/x-httpd-php",
+     "phtml"    => "application/x-httpd-php",
+     "js"       => "application/x-javascript",
+     "sh"       => "application/x-sh",
+     "swf"      => "application/x-shockwave-flash",
+     "sit"      => "application/x-stuffit",
+     "tar"      => "application/x-tar",
+     "tcl"      => "application/x-tcl",
+     "xhtml"    => "application/xhtml+xml",
+     "xht"      => "application/xhtml+xml",
+     "xhtml"    => "application/xml",
+     "ent"      => "application/xml-external-parsed-entity",
+     "dtd"      => "application/xml-dtd",
+     "mod"      => "application/xml-dtd",
+     "gz"       => "application/x-gzip",
+     "zip"      => "application/zip",
+     "au"       => "audio/basic",
+     "snd"      => "audio/basic",
+     "mid"      => "audio/midi",
+     "midi"     => "audio/midi",
+     "kar"      => "audio/midi",
+     "mp1"      => "audio/mpeg",
+     "mp2"      => "audio/mpeg",
+     "mp3"      => "audio/mpeg",
+     "aif"      => "audio/x-aiff",
+     "aiff"     => "audio/x-aiff",
+     "m3u"      => "audio/x-mpegurl",
+     "ram"      => "audio/x-pn-realaudio",
+     "rm"       => "audio/x-pn-realaudio",
+     "rpm"      => "audio/x-pn-realaudio-plugin",
+     "ra"       => "audio/x-realaudio",
+     "wav"      => "audio/x-wav",
+     "bmp"      => "image/bmp",
+     "gif"      => "image/gif",
+     "jpeg"     => "image/jpeg",
+     "jpg"      => "image/jpeg",
+     "jpe"      => "image/jpeg",
+     "png"      => "image/png",
+     "tiff"     => "image/tiff",
+     "tif"      => "image/tif",
+     "wbmp"     => "image/vnd.wap.wbmp",
+     "pnm"      => "image/x-portable-anymap",
+     "pbm"      => "image/x-portable-bitmap",
+     "pgm"      => "image/x-portable-graymap",
+     "ppm"      => "image/x-portable-pixmap",
+     "xbm"      => "image/x-xbitmap",
+     "xpm"      => "image/x-xpixmap",
+     "ics"      => "text/calendar",
+     "ifb"      => "text/calendar",
+     "css"      => "text/css",
+     "html"     => "text/html",
+     "htm"      => "text/html",
+     "asc"      => "text/plain",
+     "txt"      => "text/plain",
+     "rtf"      => "text/rtf",
+     "sgml"     => "text/x-sgml",
+     "sgm"      => "text/x-sgml",
+     "tsv"      => "text/tab-seperated-values",
+     "wml"      => "text/vnd.wap.wml",
+     "wmls"     => "text/vnd.wap.wmlscript",
+     "xsl"      => "text/xml",
+     "mpeg"     => "video/mpeg",
+     "mpg"      => "video/mpeg",
+     "mpe"      => "video/mpeg",
+     "qt"       => "video/quicktime",
+     "mov"      => "video/quicktime",
+     "avi"      => "video/x-msvideo",
+);
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:53 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:53 +0900
Subject: [xoops-cvslog 6004] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061203074453.D2DBF2AC125@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserDeleteAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserDeleteAction.class.php:1.1.2.2.2.5 xoops2jp/html/modules/user/actions/UserDeleteAction.class.php:1.1.2.2.2.6
--- xoops2jp/html/modules/user/actions/UserDeleteAction.class.php:1.1.2.2.2.5	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/modules/user/actions/UserDeleteAction.class.php	Sun Dec  3 16:44:53 2006
@@ -1,125 +1,125 @@
-<?php
-/**
- * @package user
- * @version $Id$
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/user/forms/UserDeleteForm.class.php";
-
-/**
- * This action is for self delete function.
- * 
- * Site owner want various procedure to this action. Therefore, this action may
- * have to implement main logic with Delegate only.
- */
-class User_UserDeleteAction extends User_Action
-{
-	var $mActionForm = null;
-	var $mObject = null;
-	
-	var $mSelfDelete = false;
-	var $mSelfDeleteConfirmMessage = "";
-
-	function prepare(&$controller, &$xoopsUser, $moduleConfig)
-	{
-		$this->mSelfDelete = $moduleConfig['self_delete'];
-		$this->mSelfDeleteConfirmMessage = $moduleConfig['self_delete_confirm'];
-		
-		$this->mActionForm =& new User_UserDeleteForm();
-		$this->mActionForm->prepare();
-		
-		//
-		// pre condition check
-		//
-		if (!$this->mSelfDelete) {
-			$controller->executeForward(XOOPS_URL . '/');
-		}
-		
-		if (is_object($xoopsUser)) {
-			$handler =& xoops_getmodulehandler('users', 'user');
-			$this->mObject =& $handler->get($xoopsUser->get('uid'));
-		}
-	}
-	
-	function isSecure()
-	{
-		return true;
-	}
-
-	function hasPermission(&$controller, &$xoopsUser, $moduleConfig)
-	{
-		if ($xoopsUser->get('uid') == 1) {
-			return false;
-		}
-		
-		return true;
-	}
-	
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		return USER_FRAME_VIEW_INPUT;
-	}
-	
-	/**
-	 * FIXME: Need FORCE LOGOUT here?
-	 */
-	function execute(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if ($this->mActionForm->hasError()) {
-			return $this->getDefaultView($controller, $xoopsUser);
-		}
-		
-		if ($this->_doDelete($controller, $xoopsUser)) {
-			XCube_DelegateUtils::call('Legacy.Event.UserDelete', new XCube_Ref($this->mObject));
-			
-			return USER_FRAME_VIEW_SUCCESS;
-		}
-		
-		return USER_FRAME_VIEW_ERROR;
-	}
-	
-	/**
-	 * Exection deleting.
-	 * 
-	 * @return bool
-	 */
-	function _doDelete(&$controller, &$xoopsUser)
-	{
-		$handler =& xoops_gethandler('member');
-		if ($handler->deleteUser($xoopsUser)) {
-			$handler =& xoops_gethandler('online');
-			$handler->destroy($this->mObject->get('uid'));
-			xoops_notification_deletebyuser($this->mObject->get('uid'));
-			
-			return true;
-		}
-		
-		return false;
-	}
-	
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("user_delete.html");
-		$render->setAttribute('object', $this->mObject);
-		$render->setAttribute('actionForm', $this->mActionForm);
-		$render->setAttribute('self_delete_message', $this->mSelfDeleteConfirmMessage);
-	}
-	
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("user_delete_success.html");
-		$render->setAttribute("object", $this->mObject);
-	}
-	
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeRedirect(XOOPS_URL . '/', 3, _MD_USER_ERROR_DBUPDATE_FAILED);
-	}
-}
-
+<?php
+/**
+ * @package user
+ * @version $Id$
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/forms/UserDeleteForm.class.php";
+
+/**
+ * This action is for self delete function.
+ * 
+ * Site owner want various procedure to this action. Therefore, this action may
+ * have to implement main logic with Delegate only.
+ */
+class User_UserDeleteAction extends User_Action
+{
+	var $mActionForm = null;
+	var $mObject = null;
+	
+	var $mSelfDelete = false;
+	var $mSelfDeleteConfirmMessage = "";
+
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
+	{
+		$this->mSelfDelete = $moduleConfig['self_delete'];
+		$this->mSelfDeleteConfirmMessage = $moduleConfig['self_delete_confirm'];
+		
+		$this->mActionForm =& new User_UserDeleteForm();
+		$this->mActionForm->prepare();
+		
+		//
+		// pre condition check
+		//
+		if (!$this->mSelfDelete) {
+			$controller->executeForward(XOOPS_URL . '/');
+		}
+		
+		if (is_object($xoopsUser)) {
+			$handler =& xoops_getmodulehandler('users', 'user');
+			$this->mObject =& $handler->get($xoopsUser->get('uid'));
+		}
+	}
+	
+	function isSecure()
+	{
+		return true;
+	}
+
+	function hasPermission(&$controller, &$xoopsUser, $moduleConfig)
+	{
+		if ($xoopsUser->get('uid') == 1) {
+			return false;
+		}
+		
+		return true;
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		return USER_FRAME_VIEW_INPUT;
+	}
+	
+	/**
+	 * FIXME: Need FORCE LOGOUT here?
+	 */
+	function execute(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
+		
+		if ($this->_doDelete($controller, $xoopsUser)) {
+			XCube_DelegateUtils::call('Legacy.Event.UserDelete', new XCube_Ref($this->mObject));
+			
+			return USER_FRAME_VIEW_SUCCESS;
+		}
+		
+		return USER_FRAME_VIEW_ERROR;
+	}
+	
+	/**
+	 * Exection deleting.
+	 * 
+	 * @return bool
+	 */
+	function _doDelete(&$controller, &$xoopsUser)
+	{
+		$handler =& xoops_gethandler('member');
+		if ($handler->deleteUser($xoopsUser)) {
+			$handler =& xoops_gethandler('online');
+			$handler->destroy($this->mObject->get('uid'));
+			xoops_notification_deletebyuser($this->mObject->get('uid'));
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_delete.html");
+		$render->setAttribute('object', $this->mObject);
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$render->setAttribute('self_delete_message', $this->mSelfDeleteConfirmMessage);
+	}
+	
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_delete_success.html");
+		$render->setAttribute("object", $this->mObject);
+	}
+	
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeRedirect(XOOPS_URL . '/', 3, _MD_USER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
 ?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php
diff -u xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.6 xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.7
--- xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php:1.1.2.1.2.6	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/modules/user/actions/MiscOnlineAction.class.php	Sun Dec  3 16:44:53 2006
@@ -1,50 +1,50 @@
-<?php
-/**
- * @package Legacy
- * @version $Id: MiscOnlineAction.class.php,v 1.1.2.2 2006/08/05 13:21:06 minahito Exp $
- */
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/user/forms/OnlineFilterForm.class.php";
-
-class User_MiscOnlineAction extends User_AbstractListAction
-{
-	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
-	{
-		$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('user');
-	}
-	
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('online', 'user');
-		return $handler;
-	}
-
-	function &_getFilterForm()
-	{
-		$filter =& new User_OnlineFilterForm($this->_getPageNavi(), $this->_getHandler());
-		return $filter;
-	}
-
-	function _getBaseUrl()
-	{
-		return "./misc.php?type=Online";
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("user_misc_online.html");
-		
-		foreach (array_keys($this->mObjects) as $key) {
-			$this->mObjects[$key]->loadModule();
-		}
-		
-		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
-		$render->setAttribute('enableViewIP', $controller->mRoot->mContext->mUser->isInRole('Module.user.Admin'));
-	}
-}
-
-?>
+<?php
+/**
+ * @package Legacy
+ * @version $Id: MiscOnlineAction.class.php,v 1.1.2.2 2006/08/05 13:21:06 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/user/forms/OnlineFilterForm.class.php";
+
+class User_MiscOnlineAction extends User_AbstractListAction
+{
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('user');
+	}
+	
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('online', 'user');
+		return $handler;
+	}
+
+	function &_getFilterForm()
+	{
+		$filter =& new User_OnlineFilterForm($this->_getPageNavi(), $this->_getHandler());
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./misc.php?type=Online";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_misc_online.html");
+		
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadModule();
+		}
+		
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mFilter->mNavi);
+		$render->setAttribute('enableViewIP', $controller->mRoot->mContext->mUser->isInRole('Module.user.Admin'));
+	}
+}
+
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6005] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061203074454.037E12AC12B@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formhiddentoken.php
diff -u xoops2jp/html/class/xoopsform/formhiddentoken.php:1.3.6.1.2.3 xoops2jp/html/class/xoopsform/formhiddentoken.php:1.3.6.1.2.4
--- xoops2jp/html/class/xoopsform/formhiddentoken.php:1.3.6.1.2.3	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/class/xoopsform/formhiddentoken.php	Sun Dec  3 16:44:53 2006
@@ -1,58 +1,58 @@
-<?php
-// $Id: formhiddentoken.php,v 1.3 2005/08/03 12:39:11 onokazu 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 // //  ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu)                                          //
-// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
-/**
- *
- * @author      Kazumi Ono  <onokazu ＠ xoops.org>
- * @copyright   copyright (c) 2000-2005 XOOPS.org
- */
-/**
- * A hidden token field
- *
- *
- * @author      Kazumi Ono  <onokazu ＠ xoops.org>
- * @copyright   copyright (c) 2000-2005 XOOPS.org
- */
-class XoopsFormHiddenToken extends XoopsFormHidden {
-
-    /**
-     * Constructor
-     *
-     * @param   string  $name   "name" attribute
-     */
-    function XoopsFormHiddenToken($name = null, $timeout = 360){
-        if (empty($name)) {
-            $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
-            $name = $token->getTokenName();
-        } else {
-            $token =& XoopsSingleTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
-        }
-        $this->XoopsFormHidden($name, $token->getTokenValue());
-    }
-}
+<?php
+// $Id: formhiddentoken.php,v 1.3 2005/08/03 12:39:11 onokazu 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 // //  ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu)                                          //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project                                                //
+// ------------------------------------------------------------------------- //
+/**
+ *
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2005 XOOPS.org
+ */
+/**
+ * A hidden token field
+ *
+ *
+ * @author      Kazumi Ono  <onokazu ＠ xoops.org>
+ * @copyright   copyright (c) 2000-2005 XOOPS.org
+ */
+class XoopsFormHiddenToken extends XoopsFormHidden {
+
+    /**
+     * Constructor
+     *
+     * @param   string  $name   "name" attribute
+     */
+    function XoopsFormHiddenToken($name = null, $timeout = 360){
+        if (empty($name)) {
+            $token =& XoopsMultiTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
+            $name = $token->getTokenName();
+        } else {
+            $token =& XoopsSingleTokenHandler::quickCreate(XOOPS_TOKEN_DEFAULT);
+        }
+        $this->XoopsFormHidden($name, $token->getTokenValue());
+    }
+}
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/xoopsform/formtoken.php
diff -u xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.3 xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.4
--- xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.3	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/class/xoopsform/formtoken.php	Sun Dec  3 16:44:53 2006
@@ -1,49 +1,49 @@
-<?php
-// $Id: formtoken.php,v 1.3 2005/08/03 12:39:11 onokazu 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 // //  ------------------------------------------------------------------------ //
-
-/**
- * A hidden token field by XoopsToken instance.
- * This is a trial code.
- *
- * @author  minahito<minahito ＠ users.sourceforge.jp>
- * @copyright   copyright (c) 2000-2005 XOOPS.org
-*/
-class XoopsFormToken extends XoopsFormHidden {
-    /**
-     * Constructor
-     *
-     * @param object    $token  XoopsToken instance
-    */
-    function XoopsFormToken($token)
-    {
-        if(is_object($token)) {
-            parent::XoopsFormHidden($token->getTokenName(), $token->getTokenValue());
-        }
-        else {
-            parent::XoopsFormHidden('','');
-        }
-    }
-}
+<?php
+// $Id: formtoken.php,v 1.3 2005/08/03 12:39:11 onokazu 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 // //  ------------------------------------------------------------------------ //
+
+/**
+ * A hidden token field by XoopsToken instance.
+ * This is a trial code.
+ *
+ * @author  minahito<minahito ＠ users.sourceforge.jp>
+ * @copyright   copyright (c) 2000-2005 XOOPS.org
+*/
+class XoopsFormToken extends XoopsFormHidden {
+    /**
+     * Constructor
+     *
+     * @param object    $token  XoopsToken instance
+    */
+    function XoopsFormToken($token)
+    {
+        if(is_object($token)) {
+            parent::XoopsFormHidden($token->getTokenName(), $token->getTokenValue());
+        }
+        else {
+            parent::XoopsFormHidden('','');
+        }
+    }
+}
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6006] CVS update:
	xoops2jp/html/modules/legacy/admin/theme/stylesheets
Message-ID: <20061203074454.4FA942AC12B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css
diff -u xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.4 xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.4	Tue Oct 24 00:07:17 2006
+++ xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css	Sun Dec  3 16:44:54 2006
@@ -138,9 +138,9 @@
 	background:#6766A2;
 	padding:6px 4px;
 	text-align: center;
-}
-.foot a{
-	color:#ffffff;
+}
+.foot a{
+	color:#ffffff;
 }
 .odd {
 	background:#eeeeff;
@@ -314,15 +314,15 @@
 	line-height:2em;
 	background-color:#f8f8ff;
 	white-space: nowrap;
-	_white-space:none;
+	_white-space:none;
 	
 }
 ul.submenunavi li a {
 	color:#000060;
 }
 ul.submenunavi li a:visited {
-	color:#000060;
-}
+	color:#000060;
+}
  */
 
 /* ===== Admin Navi ===== */
@@ -365,11 +365,11 @@
 }
 
 /* ===== Page Navi ===== */
-.pagenavi {
+.pagenavi {
 	font-size:14px;
 	text-align:center;
 	margin:10px;
-	word-spacing: 0.5em;
+	word-spacing: 0.5em;
 }
 
 /* ===== top message ===== */

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6007] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20061203074454.2A6422AC136@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php
diff -u xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php:1.1.2.1.2.4 xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php:1.1.2.1.2.5
--- xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php:1.1.2.1.2.4	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/modules/user/forms/OnlineFilterForm.class.php	Sun Dec  3 16:44:54 2006
@@ -1,39 +1,39 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
-
-define('ONLINE_SORT_KEY_ONLINE_UID', 1);
-define('ONLINE_SORT_KEY_ONLINE_UNAME', 2);
-define('ONLINE_SORT_KEY_ONLINE_UPDATED', 3);
-define('ONLINE_SORT_KEY_ONLINE_MODULE', 4);
-define('ONLINE_SORT_KEY_ONLINE_IP', 5);
-define('ONLINE_SORT_KEY_MAXVALUE', 5);
-
-define('ONLINE_SORT_KEY_DEFAULT', ONLINE_SORT_KEY_ONLINE_UID);
-
-class User_OnlineFilterForm extends User_AbstractFilterForm
-{
-	var $mSortKeys = array(
-		ONLINE_SORT_KEY_ONLINE_UID => 'online_uid',
-		ONLINE_SORT_KEY_ONLINE_UNAME => 'online_uname',
-		ONLINE_SORT_KEY_ONLINE_UPDATED => 'online_updated',
-		ONLINE_SORT_KEY_ONLINE_MODULE => 'online_module',
-		ONLINE_SORT_KEY_ONLINE_IP => 'online_ip'
-	);
-	
-	function getDefaultSortKey()
-	{
-		return ONLINE_SORT_KEY_DEFAULT;
-	}
-
-	function fetch()
-	{
-		parent::fetch();
-
-		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
-	}
-}
-
-?>
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
+
+define('ONLINE_SORT_KEY_ONLINE_UID', 1);
+define('ONLINE_SORT_KEY_ONLINE_UNAME', 2);
+define('ONLINE_SORT_KEY_ONLINE_UPDATED', 3);
+define('ONLINE_SORT_KEY_ONLINE_MODULE', 4);
+define('ONLINE_SORT_KEY_ONLINE_IP', 5);
+define('ONLINE_SORT_KEY_MAXVALUE', 5);
+
+define('ONLINE_SORT_KEY_DEFAULT', ONLINE_SORT_KEY_ONLINE_UID);
+
+class User_OnlineFilterForm extends User_AbstractFilterForm
+{
+	var $mSortKeys = array(
+		ONLINE_SORT_KEY_ONLINE_UID => 'online_uid',
+		ONLINE_SORT_KEY_ONLINE_UNAME => 'online_uname',
+		ONLINE_SORT_KEY_ONLINE_UPDATED => 'online_updated',
+		ONLINE_SORT_KEY_ONLINE_MODULE => 'online_module',
+		ONLINE_SORT_KEY_ONLINE_IP => 'online_ip'
+	);
+	
+	function getDefaultSortKey()
+	{
+		return ONLINE_SORT_KEY_DEFAULT;
+	}
+
+	function fetch()
+	{
+		parent::fetch();
+
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/forms/UserDeleteForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserDeleteForm.class.php:1.1.2.1.2.6 xoops2jp/html/modules/user/forms/UserDeleteForm.class.php:1.1.2.1.2.7
--- xoops2jp/html/modules/user/forms/UserDeleteForm.class.php:1.1.2.1.2.6	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/modules/user/forms/UserDeleteForm.class.php	Sun Dec  3 16:44:54 2006
@@ -1,20 +1,20 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_MODULE_PATH . "/legacy/class/Legacy_Validator.class.php";
-
-class User_UserDeleteForm extends XCube_ActionForm
-{
-	function getTokenName()
-	{
-		return "module.user.UserDeleteForm.TOKEN";
-	}
-
-	function prepare()
-	{
-	}
-}
-
-?>
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/legacy/class/Legacy_Validator.class.php";
+
+class User_UserDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.UserDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+	}
+}
+
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6008] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061203074454.762A82AC139@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.4 xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.5
--- xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.4	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php	Sun Dec  3 16:44:54 2006
@@ -1,80 +1,80 @@
-<?php
-
-/*
- * Smarty plugin
- * -------------------------------------------------------------
- * Type:     function
- * Name:     xoops_pagenavi
- * Version:  1.0
- * Date:     Nov 13, 2005
- * Author:   minahito
- * Purpose:  the place holder for xoops pagenavi.
- * Input:    pagenavi =
- *           offset =
- * 
- * Examples: {xoops_pagenavi pagenavi=$pagenavi}
- * -------------------------------------------------------------
- */
-function smarty_function_xoops_pagenavi($params, &$smarty)
-{
-	$ret = "";
-
-	if (isset($params['pagenavi']) && is_object($params['pagenavi'])) {
-		
-		$navi =& $params['pagenavi'];
-		
-		$perPage = $navi->getPerpage();
-
-		$total = $navi->getTotalItems();
-		$totalPages = $navi->getTotalPages();
-		
-		if ($totalPages == 0) {
-			return;
-		}
-		
-		$url = $navi->renderURLForPage();
-		$current = $navi->getStart();
-		
-		$offset = isset($params['offset']) ? intval($params['offset']) : 4;
-
-		//
-		// check prev
-		//
-		if($navi->hasPrivPage()) {
-			$ret .= @sprintf("<a href='%s'>&laquo;</a>", $navi->renderURLForPage($navi->getPrivStart()));
-		}
-
-		//
-		// counting
-		//
-		$counter=1;
-		$currentPage = $navi->getCurrentPage();
-		while($counter<=$totalPages) {
-			if($counter==$currentPage) {
-				$ret.=@sprintf("<strong>(%d)</strong> ",$counter);
-			}
-			elseif(($counter>$currentPage-$offset && $counter<$currentPage+$offset) || $counter==1 || $counter==$totalPages) {
-				if($counter==$totalPages && $currentPage<$totalPages-$offset) {
-					$ret.="... ";
-				}
-				$ret .= @sprintf("<a href='%s'>%d</a> ",$navi->renderURLForPage(($counter-1)*$perPage),$counter);
-				if($counter==1 && $currentPage>1 + $offset) {
-					$ret.="... ";
-				}
-			}
-			$counter++;
-		}
-	
-		//
-		// check next
-		//
-		$next=$current + $perPage;
-		if($navi->hasNextPage()) {
-			$ret.=@sprintf("<a href='%s'>&raquo;</a>",$navi->renderURLForPage($navi->getNextStart()));
-		}
-	}
-
-	print $ret;
-}
-
-?>
+<?php
+
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * Type:     function
+ * Name:     xoops_pagenavi
+ * Version:  1.0
+ * Date:     Nov 13, 2005
+ * Author:   minahito
+ * Purpose:  the place holder for xoops pagenavi.
+ * Input:    pagenavi =
+ *           offset =
+ * 
+ * Examples: {xoops_pagenavi pagenavi=$pagenavi}
+ * -------------------------------------------------------------
+ */
+function smarty_function_xoops_pagenavi($params, &$smarty)
+{
+	$ret = "";
+
+	if (isset($params['pagenavi']) && is_object($params['pagenavi'])) {
+		
+		$navi =& $params['pagenavi'];
+		
+		$perPage = $navi->getPerpage();
+
+		$total = $navi->getTotalItems();
+		$totalPages = $navi->getTotalPages();
+		
+		if ($totalPages == 0) {
+			return;
+		}
+		
+		$url = $navi->renderURLForPage();
+		$current = $navi->getStart();
+		
+		$offset = isset($params['offset']) ? intval($params['offset']) : 4;
+
+		//
+		// check prev
+		//
+		if($navi->hasPrivPage()) {
+			$ret .= @sprintf("<a href='%s'>&laquo;</a>", $navi->renderURLForPage($navi->getPrivStart()));
+		}
+
+		//
+		// counting
+		//
+		$counter=1;
+		$currentPage = $navi->getCurrentPage();
+		while($counter<=$totalPages) {
+			if($counter==$currentPage) {
+				$ret.=@sprintf("<strong>(%d)</strong> ",$counter);
+			}
+			elseif(($counter>$currentPage-$offset && $counter<$currentPage+$offset) || $counter==1 || $counter==$totalPages) {
+				if($counter==$totalPages && $currentPage<$totalPages-$offset) {
+					$ret.="... ";
+				}
+				$ret .= @sprintf("<a href='%s'>%d</a> ",$navi->renderURLForPage(($counter-1)*$perPage),$counter);
+				if($counter==1 && $currentPage>1 + $offset) {
+					$ret.="... ";
+				}
+			}
+			$counter++;
+		}
+	
+		//
+		// check next
+		//
+		$next=$current + $perPage;
+		if($navi->hasNextPage()) {
+			$ret.=@sprintf("<a href='%s'>&raquo;</a>",$navi->renderURLForPage($navi->getNextStart()));
+		}
+	}
+
+	print $ret;
+}
+
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6009] CVS update: xoops2jp/html/include
Message-ID: <20061203074454.97A732AC12B@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6010] CVS update:
	xoops2jp/html/modules/legacy/admin/templates/stylesheets
Message-ID: <20061203074454.BD1992AC136@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.8 xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css:1.1.2.8	Tue Nov 14 18:52:18 2006
+++ xoops2jp/html/modules/legacy/admin/templates/stylesheets/module.css	Sun Dec  3 16:44:54 2006
@@ -1,233 +1,233 @@
-/* Action Search */
-.legacy_actionsearch_form {
-	text-align:center;
-	margin:20px;
-}
-ul.legacy_actionsearch_records {
-	margin:5px 10px;
-}
-.legacy_actionsearch_records li , .legacy_actionsearch_records li a , .legacy_actionsearch_records li a:visited {
-	font-weight:bold;
-	padding:3px;
-}
-.legacy_actionsearch_records_desc {
-	font-weight:normal;
-	font-style:italic;
-	color:#666666;
-	padding:2px 10px 5px 10px;
-}
-/* block list */
-.legacy_blocktype_module {
-
-}
-.legacy_blocktype_custom {
-	color:#0000cc;
-}
-.legacy_blockside {
-	width:135px;
-	white-space: nowrap;
-}
-.legacy_blocksideInput{
-	float:left;
-	border:1px solid #333333;
-	padding:1px;
-}
-
-.legacy_blockside_separator {
-	float:left;
-}
-
-/*  block admin for FireFox */
-input[type="radio"] {
-	margin:2px;
-
-}
-/*  block admin for IE7 */
-*+html input[type="radio"] {
-	margin:0;
-}
-
-/* module list */
-.legacy_module_title {
-	font-weight:bold;
-}
-.legacy_module_error {
-	color:#ff0000;
-}
-.legacy_module_warning {
-	color:#0000ff;
-}
-.legacy_module_message {
-
-}
-.legacy_module_return , .legacy_module_return a , .legacy_module_return a:visited {
-	font-weight:bold;
-}
-.legacy_module_versionMsg {
-	color:#0000ff;
-	font-weight:bold;
-}
-
-.legacy_modinfo_notmounted {
-	margin:10px 10px 10px 40px;
-}
- 
-/* comment list */
-.legacy_comment_search {
-	text-align:center;
-	margin:20px;
-}
-
-/* for list table */
-.legacy_list_id {
-	text-align:center;
-}
-.legacy_list_title, .legacy_list_title a, .legacy_list_title a:visited {
-	text-align:left;
-	padding-left:5px;
-	font-weight:bold;
-}
-.legacy_list_imagetitle {
-	text-align:center;
-	font-weight:bold;
-}
-.legacy_list_name {
-	text-align:left;
-	padding-left:5px;
-}
-.legacy_list_text {
-	text-align:left;
-	padding-left:5px;
-}
-.legacy_list_description {
-	text-align:left;
-	padding-left:5px;
-	font-weight:normal;
-}
-.legacy_list_number {
-	text-align:right;
-	padding-right:5px;
-}
-.legacy_list_order {
-	text-align:center;
-}
-.legacy_list_image {
-	text-align:center;
-}
-.legacy_list_select {
-	text-align:center;
-}
-.legacy_list_type {
-	text-align:center;
-}
-.legacy_list_date {
-	text-align:center;
-}
-.legacy_list_control {
-	text-align:center;
-}
-
-/* ===== 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:14px;
-	color:#882200;
-	margin:25px 0 5px 10px;
-	padding:0px 2px 0px 10px;
-	border-left:13px solid #F8B643;
-}
-.help h6 {
-	color:#660000;
-	font-size:13px;
-	margin:20px 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:15px;
-}
-.help ol {
-	margin:2px 2px 2px 20px;
-	padding:2px;
-	list-style:decimal outside;
-}
-.help li {
-	padding:3px 0;
-}
-.help dl {
-	margin: 10px 10px 20px 20px;
-}
-.help dt {
-	margin: 5px 5px 5px 10px;
-	font-weight:bold;
-}
-.help dd {
-	margin: 5px 5px 5px 30px;
-}
-.help .preface {
-	padding-top:80px;
-}
-.help div.remark {
-	font-size:140%;
-	line-height:200%;
-}
-
-.help .highlight_menu_item {
-	font-style:italic;
-}
-.help .highlight_control_menu_item {
-	color:#F8B643;
-	font-weight:bold;
-	text-decoration:underline;
-	padding 1px;
-/* with the arrow :-) */
-/*	padding-left:17px;
-	background:url(<{"design/menulist.gif"|theme}>) no-repeat center left;
-*/
-}
-.help .highlight_module_name {
-	color:#6766A2;
-	font-weight:bold;
-	padding:0 1px;
-	text-decoration:underline;
-/* backgorund color :-) */
-/*	background-color:#6766A2;
-	color:#F8B643;
-*/
-}
-.help .highlight_block_name {
-	color:#008800;
-	font-weight:bold;
-	text-decoration:underline;
-}
-
-.help .new {
-	padding-right:58px;
-	background:url(<{"icons/legacy_help_new.gif"|theme}>) no-repeat center right;
-}
-.help .update {
-	padding-right:58px;
-	background:url(<{"icons/legacy_help_update.gif"|theme}>) no-repeat center right;
-}
+/* Action Search */
+.legacy_actionsearch_form {
+	text-align:center;
+	margin:20px;
+}
+ul.legacy_actionsearch_records {
+	margin:5px 10px;
+}
+.legacy_actionsearch_records li , .legacy_actionsearch_records li a , .legacy_actionsearch_records li a:visited {
+	font-weight:bold;
+	padding:3px;
+}
+.legacy_actionsearch_records_desc {
+	font-weight:normal;
+	font-style:italic;
+	color:#666666;
+	padding:2px 10px 5px 10px;
+}
+/* block list */
+.legacy_blocktype_module {
+
+}
+.legacy_blocktype_custom {
+	color:#0000cc;
+}
+.legacy_blockside {
+	width:135px;
+	white-space: nowrap;
+}
+.legacy_blocksideInput{
+	float:left;
+	border:1px solid #333333;
+	padding:1px;
+}
+
+.legacy_blockside_separator {
+	float:left;
+}
+
+/*  block admin for FireFox */
+input[type="radio"] {
+	margin:2px;
+
+}
+/*  block admin for IE7 */
+*+html input[type="radio"] {
+	margin:0;
+}
+
+/* module list */
+.legacy_module_title {
+	font-weight:bold;
+}
+.legacy_module_error {
+	color:#ff0000;
+}
+.legacy_module_warning {
+	color:#0000ff;
+}
+.legacy_module_message {
+
+}
+.legacy_module_return , .legacy_module_return a , .legacy_module_return a:visited {
+	font-weight:bold;
+}
+.legacy_module_versionMsg {
+	color:#0000ff;
+	font-weight:bold;
+}
+
+.legacy_modinfo_notmounted {
+	margin:10px 10px 10px 40px;
+}
+ 
+/* comment list */
+.legacy_comment_search {
+	text-align:center;
+	margin:20px;
+}
+
+/* for list table */
+.legacy_list_id {
+	text-align:center;
+}
+.legacy_list_title, .legacy_list_title a, .legacy_list_title a:visited {
+	text-align:left;
+	padding-left:5px;
+	font-weight:bold;
+}
+.legacy_list_imagetitle {
+	text-align:center;
+	font-weight:bold;
+}
+.legacy_list_name {
+	text-align:left;
+	padding-left:5px;
+}
+.legacy_list_text {
+	text-align:left;
+	padding-left:5px;
+}
+.legacy_list_description {
+	text-align:left;
+	padding-left:5px;
+	font-weight:normal;
+}
+.legacy_list_number {
+	text-align:right;
+	padding-right:5px;
+}
+.legacy_list_order {
+	text-align:center;
+}
+.legacy_list_image {
+	text-align:center;
+}
+.legacy_list_select {
+	text-align:center;
+}
+.legacy_list_type {
+	text-align:center;
+}
+.legacy_list_date {
+	text-align:center;
+}
+.legacy_list_control {
+	text-align:center;
+}
+
+/* ===== 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:14px;
+	color:#882200;
+	margin:25px 0 5px 10px;
+	padding:0px 2px 0px 10px;
+	border-left:13px solid #F8B643;
+}
+.help h6 {
+	color:#660000;
+	font-size:13px;
+	margin:20px 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:15px;
+}
+.help ol {
+	margin:2px 2px 2px 20px;
+	padding:2px;
+	list-style:decimal outside;
+}
+.help li {
+	padding:3px 0;
+}
+.help dl {
+	margin: 10px 10px 20px 20px;
+}
+.help dt {
+	margin: 5px 5px 5px 10px;
+	font-weight:bold;
+}
+.help dd {
+	margin: 5px 5px 5px 30px;
+}
+.help .preface {
+	padding-top:80px;
+}
+.help div.remark {
+	font-size:140%;
+	line-height:200%;
+}
+
+.help .highlight_menu_item {
+	font-style:italic;
+}
+.help .highlight_control_menu_item {
+	color:#F8B643;
+	font-weight:bold;
+	text-decoration:underline;
+	padding 1px;
+/* with the arrow :-) */
+/*	padding-left:17px;
+	background:url(<{"design/menulist.gif"|theme}>) no-repeat center left;
+*/
+}
+.help .highlight_module_name {
+	color:#6766A2;
+	font-weight:bold;
+	padding:0 1px;
+	text-decoration:underline;
+/* backgorund color :-) */
+/*	background-color:#6766A2;
+	color:#F8B643;
+*/
+}
+.help .highlight_block_name {
+	color:#008800;
+	font-weight:bold;
+	text-decoration:underline;
+}
+
+.help .new {
+	padding-right:58px;
+	background:url(<{"icons/legacy_help_new.gif"|theme}>) no-repeat center right;
+}
+.help .update {
+	padding-right:58px;
+	background:url(<{"icons/legacy_help_update.gif"|theme}>) no-repeat center right;
+}

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:54 +0900
Subject: [xoops-cvslog 6011] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061203074454.E283A2AC12B@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/online.php
diff -u xoops2jp/html/modules/user/class/online.php:1.1.2.1.2.3 xoops2jp/html/modules/user/class/online.php:1.1.2.1.2.4
--- xoops2jp/html/modules/user/class/online.php:1.1.2.1.2.3	Sun Dec  3 13:52:17 2006
+++ xoops2jp/html/modules/user/class/online.php	Sun Dec  3 16:44:54 2006
@@ -1,34 +1,34 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class UserOnlineObject extends XoopsSimpleObject
-{
-	var $mModule = null;
-	
-	function UserOnlineObject()
-	{
-		$this->initVar('online_uid', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('online_uname', XOBJ_DTYPE_STRING, '', true, 25);
-		$this->initVar('online_updated', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('online_module', XOBJ_DTYPE_INT, '0', true);
-		$this->initVar('online_ip', XOBJ_DTYPE_STRING, '', true, 15);
-	}
-	
-	function loadModule()
-	{
-		if ($this->get('online_module')) {
-			$handler =& xoops_gethandler('module');
-			$this->mModule =& $handler->get($this->get('online_module'));
-		}
-	}
-}
-
-class UserOnlineHandler extends XoopsObjectGenericHandler
-{
-	var $mTable = "online";
-	var $mPrimary = "";
-	var $mClass = "UserOnlineObject";
-}
-
-?>
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class UserOnlineObject extends XoopsSimpleObject
+{
+	var $mModule = null;
+	
+	function UserOnlineObject()
+	{
+		$this->initVar('online_uid', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_uname', XOBJ_DTYPE_STRING, '', true, 25);
+		$this->initVar('online_updated', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_module', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('online_ip', XOBJ_DTYPE_STRING, '', true, 15);
+	}
+	
+	function loadModule()
+	{
+		if ($this->get('online_module')) {
+			$handler =& xoops_gethandler('module');
+			$this->mModule =& $handler->get($this->get('online_module'));
+		}
+	}
+}
+
+class UserOnlineHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "online";
+	var $mPrimary = "";
+	var $mClass = "UserOnlineObject";
+}
+
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 16:44:55 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 16:44:55 +0900
Subject: [xoops-cvslog 6012] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20061203074455.12F0B2AC139@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sun Dec  3 23:52:20 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  3 Dec 2006 23:52:20 +0900
Subject: [xoops-cvslog 6013] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061203145220.131622AC13F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.1 xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.1	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php	Sun Dec  3 23:52:19 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.1 2006/12/02 15:36:01 nobunobu Exp $
+ * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.2 2006/12/03 14:52:19 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -14,8 +14,8 @@
         }
     }
     
-    function ToShow($str) {
-        return preg_replace(array("/&amp;/i", "/&nbsp;/i"), array('&', '&amp;nbsp;'), htmlspecialchars($str, ENT_QUOTES));
+    function ToShow($str) {//ToDo: &nbsp; patern is defined for XOOPS2.0 compatiblity. But what is it?
+        return preg_replace(array("/&amp;(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", "/&nbsp;/i"), array('&\\1;', '&amp;nbsp;'), htmlspecialchars($str, ENT_QUOTES));
     }
 
     function ToEdit($str) {

From tom_g3x ＠ users.sourceforge.jp  Thu Dec  7 16:30:36 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  7 Dec 2006 16:30:36 +0900
Subject: [xoops-cvslog 6014] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061207073036.E4DB82AC03E@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.15 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.16
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.15	Mon Nov 20 19:46:23 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Dec  7 16:30:36 2006
@@ -293,7 +293,7 @@
 		//
 		$tplfile =& $tplHandler->create();
 		$tplfile->setVar('tpl_refid', $module->getVar('mid'));
-		$tplfile->setVar('tpl_lastimpoerted', 0);
+		$tplfile->setVar('tpl_lastimported', 0);
 		$tplfile->setVar('tpl_lastmodified', time());
 
 		if (preg_match("/\.css$/i", $fileName)) {
@@ -308,7 +308,7 @@
 		$tplfile->setVar('tpl_tplset', 'default');
 		$tplfile->setVar('tpl_file', $fileName, true);
 
-		$description = isset($tpl['description']) ? $tpl['description'] : '';
+		$description = isset($template['description']) ? $template['description'] : '';
 		$tplfile->setVar('tpl_desc', $description, true);
 		
 		if ($tplHandler->insert($tplfile)) {

From tom_g3x ＠ users.sourceforge.jp  Thu Dec  7 16:31:15 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  7 Dec 2006 16:31:15 +0900
Subject: [xoops-cvslog 6015] CVS update:
	xoops2jp/html/modules/legacy/lib/Mailer
Message-ID: <20061207073115.CBC572AC03E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php
diff -u xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.1 xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.2
--- xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.1	Wed Nov 15 23:56:08 2006
+++ xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php	Thu Dec  7 16:31:15 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Mailer.php,v 1.1.2.1 2006/11/15 14:56:08 minahito Exp $
+ * @version $Id: Mailer.php,v 1.1.2.2 2006/12/07 07:31:15 tom_g3x Exp $
  */
 
 /**
@@ -28,7 +28,7 @@
 		$xoopsMailerConfig =& $handler->getConfigByCat(XOOPS_CONF_MAILER);
 		$this->reset();
 		
-		if ($xoopsMailerConfig['form'] == '') {
+		if ($xoopsMailerConfig['from'] == '') {
 			$this->From = $root->mContext->mXoopsConfig['adminmail'];
 		}
 		else {
@@ -99,7 +99,7 @@
 	
 	function convertLocal($text, $mime = false)
 	{
-		$this->mConvertLocal->call(new XCube_Ref($text), $mine);
+		$this->mConvertLocal->call(new XCube_Ref($text), $mime);
 		return $text;
 	}
 }

From tom_g3x ＠ users.sourceforge.jp  Thu Dec  7 17:13:16 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  7 Dec 2006 17:13:16 +0900
Subject: [xoops-cvslog 6016] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061207081316.D193C2AC0D9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ImageListAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ImageListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ImageListAction.class.php:1.1.2.2	Sun Oct 15 00:54:11 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ImageListAction.class.php	Thu Dec  7 17:13:16 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: ImageListAction.class.php,v 1.1.2.2 2006/10/14 15:54:11 minahito Exp $
+ * @version $Id: ImageListAction.class.php,v 1.1.2.3 2006/12/07 08:13:16 tom_g3x Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -28,7 +28,7 @@
 		return "./index.php?action=ImageList";
 	}
 	
-	function getDefaultView(&$contoller, &$xoopsUser)
+	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$result = parent::getDefaultView($controller, $xoopsUser);
 		if ($result == LEGACY_FRAME_VIEW_INDEX) {

From tom_g3x ＠ users.sourceforge.jp  Thu Dec  7 17:13:17 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu,  7 Dec 2006 17:13:17 +0900
Subject: [xoops-cvslog 6017] CVS update:
	xoops2jp/html/modules/legacy/lib/ShadePlus
Message-ID: <20061207081317.037A02AC157@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.4 xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php:1.1.2.4	Thu Nov  2 20:25:19 2006
+++ xoops2jp/html/modules/legacy/lib/ShadePlus/SoapClient.class.php	Thu Dec  7 17:13:16 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package ShadePlus
- * @varsion $Id: SoapClient.class.php,v 1.1.2.4 2006/11/02 11:25:19 minahito Exp $
+ * @varsion $Id: SoapClient.class.php,v 1.1.2.5 2006/12/07 08:13:16 tom_g3x Exp $
  * 
  * In the original BSD license, both occurrences of the phrase "COPYRIGHT
  * HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
@@ -83,7 +83,7 @@
 	{
 		foreach (array_keys($arr) as $key) {
 			if (is_array($arr[$key])) {
-				$arr[$key] = $this->_decodeUTF8($arr[$Key], $languageManager);
+				$arr[$key] = $this->_decodeUTF8($arr[$key], $languageManager);
 			}
 			else {
 				$arr[$key] = $languageManager->decodeUTF8($arr[$key]);

From tom_g3x ＠ users.sourceforge.jp  Fri Dec  8 01:17:56 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  8 Dec 2006 01:17:56 +0900
Subject: [xoops-cvslog 6018] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061207161756.54B9F2AC1FA@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/handler.php
diff -u xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.3 xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.4
--- xoops2jp/html/modules/legacy/kernel/handler.php:1.1.2.3	Sat Nov 11 18:17:45 2006
+++ xoops2jp/html/modules/legacy/kernel/handler.php	Fri Dec  8 01:17:56 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: handler.php,v 1.1.2.3 2006/11/11 09:17:45 minahito Exp $
+ * @version $Id: handler.php,v 1.1.2.4 2006/12/07 16:17:56 tom_g3x Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -320,8 +320,6 @@
 				else {
 					return null;
 				}
-				
-				return $string;
 			}
 		}
 	}

From tom_g3x ＠ users.sourceforge.jp  Fri Dec  8 13:47:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  8 Dec 2006 13:47:20 +0900
Subject: [xoops-cvslog 6019] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20061208044721.025122AC0B8@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.5 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.6
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.11.2.5	Fri Nov 10 20:30:01 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Fri Dec  8 13:47:20 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.11.2.5 2006/11/10 11:30:01 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.11.2.6 2006/12/08 04:47:20 tom_g3x Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -141,7 +141,7 @@
 		$root =& XCube_Root::getSingleton();
 
 		$moduleRunner = new User_ActionFrame(false);
-		$moduleRunner->setActionName("Lostpass");
+		$moduleRunner->setActionName("LostPass");
 
 		$root->mController->mExecute->add(array(&$moduleRunner, 'execute'));
 

From tom_g3x ＠ users.sourceforge.jp  Fri Dec  8 21:17:28 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri,  8 Dec 2006 21:17:28 +0900
Subject: [xoops-cvslog 6020] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061208121728.6529A2AC213@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.16 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.17
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.16	Thu Dec  7 16:30:36 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Fri Dec  8 21:17:28 2006
@@ -342,7 +342,6 @@
 	 */	
 	function uninstallAllOfModuleTemplates(&$module, &$log, $defaultOnly = true)
 	{
-		$tplHandler =& xoops_gethandler('tplfile');
 
 		//
 		// The following processing depends on the structure of Legacy_RenderSystem.

From nobunobu ＠ users.sourceforge.jp  Fri Dec  8 23:14:01 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  8 Dec 2006 23:14:01 +0900
Subject: [xoops-cvslog 6021] CVS update: xoops2jp/html/modules/legacy/preload
Message-ID: <20061208141401.D1C102AC0AB@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.6 xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php:1.1.2.6	Fri Nov 17 20:21:51 2006
+++ xoops2jp/html/modules/legacy/preload/ThemeSelect.class.php	Fri Dec  8 23:14:01 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: ThemeSelect.class.php,v 1.1.2.6 2006/11/17 11:21:51 minahito Exp $
+ * @version $Id: ThemeSelect.class.php,v 1.1.2.7 2006/12/08 14:14:01 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -44,10 +44,13 @@
 	 */
 	function doChangeTheme(&$principal, &$controller, &$context)
 	{
-		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']);
+		if (!empty($_POST['xoops_theme_select'])) {
+		    $xoops_theme_select = explode('!-!', $_POST['xoops_theme_select']);
+		    if ($this->_isSelectableTheme($xoops_theme_select[0])) {
+    			$this->mRoot->mContext->setThemeName($xoops_theme_select[0]);
+    			$_SESSION['xoopsUserTheme'] = $xoops_theme_select[0];
+    			$controller->executeForward($GLOBALS['xoopsRequestUri']);
+    		}
 		} elseif (!empty($_SESSION['xoopsUserTheme']) && $this->_isSelectableTheme($_SESSION['xoopsUserTheme'])) {
 			$this->mRoot->mContext->setThemeName($_SESSION['xoopsUserTheme']);
 		}

From nobunobu ＠ users.sourceforge.jp  Fri Dec  8 23:17:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  8 Dec 2006 23:17:29 +0900
Subject: [xoops-cvslog 6022] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061208141729.F232F2AC0AB@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.7 xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php:1.1.2.7	Sat Nov 11 02:13:40 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleUninstallAction.class.php	Fri Dec  8 23:17:29 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.7 2006/11/10 17:13:40 nobunobu Exp $
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.8 2006/12/08 14:17:29 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -105,6 +105,7 @@
 		if (!(is_object($this->mXoopsModule) && $this->mXoopsModule->get('isactive') == 0)) {
 			return false;
 		}
+		$this->mXoopsModule->loadInfoAsVar($dirname);
 		
 		$this->_setupActionForm();
 		

From nobunobu ＠ users.sourceforge.jp  Fri Dec  8 23:42:11 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  8 Dec 2006 23:42:11 +0900
Subject: [xoops-cvslog 6023] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061208144211.DD8302AC07E@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.11 xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.12
--- xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php:1.1.2.11	Mon Nov 20 15:20:08 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleUninstaller.class.php	Fri Dec  8 23:42:11 2006
@@ -184,37 +184,37 @@
 			$this->_processReport();
 			return false;
 		}
+		if ($this->_mXoopsModule->get('mid') != null) {
+			$this->_uninstallModule();
+			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->_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();
-		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();
+			if (!$this->_mForceMode && $this->mLog->hasError()) {
+				$this->_processReport();
+				return false;
+			}
 		}
-		
 		$this->_processReport();
 		
 		return true;

From nobunobu ＠ users.sourceforge.jp  Fri Dec  8 23:50:42 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  8 Dec 2006 23:50:42 +0900
Subject: [xoops-cvslog 6024] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20061208145042.447CE2AC0BF@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.6 xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.7
--- xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php:1.1.2.6	Fri Nov 10 15:53:30 2006
+++ xoops2jp/html/modules/legacy/class/Legacy_Utils.class.php	Fri Dec  8 23:50:42 2006
@@ -3,7 +3,7 @@
  * @file
  * @brief Defines the utility function class of Legacy.
  * @package Legacy
- * @version $Id: Legacy_Utils.class.php,v 1.1.2.6 2006/11/10 06:53:30 minahito Exp $
+ * @version $Id: Legacy_Utils.class.php,v 1.1.2.7 2006/12/08 14:50:42 nobunobu Exp $
  */
 
 /**
@@ -122,7 +122,7 @@
 				
 				if (!class_exists($className)) {
 					$retBlock =& new Legacy_BlockProcedureAdapter($block);
-					continue $retBlock;
+					return $retBlock;
 				}
 			}
 				

From nobunobu ＠ users.sourceforge.jp  Sat Dec  9 00:10:58 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  9 Dec 2006 00:10:58 +0900
Subject: [xoops-cvslog 6025] CVS update: xoops2jp/html/modules/legacy/admin
Message-ID: <20061208151058.29BD32AC0AB@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/css.php
diff -u xoops2jp/html/modules/legacy/admin/css.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/css.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/css.php:1.1.2.3	Thu Nov  9 16:29:50 2006
+++ xoops2jp/html/modules/legacy/admin/css.php	Sat Dec  9 00:10:57 2006
@@ -14,13 +14,13 @@
 {
 	$infoArr = Legacy_get_ovveride_file($string, null, true);
 	
-	if ($infoArr['theme'] != null && $infoArr['dirname'] != null) {
+	if (!empty($infoArr['theme']) && !empty($infoArr['dirname'])) {
 		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/modules/" . $infoArr['dirname'] . "/" . $string;
 	}
-	elseif ($infoArr['theme'] != null) {
+	elseif (!empty($infoArr['theme'])) {
 		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/" . $string;
 	}
-	elseif ($infoArr['dirname'] != null) {
+	elseif (!empty($infoArr['dirname'])) {
 		return XOOPS_MODULE_URL . "/" . $infoArr['dirname'] . "/admin/templates/" . $string;
 	}
 	

From nobunobu ＠ users.sourceforge.jp  Sat Dec  9 23:09:46 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  9 Dec 2006 23:09:46 +0900
Subject: [xoops-cvslog 6026] CVS update: xoops2jp/html/include
Message-ID: <20061209140946.66E342AC235@users.sourceforge.jp>

Index: xoops2jp/html/include/xoopscodes.php
diff -u xoops2jp/html/include/xoopscodes.php:1.2.8.1 xoops2jp/html/include/xoopscodes.php:1.2.8.1.2.1
--- xoops2jp/html/include/xoopscodes.php:1.2.8.1	Wed Oct 19 02:20:06 2005
+++ xoops2jp/html/include/xoopscodes.php	Sat Dec  9 23:09:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopscodes.php,v 1.2.8.1 2005/10/18 17:20:06 minahito Exp $
+// $Id: xoopscodes.php,v 1.2.8.1.2.1 2006/12/09 14:09:46 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -81,13 +81,13 @@
 function xoopsSmilies($textarea_id)
 {
     $myts =& MyTextSanitizer::getInstance();
-    $smiles =& $myts->getSmileys();
-    if (empty($smileys)) {
+    $smiles = $myts->getSmileys();
+    if (empty($smiles)) {
         $db =& Database::getInstance();
         if ($result = $db->query('SELECT * FROM '.$db->prefix('smiles').' WHERE display=1')) {
-            while ($smiles = $db->fetchArray($result)) {
+            while ($smile = $db->fetchArray($result)) {
             //hack smilies move for the smilies !!
-                echo "<img src='".XOOPS_UPLOAD_URL."/".htmlspecialchars($smiles['smile_url'])."' border='0' onmouseover='style.cursor=\"hand\"' alt='' onclick='xoopsCodeSmilie(\"".$textarea_id."\", \" ".$smiles['code']." \");' />";
+                echo "<img src='".XOOPS_UPLOAD_URL."/".htmlspecialchars($smile['smile_url'])."' border='0' onmouseover='style.cursor=\"hand\"' alt='' onclick='xoopsCodeSmilie(\"".$textarea_id."\", \" ".$smile['code']." \");' />";
             //fin du hack
             }
         }
@@ -96,7 +96,7 @@
         for ($i = 0; $i < $count; $i++) {
             if ($smiles[$i]['display'] == 1) {
             //hack bis
-                echo "<img src='".XOOPS_UPLOAD_URL."/".$myts->oopsHtmlSpecialChars($smiles['smile_url'])."' border='0' alt='' onclick='xoopsCodeSmilie(\"".$textarea_id."\", \" ".$smiles[$i]['code']." \");' onmouseover='style.cursor=\"hand\"' />";
+                echo "<img src='".XOOPS_UPLOAD_URL."/".htmlspecialchars($smiles[$i]['smile_url'])."' border='0' onmouseover='style.cursor=\"hand\"' alt='' onclick='xoopsCodeSmilie(\"".$textarea_id."\", \" ".$smiles[$i]['code']." \");' />";
             //fin du hack
             }
         }

From nobunobu ＠ users.sourceforge.jp  Sat Dec  9 23:10:34 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  9 Dec 2006 23:10:34 +0900
Subject: [xoops-cvslog 6027] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061209141034.946612AC195@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/MiscSmiliesAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/MiscSmiliesAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/MiscSmiliesAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/MiscSmiliesAction.class.php:1.1.2.2	Sun Oct 15 00:42:33 2006
+++ xoops2jp/html/modules/legacy/actions/MiscSmiliesAction.class.php	Sat Dec  9 23:10:34 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: MiscSmiliesAction.class.php,v 1.1.2.2 2006/10/14 15:42:33 minahito Exp $
+ * @version $Id: MiscSmiliesAction.class.php,v 1.1.2.3 2006/12/09 14:10:34 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -22,7 +22,7 @@
 		return $handler;
 	}
 
-	function &_getFilterForm(&$navi)
+	function &_getFilterForm()
 	{
 		$filter =& new Legacy_SmilesFilterForm($this->_getPageNavi(), $this->_getHandler());
 		return $filter;

From nobunobu ＠ users.sourceforge.jp  Sat Dec  9 23:11:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  9 Dec 2006 23:11:48 +0900
Subject: [xoops-cvslog 6028] CVS update: xoops2jp/html/class
Message-ID: <20061209141148.A3EB52AC195@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.2 xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.3
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.2	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Sat Dec  9 23:11:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.9.2.2 2006/12/02 15:48:30 nobunobu Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.9.2.3 2006/12/09 14:11:48 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -44,50 +44,27 @@
 class MyTextSanitizer
 {
     /**
-     * @var array
-     */
-    var $smileys = array();
-
-    /**
      *
      */
     var $censorConf;
 
 	/**
-	 * @var XCube_Delegate
+	 * @var XCube_TextFilter
 	 */
-	var $mMakeClickablePre = null;
-	
+	var $mTextFilter = null;
+
 	/**
 	 * @var XCube_Delegate
+     * @deprecated
 	 */
 	var $mMakeClickablePostFilter = null;
 	
 	/**
 	 * @var XCube_Delegate
-	 */
-	var $mXoopsCodePre = null;
-	
-	/**
-	 * @var XCube_Delegate
+     * @deprecated
 	 */
 	var $mXoopsCodePostFilter = null;
 	
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mCodePreConvPre = null;
-
-	/**
-	 * @var XCube_Delegate
-	 */
-	var $mCodeConvPre = null;
-
-	/**
-	 * @var XCube_TextFilter
-	 */
-	var $mTextFilter = null;
-
     /*
     * Constructor of this class
     *
@@ -101,24 +78,13 @@
     */
     function MyTextSanitizer()
     {
-		$this->mMakeClickablePre =& new XCube_Delegate();
-		$this->mMakeClickablePre->register('MyTextSanitizer.MakeClickablePre');
 		
 		$this->mMakeClickablePostFilter =& new XCube_Delegate();
 		$this->mMakeClickablePostFilter->register('MyTextSanitizer.MakeClickablePostFilter');
 		
-		$this->mXoopsCodePre =& new XCube_Delegate();
-		$this->mXoopsCodePre->register('MyTextSanitizer.XoopsCodePre');
-		
 		$this->mXoopsCodePostFilter =& new XCube_Delegate();
 		$this->mXoopsCodePostFilter->register('MyTextSanitizer.XoopsCodePostFilter');
 
-		$this->mCodePreConvPre =& new XCube_Delegate();
-		$this->mCodePreConvPre->register('MyTextSanitizer.CodePreConvPre');
-
-		$this->mCodeConvPre =& new XCube_Delegate();
-		$this->mCodeConvPre->register('MyTextSanitizer.CodeConvPre');
-
         $root =& XCube_Root::getSingleton();
         $this->mTextFilter =& $root->getTextFilter();
 
@@ -148,7 +114,7 @@
      */
     function getSmileys()
     {
-        return $this->smileys;
+        return $this->mTextFilter->getSmileys();
     }
 
     /**
@@ -158,23 +124,10 @@
      *
      * @return  string
      */
-    function &smiley($message)
+    function &smiley($text)
     {
-        $db =& Database::getInstance();
-        if (count($this->smileys) == 0) {
-            if ($getsmiles = $db->query("SELECT * FROM ".$db->prefix("smiles"))){
-                while ($smiles = $db->fetchArray($getsmiles)) {
-                    $message = str_replace($smiles['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles['smile_url']).'" alt="" />', $message);
-                    array_push($this->smileys, $smiles);
-                }
-            }
-        }
-        elseif (is_array($this->smileys)) {
-            foreach ($this->smileys as $smile) {
-                $message = str_replace($smile['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
-            }
-        }
-        return $message;
+        $text = $this->mTextFilter->Smiley($text);
+        return $text;
     }
 
     /**
@@ -185,18 +138,7 @@
      **/
     function &makeClickable(&$text)
     {
-        $patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
-        $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
-
-        // RaiseEvent 'MyTextSanitizer.MakeClickablePre'
-        //  Delegate may replace makeClickable conversion table
-        //  Args : 
-        //      'patterns'     [I/O] : &Array of pattern RegExp
-        //      'replacements' [I/O] : &Array of replacing string
-        //
-        $this->mMakeClickablePre->call(new XCube_Ref($patterns), new XCube_Ref($replacements));
-
-        $text = preg_replace($patterns, $replacements, $text);
+        $text = $this->mTextFilter->MakeClickable($text);
 
         // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
@@ -204,7 +146,6 @@
         //      'string'       [I/O] : Text to convert;
         //
         $this->mMakeClickablePostFilter->call(new XCube_Ref($text));
-
         return $text;
     }
 
@@ -218,74 +159,7 @@
      **/
     function &xoopsCodeDecode(&$text, $allowimage = 1)
     {
-        $imgCallbackPattern = "/\[img( align=\w+)]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $text = preg_replace_callback($imgCallbackPattern, array($this, '_filterImgUrl'), $text);
-
-        $patterns = array();
-        $replacements = array();
-        // RMV: added new markup for intrasite url (allows easier site moves)
-        // TODO: automatically convert other URLs to this format if XOOPS_URL matches??
-        $patterns[] = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
-        $replacements[] = '<a href="'.XOOPS_URL.'/\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[url=(['\"]?)([^\"'<>]*)\\1](.*)\[\/url\]/sU";
-        $replacements[] = '<a href="http://\\2" target="_blank">\\3</a>';
-        $patterns[] = "/\[color=(['\"]?)([a-zA-Z0-9]*)\\1](.*)\[\/color\]/sU";
-        $replacements[] = '<span style="color: #\\2;">\\3</span>';
-        $patterns[] = "/\[size=(['\"]?)([a-z0-9-]*)\\1](.*)\[\/size\]/sU";
-        $replacements[] = '<span style="font-size: \\2;">\\3</span>';
-        $patterns[] = "/\[font=(['\"]?)([^;<>\*\(\)\"']*)\\1](.*)\[\/font\]/sU";
-        $replacements[] = '<span style="font-family: \\2;">\\3</span>';
-        $patterns[] = "/\[email]([^;<>\*\(\)\"']*)\[\/email\]/sU";
-        $replacements[] = '<a href="mailto:\\1">\\1</a>';
-        $patterns[] = "/\[b](.*)\[\/b\]/sU";
-        $replacements[] = '<b>\\1</b>';
-        $patterns[] = "/\[i](.*)\[\/i\]/sU";
-        $replacements[] = '<i>\\1</i>';
-        $patterns[] = "/\[u](.*)\[\/u\]/sU";
-        $replacements[] = '<u>\\1</u>';
-        $patterns[] = "/\[d](.*)\[\/d\]/sU";
-        $replacements[] = '<del>\\1</del>';
-        //$patterns[] = "/\[li](.*)\[\/li\]/sU";
-        //$replacements[] = '<li>\\1</li>';
-        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 id=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        $patterns[] = "/\[img id=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
-        if ($allowimage != 1) {
-            $replacements[] = '<a href="\\3" target="_blank">\\3</a>';
-            $replacements[] = '<a href="\\1" target="_blank">\\1</a>';
-            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\4" target="_blank">\\5</a>';
-            $replacements[] = '<a href="'.XOOPS_URL.'/image.php?id=\\2" target="_blank">\\3</a>';
-        } else {
-            $replacements[] = '<img src="\\3" align="\\2" alt="" />';
-            $replacements[] = '<img src="\\1" alt="" />';
-            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\4" align="\\2" alt="\\5" />';
-            $replacements[] = '<img src="'.XOOPS_URL.'/image.php?id=\\2" alt="\\3" />';
-        }
-        $patterns[] = "/\[quote]/sU";
-        $replacements[] = _QUOTEC.'<div class="xoopsQuote"><blockquote>';
-        //$replacements[] = 'Quote: <div class="xoopsQuote"><blockquote>';
-        $patterns[] = "/\[\/quote]/sU";
-        $replacements[] = '</blockquote></div>';
-        $patterns[] = "/javascript:/si";
-        $replacements[] = "java script:";
-        $patterns[] = "/about:/si";
-        $replacements[] = "about :";
-
-        // RaiseEvent 'MyTextSanitizer.XoopsCodePre'
-        //  Delegate may replace conversion table
-        //  Args : 
-        //      'patterns'     [I/O] : &Array of pattern RegExp
-        //      'replacements' [I/O] : &Array of replacing string
-        //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
-        //
-        $this->mXoopsCodePre->call(new XCube_Ref($patterns), new XCube_Ref($replacements), $allowimage);
-        
-        $text = preg_replace($patterns, $replacements, $text);
+        $text = $this->mTextFilter->ConvertXCode($text, $allowimage);
         
         // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
@@ -294,42 +168,10 @@
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
         $this->mXoopsCodePostFilter->call(new XCube_Ref($text), $allowimage);
-
         return $text;
     }
 
     /**
-     * Filters out invalid strings included in URL, if any
-     *
-     * @param   array  $matches
-     * @return  string
-     */
-    function _filterImgUrl($matches)
-    {
-        if ($this->checkUrlString($matches[2])) {
-            return $matches[0];
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Checks if invalid strings are included in URL
-     *
-     * @param   string  $text
-     * @return  bool
-     */
-    function checkUrlString($text)
-    {
-        // Check control code
-        if (preg_match("/[\\0-\\31]/", $text)) {
-            return false;
-        }
-        // check black pattern(deprecated)
-        return !preg_match("/^(javascript|vbscript|about):/i", $text);
-    }
-
-    /**
      * Convert linebreaks to <br /> tags
      *
      * @param   string  $text
@@ -338,7 +180,7 @@
      */
     function &nl2Br($text)
     {
-        $ret = preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        $ret = $this->mTextFilter->Nl2Br($text);
         return $ret;
     }
 
@@ -381,7 +223,7 @@
     function &htmlSpecialChars($text, $forEdit=false)
     {
         if (!$forEdit) {
-            $ret = $this->mTextFilter->ToShow($text);
+            $ret = $this->mTextFilter->ToShow($text, true);
         } else {
             $ret = $this->mTextFilter->ToEdit($text);
         }
@@ -414,30 +256,7 @@
      **/
     function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
-        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        if ($html != 1) {
-            // html not allowed
-            $text = $this->mTextFilter->ToShow($text);
-        }
-        $text =& $this->makeClickable($text);
-        if ($smiley != 0) {
-            // process smiley
-            $text =& $this->smiley($text);
-        }
-        if ($xcode != 0) {
-            // decode xcode
-            if ($image != 0) {
-                // image allowed
-                $text =& $this->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                        $text =& $this->xoopsCodeDecode($text, 0);
-            }
-        }
-        if ($br != 0) {
-            $text =& $this->nl2Br($text);
-        }
-        $text = $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $this->mTextFilter->ToShowTarea($text, $html, $smiley, $xcode, $image, $br, true);
         return $text;
     }
 
@@ -455,30 +274,7 @@
     function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
         $text =& $this->stripSlashesGPC($text);
-        $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        if ($html != 1) {
-            // html not allowed
-            $text = $this->mTextFilter->ToShow($text);
-        }
-        $text =& $this->makeClickable($text);
-        if ($smiley != 0) {
-            // process smiley
-            $text =& $this->smiley($text);
-        }
-        if ($xcode != 0) {
-            // decode xcode
-            if ($image != 0) {
-                // image allowed
-                $text =& $this->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                $text =& $this->xoopsCodeDecode($text, 0);
-            }
-        }
-        if ($br != 0) {
-            $text =& $this->nl2Br($text);
-        }
-        $text = $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $this->mTextFilter->ToShowTarea($text, $html, $smiley, $xcode, $image, $br, true);
         return $text;
     }
 
@@ -522,69 +318,18 @@
      */
     function codePreConv($text, $xcode = 1) {
         if($xcode != 0){
-            $patterns = array();
-            $replacements = array();
-            $patterns[] = "/\[code](.*)\[\/code\]/esU";
-            $replacements[] = "'[code]'.base64_encode('$1').'[/code]'";
-            // RaiseEvent 'MyTextSanitizer.CodePreConvePre'
-            //  Delegate may replace conversion table
-            //  Args : 
-            //      'patterns'     [I/O] : &Array of pattern RegExp
-            //      'replacements' [I/O] : &Array of replacing string
-            //
-            $this->mCodePreConvPre->call(new XCube_Ref($patterns), new XCube_Ref($replacements));
-            $text =  preg_replace($patterns, $replacements, $text);
+            $text = $this->mTextFilter->PreConvertXCode($text, $xcode);
         }
         return $text;
     }
 
     function codeConv($text, $xcode = 1, $image = 1){
         if($xcode != 0){
-            $patterns = array();
-            $replacements = array();
-            // RaiseEvent 'MyTextSanitizer.CodeConvPre'
-            //  Delegate may replace conversion table
-            //  Args : 
-            //      'patterns'     [I/O] : &Array of pattern RegExp
-            //      'replacements' [I/O] : &Array of replacing string
-            //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
-            //  Caution :
-            //     - Conversion table order should be reverse order with codePreConv conversion table.
-            //       So, conversion rule for[code] is defined after call delegate function.
-            //     - Conversion rule should treat input string as raw text(not sanitized).
-            //
-            $this->mCodeConvPre->call(new XCube_Ref($patterns), new XCube_Ref($replacements), $image);
-
-            $patterns[] = "/\[code](.*)\[\/code\]/esU";
-            if ($image != 0) {
-                // image allowed
-                $replacements[] = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
-            } else {
-                // image not allowed
-                $replacements[] = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
-            }
-
-            $text =  preg_replace($patterns, $replacements, $text);
+            $text = $this->mTextFilter->PostConvertXCode($text, $xcode);
         }
         return $text;
     }
 
-    function codeSanitizer($str, $image = 1){
-        if($image != 0){
-            $str = $this->xoopsCodeDecode(
-                  htmlspecialchars(str_replace('\"', '"', base64_decode($str)),ENT_QUOTES)
-                );
-        }else{
-            $str = $this->xoopsCodeDecode(
-                htmlspecialchars(str_replace('\"', '"', base64_decode($str)),ENT_QUOTES),0
-                );
-        }
-        return $str;
-    }
-
-    /**#@-*/
-
-
 ##################### Deprecated Methods ######################
 
     /**#@+
@@ -592,54 +337,25 @@
      */
     function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
-        if ( $allowhtml == 0 ) {
-            $text = $this->mTextFilter->ToShow($text);
-        } else {
-            //$config =& $GLOBALS['xoopsConfig'];
-            //$allowed = $config['allowed_html'];
-            //$text = strip_tags($text, $allowed);
-            $text = $this->makeClickable($text);
-        }
-        if ( $smiley == 1 ) {
-            $text = $this->smiley($text);
-        }
-        if ( $bbcode == 1 ) {
-            $text = $this->xoopsCodeDecode($text);
-        }
-        $text = $this->nl2Br($text);
+        $text = $this->mTextFilter->ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1, true);
         return $text;
     }
 
     function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
         $text = $this->oopsStripSlashesGPC($text);
-        if ( $allowhtml == 0 ) {
-            $text = $this->mTextFilter->ToShow($text);
-        } else {
-            //$config =& $GLOBALS['xoopsConfig'];
-            //$allowed = $config['allowed_html'];
-            //$text = strip_tags($text, $allowed);
-            $text = $this->makeClickable($text);
-        }
-        if ( $smiley == 1 ) {
-            $text = $this->smiley($text);
-        }
-        if ( $bbcode == 1 ) {
-            $text = $this->xoopsCodeDecode($text);
-        }
-        $text = $this->nl2Br($text);
+        $text = $this->mTextFilter->ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1, true);
         return $text;
     }
 
     function makeTboxData4Save($text)
     {
-        //$text = $this->undoHtmlSpecialChars($text);
         return $this->addSlashes($text);
     }
 
     function makeTboxData4Show($text, $smiley=0)
     {
-        $text = $this->mTextFilter->ToShow($text);
+        $text = $this->mTextFilter->ToShow($text, true);
         return $text;
     }
 
@@ -651,14 +367,14 @@
     function makeTboxData4Preview($text, $smiley=0)
     {
         $text = $this->stripSlashesGPC($text);
-        $text = $this->mTextFilter->ToShow($text);
+        $text = $this->mTextFilter->ToShow($text, true);
         return $text;
     }
 
     function makeTboxData4PreviewInForm($text)
     {
         $text = $this->stripSlashesGPC($text);
-        return $this->mTextFilter->ToShow($text);
+        return $this->mTextFilter->ToEdit($text);
     }
 
     function makeTareaData4Save($text)
@@ -687,12 +403,12 @@
     {
         //if magic_quotes_gpc is on, do stipslashes
         $text = $this->stripSlashesGPC($text);
-        return $this->mTextFilter->ToShow($text);
+        return $this->mTextFilter->ToEdit($text);
     }
 
     function makeTareaData4InsideQuotes($text)
     {
-        return $this->mTextFilter->ToShow($text);
+        return $this->mTextFilter->ToShow($text, true);
     }
 
     function &oopsStripSlashesGPC($text)
@@ -717,7 +433,7 @@
 
     function &oopsHtmlSpecialChars($text)
     {
-        $ret = $this->mTextFilter->ToShow($text);
+        $ret = $this->mTextFilter->ToShow($text, true);
         return $ret;
     }
 

From nobunobu ＠ users.sourceforge.jp  Sat Dec  9 23:11:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  9 Dec 2006 23:11:48 +0900
Subject: [xoops-cvslog 6029] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061209141148.CB9482AC245@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.2 xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.2	Sun Dec  3 23:52:19 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php	Sat Dec  9 23:11:48 2006
@@ -1,25 +1,438 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.2 2006/12/03 14:52:19 nobunobu Exp $
+ * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.3 2006/12/09 14:11:48 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 class Legacy_TextFilter extends XCube_TextFilter
 {
+    /**
+     * @var XCube_Delegate
+     */
+    var $mMakeXCodeConvertTable = null;
+    /**
+     * @var XCube_Delegate
+     */
+    var $mMakeXCodeCheckImgPatterns = null;
+    /**
+     * @var XCube_Delegate
+     */
+    var $mMakeClickableConvertTable = null;
+    /**
+     * @var XCube_Delegate
+     */
+    var $mMakePreXCodeConvertTable = null;
+    /**
+     * @var XCube_Delegate
+     */
+    var $mMakePostXCodeConvertTable = null;
+    /**
+     * @var XCube_Delegate
+     * @deprecated  keep compatible with XC2.1 Beta3
+     */
+    var $mXCodePre = null;
+    /**
+     * @var XCube_Delegate
+     * @deprecated  keep compatible with XC2.1 Beta3
+     */
+    var $mMakeClickablePre = null;
+
+
+    var $mClickablePatterns = array();
+    var $mClickableReplacements = array();
+
+    var $mXCodePatterns = array();
+    var $mXCodeReplacements = array();
+    var $mXCodeCheckImgPatterns = array();
+
+    var $mPreXCodePatterns = array();
+    var $mPreXCodeReplacements = array();
+
+    var $mPostXCodePatterns = array();
+    var $mPostXCodeReplacements = array();
+    
+    var $mSmileys = array();
+    var $mSmileysConvTable = array();
+
+    function Legacy_TextFilter() {
+        $this->mMakeClickableConvertTable =& new XCube_Delegate;
+        $this->mMakeClickableConvertTable->register('Legacy_TextFilter.MakeClickableConvertTable');
+        $this->mMakeClickableConvertTable->add('Legacy_TextFilter::MakeClickableConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+
+        $this->mMakeXCodeConvertTable =& new XCube_Delegate;
+        $this->mMakeXCodeConvertTable->register('Legacy_TextFilter.MakeXCodeConvertTable');
+        $this->mMakeXCodeConvertTable->add('Legacy_TextFilter::MakeXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+
+        $this->mMakeXCodeCheckImgPatterns =& new XCube_Delegate;
+        $this->mMakeXCodeCheckImgPatterns->register('Legacy_TextFilter.MakeXCodeCheckImgPatterns');
+        $this->mMakeXCodeCheckImgPatterns->add('Legacy_TextFilter::MakeXCodeCheckImgPatterns', XCUBE_DELEGATE_PRIORITY_FIRST);
+
+        $this->mMakePreXCodeConvertTable =& new XCube_Delegate;
+        $this->mMakePreXCodeConvertTable->register('Legacy_TextFilter.MakePreXCodeConvertTable');
+        $this->mMakePreXCodeConvertTable->add('Legacy_TextFilter::MakePreXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+
+        $this->mMakePostXCodeConvertTable =& new XCube_Delegate;
+        $this->mMakePostXCodeConvertTable->register('Legacy_TextFilter.MakePostXCodeConvertTable');
+        $this->mMakePostXCodeConvertTable->add('Legacy_TextFilter::MakePostXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FINAL);
+
+        //@deprecated
+        //Todo: For keeping compatible with XC2.1 Beta3
+        $this->mMakeClickablePre =& new XCube_Delegate();
+        $this->mMakeClickablePre->register('MyTextSanitizer.MakeClickablePre');
+
+        $this->mXCodePre =& new XCube_Delegate();
+        $this->mXCodePre->register('MyTextSanitizer.XoopsCodePre');
+    }
+    
     function getInstance(&$instance) {
         if (empty($instance)) {
             $instance = new Legacy_TextFilter();
         }
     }
     
-    function ToShow($str) {//ToDo: &nbsp; patern is defined for XOOPS2.0 compatiblity. But what is it?
-        return preg_replace(array("/&amp;(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", "/&nbsp;/i"), array('&\\1;', '&amp;nbsp;'), htmlspecialchars($str, ENT_QUOTES));
+    /**
+     * Filters for editing text
+     *
+     * @param   string  $text
+     * @param   string  $x2comat
+     * @return  string
+     *
+     **/
+    function ToShow($text, $x2comat=false) {
+        if ($x2comat) {
+            //ToDo: &nbsp; patern is defined for XOOPS2.0 compatiblity. But what is it?
+            //      This comatiblity option is used from method from MyTextSanitizer.
+            //
+            return preg_replace(array("/&amp;(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", "/&nbsp;/i"), array('&\\1;', '&amp;nbsp;'), htmlspecialchars($text, ENT_QUOTES));
+        } else {
+            return preg_replace("/&amp;(#[0-9]+|#x[0-9a-f]+|[a-z]+[0-9]*);/i", '&\\1;', htmlspecialchars($text, ENT_QUOTES));
+        }
+    }
+
+    /**
+     * Filters for editing text
+     *
+     * @param   string  $text
+     * @param   string  $x2comat
+     * @return  string
+     *
+     **/
+    function ToEdit($text) {
+        return preg_replace("/&amp;(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($text, ENT_QUOTES));
+    }
+
+    /**
+     * Filters textarea data for display
+     *
+     * @param   string  $text
+     * @param   bool    $html   allow html?
+     * @param   bool    $smiley allow smileys?
+     * @param   bool    $xcode  allow xoopscode?
+     * @param   bool    $image  allow inline images?
+     * @param   bool    $br     convert linebreaks?
+     * @return  string
+     **/
+    function ToShowTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1, $x2comat=false) {
+        $text = $this->PreConvertXCode($text, $xcode);
+        if ($html != 1) $text = $this->ToShow($text, $x2comat);
+        $text = $this->MakeClickable($text);
+        if ($smiley != 0) $text = $this->Smiley($text);
+        if ($xcode != 0) $text = $this->ConvertXCode($text, $image);
+        if ($br != 0) $text = $this->Nl2Br($text);
+        $text = $this->PostConvertXCode($text, $xcode, $image);
+        return $text;
+    }
+
+    /**
+     * Get the smileys
+     *
+     * @return  array
+     */
+    function getSmileys() {
+        if (count($this->mSmileys) == 0) {
+            $this->mSmileysConvTable[0] = $this->mSmileysConvTable[1] = array();
+            $db =& Database::getInstance();
+            if ($getsmiles = $db->query("SELECT * FROM ".$db->prefix("smiles"))){
+                while ($smile = $db->fetchArray($getsmiles)) {
+                    $this->mSmileys[] = $smile;
+                    $this->mSmileysConvTable[0][] = $smile['code'];
+                    $this->mSmileysConvTable[1][] = '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />';
+                }
+            }
+        }
+        return $this->mSmileys;
+    }
+
+    /**
+     * Replace emoticons in the message with smiley images
+     *
+     * @param   string  $message
+     *
+     * @return  string
+     */
+    function &Smiley($text) {
+        if (count($this->mSmileys) == 0) $this->getSmileys();
+        if (count($this->mSmileys) != 0) {
+            $text = str_replace($this->mSmileysConvTable[0], $this->mSmileysConvTable[1], $text);
+        }
+        return $text;
+    }
+
+    /**
+     * Make links in the text clickable
+     *
+     * @param   string  $text
+     * @return  string
+     **/
+    function MakeClickable($text) {
+        if (empty($this->mClickablePatterns)) {
+            // Delegate Call 'Legacy_TextFilter.MakeClickableConvertTable'
+            //  Delegate may replace makeClickable conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //
+            $this->mMakeClickableConvertTable->call(new XCube_Ref($this->mClickablePatterns), new XCube_Ref($this->mClickableReplacements));
+
+            // Delegate Call 'MyTextSanitizer.MakeClickablePre'
+            //  Delegate may replace makeClickable conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //
+            //  Todo: For Compatiblitiy to XC2.1 Beta3
+            //
+            $this->mMakeClickablePre->call(new XCube_Ref($this->mClickablePatterns), new XCube_Ref($this->mClickableReplacements));
+        }
+        $text = preg_replace($this->mClickablePatterns, $this->mClickableReplacements, $text);
+        return $text;
+    }
+
+    function MakeClickableConvertTable(&$patterns, &$replacements) {
+        $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i";
+        $replacements[] = "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>";
+        $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i";
+        $replacements[] = "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>";
+        $patterns[] = "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i";
+        $replacements[] = "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>";
+        $patterns[] = "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i";
+        $replacements[] = "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>";
+    }
+
+    /**
+     * Replace XoopsCodes with their equivalent HTML formatting
+     *
+     * @param   string  $text
+     * @param   bool    $allowimage Allow images in the text?
+     *                              On FALSE, uses links to images.
+     * @return  string
+     **/
+    function ConvertXCode($text, $allowimage = 1) {
+        if (empty($this->mXCodePatterns)) {
+            // Delegate Call 'Legacy_TextFilter.MakeXCodeConvertTable'
+            //  Delegate may replace makeClickable conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array[0..1] of Array of replacing string
+            //                             replacements[0] for $allowimage = 0;
+            //                             replacements[1] for $allowimage = 1;
+            //
+            $this->mMakeXCodeConvertTable->call(new XCube_Ref($this->mXCodePatterns), new XCube_Ref($this->mXCodeReplacements));
+
+            // RaiseEvent 'MyTextSanitizer.XoopsCodePre'
+            //  Delegate may replace conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
+            //
+            //Todo: For Compatiblitiy to XC2.1 Beta3
+            $this->mXCodePre->call(new XCube_Ref($this->mXCodePatterns), new XCube_Ref($this->mXCodeReplacements[0]), 0);
+            $dummy = array();
+            $this->mXCodePre->call(new XCube_Ref($dummy), new XCube_Ref($this->mXCodeReplacements[1]), 1);
+        }
+        if (empty($this->mXCodeCheckImgPatterns)) {
+            // RaiseEvent 'Legacy_TextFilter.MakeXCodeCheckImgPatterns'
+            //  Delegate may replace conversion table
+            //  Args : 
+            //      'patterns'     [I/O] : &Array of pattern RegExp
+            //      'replacements' [I/O] : &Array of replacing string
+            //
+            $this->mMakeXCodeCheckImgPatterns->call(new XCube_Ref($this->mXCodeCheckImgPatterns));
+        }
+        $text = preg_replace_callback($this->mXCodeCheckImgPatterns, array($this, '_filterImgUrl'), $text);
+        $replacementsIdx = ($allowimage == 0) ? 0 : 1;
+        $text = preg_replace($this->mXCodePatterns, $this->mXCodeReplacements[$replacementsIdx], $text);
+        return $text;
+    }
+    
+    function MakeXCodeCheckImgPatterns(&$patterns) {
+        $patterns[] = "/\[img( align=\w+)]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+    }
+
+    function MakeXCodeConvertTable(&$patterns, &$replacements) {
+        $patterns[] = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
+        $replacements[0][] = $replacements[1][] = '<a href="'.XOOPS_URL.'/\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[0][] = $replacements[1][] = '<a href="\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[0][] = $replacements[1][] = '<a href="\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[url=(['\"]?)([^\"'<>]*)\\1](.*)\[\/url\]/sU";
+        $replacements[0][] = $replacements[1][] = '<a href="http://\\2" target="_blank">\\3</a>';
+        $patterns[] = "/\[color=(['\"]?)([a-zA-Z0-9]*)\\1](.*)\[\/color\]/sU";
+        $replacements[0][] = $replacements[1][] = '<span style="color: #\\2;">\\3</span>';
+        $patterns[] = "/\[size=(['\"]?)([a-z0-9-]*)\\1](.*)\[\/size\]/sU";
+        $replacements[0][] = $replacements[1][] = '<span style="font-size: \\2;">\\3</span>';
+        $patterns[] = "/\[font=(['\"]?)([^;<>\*\(\)\"']*)\\1](.*)\[\/font\]/sU";
+        $replacements[0][] = $replacements[1][] = '<span style="font-family: \\2;">\\3</span>';
+        $patterns[] = "/\[email]([^;<>\*\(\)\"']*)\[\/email\]/sU";
+        $replacements[0][] = $replacements[1][] = '<a href="mailto:\\1">\\1</a>';
+        $patterns[] = "/\[b](.*)\[\/b\]/sU";
+        $replacements[0][] = $replacements[1][] = '<b>\\1</b>';
+        $patterns[] = "/\[i](.*)\[\/i\]/sU";
+        $replacements[0][] = $replacements[1][] = '<i>\\1</i>';
+        $patterns[] = "/\[u](.*)\[\/u\]/sU";
+        $replacements[0][] = $replacements[1][] = '<u>\\1</u>';
+        $patterns[] = "/\[d](.*)\[\/d\]/sU";
+        $replacements[0][] = $replacements[1][] = '<del>\\1</del>';
+        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $replacements[0][] = '<a href="\\3" target="_blank">\\3</a>';
+        $replacements[1][] = '<img src="\\3" align="\\2" alt="" />';
+        $patterns[] = "/\[img]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $replacements[0][] = '<a href="\\1" target="_blank">\\1</a>';
+        $replacements[1][] = '<img src="\\1" alt="" />';
+        $patterns[] = "/\[img align=(['\"]?)(left|center|right)\\1 id=(['\"]?)([0-9]*)\\3]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $replacements[0][] = '<a href="'.XOOPS_URL.'/image.php?id=\\4" target="_blank">\\5</a>';
+        $replacements[1][] = '<img src="'.XOOPS_URL.'/image.php?id=\\4" align="\\2" alt="\\5" />';
+        $patterns[] = "/\[img id=(['\"]?)([0-9]*)\\1]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
+        $replacements[0][] = '<a href="'.XOOPS_URL.'/image.php?id=\\2" target="_blank">\\3</a>';
+        $replacements[1][] = '<img src="'.XOOPS_URL.'/image.php?id=\\2" alt="\\3" />';
+        $patterns[] = "/\[quote]/sU";
+        $replacements[0][] = $replacements[1][] = _QUOTEC.'<div class="xoopsQuote"><blockquote>';
+        $patterns[] = "/\[\/quote]/sU";
+        $replacements[0][] = $replacements[1][] = '</blockquote></div>';
+        $patterns[] = "/javascript:/si";
+        $replacements[0][] = $replacements[1][] = "java script:";
+        $patterns[] = "/about:/si";
+        $replacements[0][] = $replacements[1][] = "about :";
+    }
+
+    /**
+     * Filters out invalid strings included in URL, if any
+     *
+     * @param   array  $matches
+     * @return  string
+     */
+    function _filterImgUrl($matches)
+    {
+        if ($this->_checkUrlString($matches[2])) {
+            return $matches[0];
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Checks if invalid strings are included in URL
+     *
+     * @param   string  $text
+     * @return  bool
+     */
+    function _checkUrlString($text)
+    {
+        // Check control code
+        if (preg_match("/[\\0-\\31]/", $text)) {
+            return false;
+        }
+        // check black pattern(deprecated)
+        return !preg_match("/^(javascript|vbscript|about):/i", $text);
+    }
+
+    /**
+     * Convert linebreaks to <br /> tags
+     *
+     * @param   string  $text
+     *
+     * @return  string
+     */
+    function Nl2Br($text)
+    {
+        return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+    }
+
+    /**
+     * Pre XCode Converting
+     *   By default, keep content within [code][/code] tags
+     *
+     * @param   string  $text
+     * @param   string  $xcode
+     *
+     * @return  string
+     */
+    function PreConvertXCode($text, $xcode = 1) {
+        if($xcode != 0){
+            if (empty($this->mPreXCodePatterns)) {
+                // RaiseEvent 'Legacy_TextFilter.MakePreXCodeConvertTable'
+                //  Delegate may replace conversion table
+                //  Args : 
+                //      'patterns'     [I/O] : &Array of pattern RegExp
+                //      'replacements' [I/O] : &Array of replacing string
+                //
+                $this->mMakePreXCodeConvertTable->call(new XCube_Ref($this->mPreXCodePatterns), new XCube_Ref($this->mPreXCodeReplacements));
+            }
+            $text =  preg_replace($this->mPreXCodePatterns, $this->mPreXCodeReplacements, $text);
+        }
+        return $text;
+    }
+    
+    function MakePreXCodeConvertTable(&$patterns, &$replacements) {
+        $patterns[] = "/\[code](.*)\[\/code\]/esU";
+        $replacements[] = "'[code]'.base64_encode('$1').'[/code]'";
+    }
+
+    /**
+     * Post XCode Convering
+     *   By default, convert content about [code][/code] tags
+     *
+     * @param   string  $text
+     * @param   string  $xcode
+     * @param   string  $image
+     *
+     * @return  string
+     */
+    function PostConvertXCode($text, $xcode=1, $image=1){
+        if($xcode != 0){
+            if (empty($this->mPostXCodePatterns)) {
+                // RaiseEvent 'Legacy_TextFilter.MakePostXCodeConvertTable'
+                //  Delegate may replace conversion table
+                //  Args : 
+                //      'patterns'     [I/O] : &Array of pattern RegExp
+                //      'replacements' [I/O] : &Array[0..1] of Array of replacing string
+                //                             replacements[0] for $allowimage = 0;
+                //                             replacements[1] for $allowimage = 1;
+                //  Caution :
+                //     - Conversion table order should be reverse order with codePreConv conversion table.
+                //       So, conversion rule for[code] is defined after call delegate function.
+                //     - Conversion rule should treat input string as raw text with single quote escape.(not sanitized).
+                //
+                $this->mMakePostXCodeConvertTable->call(new XCube_Ref($this->mPostXCodePatterns), new XCube_Ref($this->mPostXCodeReplacements));
+            }
+            $replacementsIdx = ($image == 0) ? 0 : 1;
+            $text =  preg_replace($this->mPostXCodePatterns, $this->mPostXCodeReplacements[$replacementsIdx], $text);
+        }
+        return $text;
+    }
+
+    function MakePostXCodeConvertTable(&$patterns, &$replacements) {
+        $patterns[] = "/\[code](.*)\[\/code\]/esU";
+        $replacements[0][] = "'<div class=\"xoopsCode\"><pre><code>'.Legacy_TextFilter::codeSanitizer('$1').'</code></pre></div>'";
+        $replacements[1][] = "'<div class=\"xoopsCode\"><pre><code>'.Legacy_TextFilter::codeSanitizer('$1', 1).'</code></pre></div>'"; 
     }
 
-    function ToEdit($str) {
-        return preg_replace("/&amp;(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($str, ENT_QUOTES));
+    function codeSanitizer($text, $image = 1){
+        return $this->ConvertXCode(htmlspecialchars(str_replace('\"', '"', base64_decode($text)),ENT_QUOTES), $image);
     }
 }
 ?>

From nobunobu ＠ users.sourceforge.jp  Sun Dec 10 22:34:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 10 Dec 2006 22:34:48 +0900
Subject: [xoops-cvslog 6030] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20061210133448.3DEF32AC14C@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.7 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.7	Sat Nov 25 19:01:22 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Sun Dec 10 22:34:48 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.7 2006/11/25 10:01:22 minahito Exp $
+ * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.8 2006/12/10 13:34:48 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) die();
@@ -178,7 +178,7 @@
 	
 	function getName()
 	{
-		return $this->_mBlock->get('title');
+		return $this->_mBlock->get('name');
 	}
 	
 	function isEnableCache()

From nobunobu ＠ users.sourceforge.jp  Sun Dec 10 22:45:38 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 10 Dec 2006 22:45:38 +0900
Subject: [xoops-cvslog 6031] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061210134538.3782C2AC28C@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.5 xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php:1.1.2.5	Thu Nov 16 19:10:25 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallInformation.class.php	Sun Dec 10 22:45:38 2006
@@ -2,7 +2,7 @@
 /**
  * @package Legacy
  * @brief This file declare some structure-class and stored-system readers for the installer.
- * @version $Id: ModuleInstallInformation.class.php,v 1.1.2.5 2006/11/16 10:10:25 minahito Exp $
+ * @version $Id: ModuleInstallInformation.class.php,v 1.1.2.6 2006/12/10 13:45:38 nobunobu Exp $
  */
 
 define('LEGACY_INSTALLINFO_STATUS_LOADED', "loaded");
@@ -522,7 +522,7 @@
 		$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);
+		$info =& new Legacy_BlockInformation($funcNum, $arr['name'], $arr['file'], $showFunc, $editFunc, $template, $options);
 		
 		return $info;
 	}

From nobunobu ＠ users.sourceforge.jp  Sun Dec 10 22:55:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 10 Dec 2006 22:55:47 +0900
Subject: [xoops-cvslog 6032] CVS update:
	xoops2jp/html/modules/legacy/lib/Mailer
Message-ID: <20061210135547.450562AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php
diff -u xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.2 xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.3
--- xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php:1.1.2.2	Thu Dec  7 16:31:15 2006
+++ xoops2jp/html/modules/legacy/lib/Mailer/Mailer.php	Sun Dec 10 22:55:47 2006
@@ -1,13 +1,13 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Mailer.php,v 1.1.2.2 2006/12/07 07:31:15 tom_g3x Exp $
+ * @version $Id: Mailer.php,v 1.1.2.3 2006/12/10 13:55:47 nobunobu Exp $
  */
 
 /**
  * This is an exmine class for mail.
  */
-class Legacy_Mailer extends phpmailer
+class Legacy_Mailer extends PHPMailer
 {
 	/**
 	 * @type XCube_Delegate

From nobunobu ＠ users.sourceforge.jp  Tue Dec 12 23:40:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 12 Dec 2006 23:40:44 +0900
Subject: [xoops-cvslog 6033] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061212144044.140B12AC549@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.4 xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php:1.1.2.4	Fri Nov 17 19:40:50 2006
+++ xoops2jp/html/modules/legacy/admin/actions/PreferenceEditAction.class.php	Tue Dec 12 23:40:43 2006
@@ -90,66 +90,92 @@
 		$render->setAttribute('category', $this->mCategory);
 		$render->setAttribute('module', $this->mModule);
 		
-		$handler =& xoops_gethandler('timezone');
-		$timezoneArr =& $handler->getObjects();
-		$render->setAttribute('timezoneArr', $timezoneArr);
-		
-		$handler =& xoops_gethandler('group');
-		$groupArr =& $handler->getObjects();
-		$render->setAttribute('groupArr', $groupArr);
+        $formtypeArr = array();
+        foreach ($this->mObjects as $object) {
+            $formtypeArr[] = $object->get('conf_formtype');
+        }
+        $formtypeArr = array_unique($formtypeArr);
+        
+		//
+		// Make the array of timezone object
+		//
+        if (in_array('timezone', $formtypeArr)) {
+    		$handler =& xoops_gethandler('timezone');
+    		$timezoneArr =& $handler->getObjects();
+    		$render->setAttribute('timezoneArr', $timezoneArr);
+        }
+        
+		//
+		// Make the array of group object
+		//
+        if (in_array('group', $formtypeArr)||in_array('group_multi', $formtypeArr)) {
+    		$handler =& xoops_gethandler('group');
+    		$groupArr =& $handler->getObjects();
+    		$render->setAttribute('groupArr', $groupArr);
+        }
 
 		//
 		// Make the array of tplset object
 		//
-		$handler =& xoops_gethandler('tplset');
-		$tplsetArr =& $handler->getObjects();
-		$render->setAttribute('tplsetArr', $tplsetArr);
-		
+        if (in_array('tplset', $formtypeArr)) {
+    		$handler =& xoops_gethandler('tplset');
+    		$tplsetArr =& $handler->getObjects();
+    		$render->setAttribute('tplsetArr', $tplsetArr);
+        }
+        
 		//
 		// Make the list of installed languages.
 		//
-		$languageArr = array();
-		$dirHandler = opendir(XOOPS_ROOT_PATH . "/language/");
-		while ($file = readdir($dirHandler)) {
-			if (is_dir(XOOPS_ROOT_PATH . "/language/" . $file) && preg_match("/^[a-z_]+$/", $file)) {
-				$languageArr[$file] = $file;
-			}
-		}
-		closedir($dirHandler);
-		$render->setAttribute('languageArr', $languageArr);
-		
+        if (in_array('language', $formtypeArr)) {
+    		$languageArr = array();
+    		$dirHandler = opendir(XOOPS_ROOT_PATH . "/language/");
+    		while ($file = readdir($dirHandler)) {
+    			if (is_dir(XOOPS_ROOT_PATH . "/language/" . $file) && preg_match("/^[a-z_]+$/", $file)) {
+    				$languageArr[$file] = $file;
+    			}
+    		}
+    		closedir($dirHandler);
+    		$render->setAttribute('languageArr', $languageArr);
+        }
 		
 		//
 		// Make the array of module object for selecting startpage.
 		//
-		$handler =& xoops_gethandler('module');
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('hasmain', 1));
-		$criteria->add(new Criteria('isactive', 1));
-		$moduleArr = $handler->getObjects($criteria);
-		$render->setAttribute('moduleArr', $moduleArr);
-		
+        if (in_array('startpage', $formtypeArr)||in_array('module_cache', $formtypeArr)) {
+    		$handler =& xoops_gethandler('module');
+    		$criteria =& new CriteriaCompo();
+    		$criteria->add(new Criteria('hasmain', 1));
+    		$criteria->add(new Criteria('isactive', 1));
+    		$moduleArr = $handler->getObjects($criteria);
+    		$render->setAttribute('moduleArr', $moduleArr);
+        }
 		
 		//
 		// Make the list of theme.
 		//
-		$handler =& xoops_getmodulehandler('theme');
-		$themeArr =& $handler->getObjects();
-		$render->setAttribute('themeArr', $themeArr);
-		
+        if (in_array('theme', $formtypeArr)||in_array('theme_multi', $formtypeArr)) {
+    		$handler =& xoops_getmodulehandler('theme');
+    		$themeArr =& $handler->getObjects();
+    		$render->setAttribute('themeArr', $themeArr);
+        }
+        
 		//
 		// Make the array of cachetime.
 		//
-		$handler =& xoops_gethandler('cachetime');
-		$cachetimeArr = $handler->getObjects();
-		$render->setAttribute('cachetimeArr', $cachetimeArr);
-		
+        if (in_array('module_cache', $formtypeArr)) {
+    		$handler =& xoops_gethandler('cachetime');
+    		$cachetimeArr = $handler->getObjects();
+    		$render->setAttribute('cachetimeArr', $cachetimeArr);
+        }
+
 		//
 		// Make the list of user
 		//
-		$handler =& xoops_gethandler('member');
-		$userArr = $handler->getUserList();
-		$render->setAttribute('userArr', $userArr);
+        if (in_array('user', $formtypeArr)||in_array('user_multi', $formtypeArr)) {
+    		$handler =& xoops_gethandler('member');
+    		$userArr = $handler->getUserList();
+    		$render->setAttribute('userArr', $userArr);
+        }
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)

From nobunobu ＠ users.sourceforge.jp  Thu Dec 14 07:53:28 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 14 Dec 2006 07:53:28 +0900
Subject: [xoops-cvslog 6034] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061213225328.75BD22AC223@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.3 xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html:1.1.2.3	Mon Nov 27 15:00:26 2006
+++ xoops2jp/html/modules/legacy/admin/templates/customblock_delete.html	Thu Dec 14 07:53:28 2006
@@ -59,7 +59,7 @@
       <{if $object->getShow('visible') == 1}>
         <{$smarty.const._YES}>
       <{else}>
-        <{$smarty.const._YES}>
+        <{$smarty.const._NO}>
       <{/if}>
     </td>
     </tr>
@@ -74,11 +74,10 @@
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACY_LANG_ISACTIVE}></td>
     <td class="<{cycle values="odd,even"}>">
-    <td class="<{cycle values="odd,even"}>">
       <{if $object->getShow('isactive') == 1}>
         <{$smarty.const._YES}>
       <{else}>
-        <{$smarty.const._YES}>
+        <{$smarty.const._NO}>
       <{/if}>
     </td>
   </tr>

From nobunobu ＠ users.sourceforge.jp  Thu Dec 14 21:59:53 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 14 Dec 2006 21:59:53 +0900
Subject: [xoops-cvslog 6035] CVS update:
	xoops2jp/html/modules/legacy/preload/Primary
Message-ID: <20061214125953.C24202AC03F@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.7 xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.8
--- xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php:1.1.2.7	Tue Nov 21 00:54:44 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SiteClose.class.php	Thu Dec 14 21:59:53 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: SiteClose.class.php,v 1.1.2.7 2006/11/20 15:54:44 minahito Exp $
+ * @version $Id: SiteClose.class.php,v 1.1.2.8 2006/12/14 12:59:53 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -13,7 +13,7 @@
 {
 	function preBlockFilter()
 	{
-		if (($this->mRoot->mContext->getXoopsConfig('closesite') == 1) || is_array(Legacy_Utils::checkSystemModules())) {
+		if ($this->mRoot->mContext->getXoopsConfig('closesite') == 1) {
 			$this->mController->mSetupUser->add("Legacy_SiteClose::callbackSetupUser", XCUBE_DELEGATE_PRIORITY_FINAL);
 			$this->mRoot->mDelegateManager->add("Site.CheckLogin.Success", array(&$this, "callbackCheckLoginSuccess"));
 		}
@@ -27,15 +27,10 @@
 	 */
 	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)) {
@@ -46,140 +41,6 @@
 				}
 			}
 		}
-		
-		// @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_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);
-							if (in_array($module, $retArray['uninstalled'])) {
-								$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
-								
-								$handler =& xoops_gethandler('module');
-								$xoopsModule =& $handler->create();
-								$xoopsModule->set('weight', 1);
-								$xoopsModule->loadInfoAsVar($module);
-								
-								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
-								$installer->setForceMode(true);
-								$installer->setCurrentXoopsModule($xoopsModule);
-								$installer->executeInstall();
-							}
-						}
-					}
-					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', 'legacy');
-						$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)) {
-								$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
-								
-								$handler =& xoops_gethandler('module');
-								$xoopsModule =& $handler->create();
-								$xoopsModule->set('weight', 1);
-								$xoopsModule->loadInfoAsVar($module);
-								
-								$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
-								$installer->setForceMode(true);
-								$installer->setCurrentXoopsModule($xoopsModule);
-								$installer->executeInstall();
-							}
-						}
-					}
-					$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/legacy/templates/legacy_uninstall_modules.html');
-					exit();
-				}
-				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');
-								
-						$handler =& xoops_gethandler('module');
-						$xoopsModule =& $handler->getByDirname($module);
-						
-						$uninstaller =& Legacy_ModuleInstallUtils::createUninstaller($xoopsModule->get('dirname'));
-						$uninstaller->setForceMode(true);
-						$uninstaller->setCurrentXoopsModule($xoopsModule);
-						$uninstaller->executeUninstall();
-					}
-					$controller->executeRedirect(XOOPS_URL . '/',1);
-				}
-				else {
-					$handler =& xoops_getmodulehandler('non_installation_module','legacy');
-					$objects = $handler->getObjectsFor2ndInstaller();
-					$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/legacy/templates/legacy_install_modules.html');
-					exit();
-				}
-		   } else {
-				$accessAllowFlag = false;
-		   }
-		}
 
 		if (!$accessAllowFlag) {
 			require_once XOOPS_ROOT_PATH . '/class/template.php';
Index: xoops2jp/html/modules/legacy/preload/Primary/SystemModuleInstall.class.php
diff -u /dev/null xoops2jp/html/modules/legacy/preload/Primary/SystemModuleInstall.class.php:1.1.2.1
--- /dev/null	Thu Dec 14 21:59:53 2006
+++ xoops2jp/html/modules/legacy/preload/Primary/SystemModuleInstall.class.php	Thu Dec 14 21:59:53 2006
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: SystemModuleInstall.class.php,v 1.1.2.1 2006/12/14 12:59:53 nobunobu Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * The action filter for the site close procedure.
+ */
+class Legacy_SystemModuleInstall extends XCube_ActionFilter
+{
+	function preBlockFilter()
+	{
+		if (is_array(Legacy_Utils::checkSystemModules())) {
+			$this->mController->mSetupUser->add("Legacy_SystemModuleInstall::callbackSetupUser", XCUBE_DELEGATE_PRIORITY_FINAL-1);
+			$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'])) {
+			define('XOOPS_CPFUNC_LOADED', 1);
+			$controller->checkLogin();
+			return;
+		} elseif (is_object($context->mXoopsUser)) {
+		    if (in_array(XOOPS_GROUP_ADMIN, $context->mXoopsUser->getGroups())) {
+				$accessAllowFlag = true;
+			}
+		}
+		
+		// @todo Devide following lines to another preload file
+		if ($accessAllowFlag) {
+			$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);
+						if (in_array($module, $retArray['uninstalled'])) {
+							$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
+							
+							$handler =& xoops_gethandler('module');
+							$xoopsModule =& $handler->create();
+							$xoopsModule->set('weight', 1);
+							$xoopsModule->loadInfoAsVar($module);
+							
+							$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
+							$installer->setForceMode(true);
+							$installer->setCurrentXoopsModule($xoopsModule);
+							$installer->executeInstall();
+						}
+					}
+				}
+				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', 'legacy');
+					$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)) {
+							$controller->mRoot->mLanguageManager->loadModuleAdminMessageCatalog('legacy');
+							
+							$handler =& xoops_gethandler('module');
+							$xoopsModule =& $handler->create();
+							$xoopsModule->set('weight', 1);
+							$xoopsModule->loadInfoAsVar($module);
+							
+							$installer =& Legacy_ModuleInstallUtils::createInstaller($xoopsModule->get('dirname'));
+							$installer->setForceMode(true);
+							$installer->setCurrentXoopsModule($xoopsModule);
+							$installer->executeInstall();
+						}
+					}
+				}
+				$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/legacy/templates/legacy_uninstall_modules.html');
+				exit();
+			}
+			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');
+							
+					$handler =& xoops_gethandler('module');
+					$xoopsModule =& $handler->getByDirname($module);
+					
+					$uninstaller =& Legacy_ModuleInstallUtils::createUninstaller($xoopsModule->get('dirname'));
+					$uninstaller->setForceMode(true);
+					$uninstaller->setCurrentXoopsModule($xoopsModule);
+					$uninstaller->executeUninstall();
+				}
+				$controller->executeRedirect(XOOPS_URL . '/',1);
+			}
+			else {
+				$handler =& xoops_getmodulehandler('non_installation_module','legacy');
+				$objects = $handler->getObjectsFor2ndInstaller();
+				$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/legacy/templates/legacy_install_modules.html');
+				exit();
+			}
+		}
+
+		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/legacy/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;
+		}
+	    if (!in_array(XOOPS_GROUP_ADMIN,$xoopsUser->getGroups())) {echo "aaaa";
+			$this->mController->redirectHeader(XOOPS_URL . '/', 1, _NOPERM);
+		}
+	}
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Thu Dec 14 21:59:53 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 14 Dec 2006 21:59:53 +0900
Subject: [xoops-cvslog 6036] CVS update: xoops2jp/html/settings
Message-ID: <20061214125953.E9A692AC0A1@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.4 xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.5
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.4	Sun Oct 15 01:51:19 2006
+++ xoops2jp/html/settings/site_default.ini.php	Thu Dec 14 21:59:53 2006
@@ -26,10 +26,11 @@
 
 [Legacy.PrimaryPreloads]
 protectorLE_Filter=/modules/legacy/preload/protectorLE/protectorLE.class.php
+Legacy_SystemModuleInstall=/modules/legacy/preload/Primary/SystemModuleInstall.class.php
 Legacy_SiteClose=/modules/legacy/preload/Primary/SiteClose.class.php
 User_PrimaryFilter=/modules/user/preload/Primary/Primary.class.php
 Legacy_NuSoapLoader=/modules/legacy/preload/Primary/NuSoapLoader.class.php
-
+Legacy_SystemModuleInstall=/modules/legacy/preload/Primary/SystemModuleInstall.class.php
 #            #
 # components #
 #            #

From nobunobu ＠ users.sourceforge.jp  Thu Dec 14 22:02:50 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 14 Dec 2006 22:02:50 +0900
Subject: [xoops-cvslog 6037] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20061214130250.052AA2AC0A1@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.5	Sun Dec  3 00:50:20 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_edit.html	Thu Dec 14 22:02:49 2006
@@ -24,6 +24,12 @@
       <th colspan="2"><{$smarty.const._AD_LEGACY_LANG_BLOCK_EDIT}></th>
     </tr>
     <tr>
+      <td class="head"><{$smarty.const._AD_LEGACY_LANG_NAME}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{$object->get('name')|xoops_escape}>
+      </td>
+    </tr>
+    <tr>
       <td class="head"><{$smarty.const._AD_LEGACY_LANG_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 17:50:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 17:50:25 +0900
Subject: [xoops-cvslog 6038] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061216085025.4DA512AC0A2@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.17 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.18
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.17	Fri Dec  8 21:17:28 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Sat Dec 16 17:50:25 2006
@@ -209,9 +209,7 @@
 				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);
-						}
+							$log->addError($db->error());
 						return;
 					}
 					else {

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 20:44:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 20:44:56 +0900
Subject: [xoops-cvslog 6039] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061216114456.5DA3F2AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/ImageListAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/ImageListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/ImageListAction.class.php:1.1.2.2	Sun Oct 15 00:40:24 2006
+++ xoops2jp/html/modules/legacy/actions/ImageListAction.class.php	Sat Dec 16 20:44:56 2006
@@ -62,7 +62,7 @@
 		$handler =& xoops_getmodulehandler('imagecategory', 'legacy');
 		
 		if (is_object($xoopsUser)) {
-			$groups =& $xoopsUser->getGroups();
+			$groups = $xoopsUser->getGroups();
 		}
 		else {
 			$groups = array(XOOPS_GROUP_ANONYMOUS);
Index: xoops2jp/html/modules/legacy/actions/ImageUploadAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/ImageUploadAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/ImageUploadAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/ImageUploadAction.class.php:1.1.2.2	Sun Oct 15 00:40:47 2006
+++ xoops2jp/html/modules/legacy/actions/ImageUploadAction.class.php	Sat Dec 16 20:44:56 2006
@@ -41,7 +41,7 @@
 	{
 		$groups = array();
 		if (is_object($xoopsUser)) {
-			$groups =& $xoopsUser->getGroups();
+			$groups = $xoopsUser->getGroups();
 		}
 		else {
 			$groups = array(XOOPS_GROUP_ANONYMOUS);

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 20:44:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 20:44:56 +0900
Subject: [xoops-cvslog 6040] CVS update: xoops2jp/html/modules/legacy/forms
Message-ID: <20061216114456.7E1F52AC085@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/forms/ImageUploadForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/ImageUploadForm.class.php:1.1.2.3 xoops2jp/html/modules/legacy/forms/ImageUploadForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/forms/ImageUploadForm.class.php:1.1.2.3	Sun Oct 15 02:23:47 2006
+++ xoops2jp/html/modules/legacy/forms/ImageUploadForm.class.php	Sat Dec 16 20:44:56 2006
@@ -38,8 +38,8 @@
 		
 		$this->mFieldProperties['imgcat_id'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['imgcat_id']->setDependsByArray(array('required','objectExist'));
-		$this->mFieldProperties['imgcat_id']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _AD_LEGACY_LANG_IMGCAT_ID);
-		$this->mFieldProperties['imgcat_id']->addMessage('objectExist', _AD_LEGACY_ERROR_OBJECTEXIST, _AD_LEGACY_LANG_IMGCAT_ID);
+		$this->mFieldProperties['imgcat_id']->addMessage('required', _MD_LEGACY_ERROR_REQUIRED, _MD_LEGACY_LANG_IMGCAT_ID);
+		$this->mFieldProperties['imgcat_id']->addMessage('objectExist', _MD_LEGACY_ERROR_OBJECTEXIST, _MD_LEGACY_LANG_IMGCAT_ID);
 		$this->mFieldProperties['imgcat_id']->addVar('handler', 'imagecategory');
 		$this->mFieldProperties['imgcat_id']->addVar('module', 'legacy');
 	}

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 20:44:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 20:44:56 +0900
Subject: [xoops-cvslog 6041] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061216114456.9D5E52AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/main.php
diff -u xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.2 xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.3
--- xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.2	Sun Oct 15 01:41:42 2006
+++ xoops2jp/html/modules/legacy/language/english/main.php	Sat Dec 16 20:44:56 2006
@@ -5,6 +5,7 @@
 define('_MD_LEGACY_ERROR_INCORRECTLOGIN', "Invalid Login!");
 define('_MD_LEGACY_ERROR_MASK', "{0} format is invalid.");
 define('_MD_LEGACY_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_MD_LEGACY_ERROR_OBJECTEXIST', "Incorrect input on {0}.");
 define('_MD_LEGACY_ERROR_PERMISSION', "Permission denied");
 define('_MD_LEGACY_ERROR_REQUIRED', "{0} is required.");
 define('_MD_LEGACY_ERROR_SEARCH_NOT_ENABLED', "The search isn't enabled.");
@@ -39,6 +40,7 @@
 define('_MD_LEGACY_LANG_IMAGE_NICENAME', "Image nicename");
 define('_MD_LEGACY_LANG_IMAGE_POSITION', "Image position");
 define('_MD_LEGACY_LANG_IMAGE_UPLOAD', "Image upload");
+define('_AD_LEGACY_LANG_IMGCAT_ID', "Cat. id");
 define('_MD_LEGACY_LANG_MID', "mid");
 define('_MD_LEGACY_LANG_OPTION', "Option");
 define('_MD_LEGACY_LANG_POST', "Post");

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 20:44:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 20:44:56 +0900
Subject: [xoops-cvslog 6042] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061216114456.BEBF02AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/main.php
diff -u xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.2 xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.3
--- xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.2	Sun Oct 15 01:42:05 2006
+++ xoops2jp/html/modules/legacy/language/japanese/main.php	Sat Dec 16 20:44:56 2006
@@ -5,6 +5,7 @@
 define('_MD_LEGACY_ERROR_INCORRECTLOGIN', "ログイン情報が間違っています。");
 define('_MD_LEGACY_ERROR_MASK', "{0}は入力フォーマットに反しています");
 define('_MD_LEGACY_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_MD_LEGACY_ERROR_OBJECTEXIST', "{0}の値が不正です");
 define('_MD_LEGACY_ERROR_PERMISSION', "パーミッションエラー");
 define('_MD_LEGACY_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_MD_LEGACY_ERROR_SEARCH_NOT_ENABLED', "検索が無効です");
@@ -33,6 +34,7 @@
 define('_MD_LEGACY_LANG_ERROR', "エラー");
 define('_MD_LEGACY_LANG_FMAIL', "友達のEmail");
 define('_MD_LEGACY_LANG_FNAME', "友達の名前");
+define('_MD_LEGACY_LANG_IMGCAT_ID', "カテゴリID");
 define('_MD_LEGACY_LANG_IMAGE', "イメージ");
 define('_MD_LEGACY_LANG_IMAGE_FILE', "イメージファイル");
 define('_MD_LEGACY_LANG_IMAGE_MIMETYPE', "MIMEタイプ");

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:29 +0900
Subject: [xoops-cvslog 6043] CVS update: xoops2jp/html
Message-ID: <20061216141029.6735B2AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/admin.php
diff -u xoops2jp/html/admin.php:1.2.8.6 xoops2jp/html/admin.php:1.2.8.6.2.1
--- xoops2jp/html/admin.php:1.2.8.6	Sun Aug 20 11:03:20 2006
+++ xoops2jp/html/admin.php	Sat Dec 16 23:10:29 2006
@@ -1,6 +1,19 @@
 <?php
-// $Id: admin.php,v 1.2.8.6 2006/08/20 02:03:20 minahito Exp $
+/**
+ *
+ * @package Legacy
+ * @version $Id: admin.php,v 1.2.8.6.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
+
 include "mainfile.php";
+
 class DefaultSystemCheckFunction
 {
 	function DefaultCheck()
Index: xoops2jp/html/backend.php
diff -u xoops2jp/html/backend.php:1.2.8.3 xoops2jp/html/backend.php:1.2.8.3.2.1
--- xoops2jp/html/backend.php:1.2.8.3	Mon Jul 31 18:45:43 2006
+++ xoops2jp/html/backend.php	Sat Dec 16 23:10:29 2006
@@ -1,19 +1,19 @@
 <?php
 /**
- * This file was full scratched in XOOPS Cube Legacy project.
- * 
+ *
  * @package Legacy
- * @version $Id: backend.php,v 1.2.8.3 2006/07/31 09:45:43 minahito Exp $
+ * @version $Id: backend.php,v 1.2.8.3.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "./mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
-//
-// This is old page controller in Xoops 2.0.x
-// Raise event "Legacypage.Backend.Access"
-//
-$root=&XCube_Root::getSingleton();
 XCube_DelegateUtils::call("Legacypage.Backend.Access");
-
 ?>
\ No newline at end of file
Index: xoops2jp/html/edituser.php
diff -u xoops2jp/html/edituser.php:1.2.8.5.2.1 xoops2jp/html/edituser.php:1.2.8.5.2.2
--- xoops2jp/html/edituser.php:1.2.8.5.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/edituser.php	Sat Dec 16 23:10:29 2006
@@ -1,32 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: edituser.php,v 1.2.8.5.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
 XCube_DelegateUtils::call("Legacypage.Edituser.Access");
-
 ?>
Index: xoops2jp/html/footer.php
diff -u xoops2jp/html/footer.php:1.2.8.5 xoops2jp/html/footer.php:1.2.8.5.2.1
--- xoops2jp/html/footer.php:1.2.8.5	Wed Nov 16 01:40:10 2005
+++ xoops2jp/html/footer.php	Sat Dec 16 23:10:29 2006
@@ -1,53 +1,31 @@
 <?php
-// $Id: footer.php,v 1.2.8.5 2005/11/15 16:40:10 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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: footer.php,v 1.2.8.5.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
-if (!defined('XOOPS_ROOT_PATH'))
-    exit();
-
-if(defined('XOOPS_FOOTER_INCLUDED'))
-	exit();
+if (!defined('XOOPS_ROOT_PATH'))  exit();
+if (defined('XOOPS_FOOTER_INCLUDED')) exit();
 
 $root=&XCube_Root::getSingleton();
-if(!is_object($root->mController))
-	exit();
+if (!is_object($root->mController)) exit();
+
+define('XOOPS_FOOTER_INCLUDED',1);
 
-define("XOOPS_FOOTER_INCLUDED",1);
 $xoopsLogger=&$root->mController->getLogger();
 $xoopsLogger->stopTime();
 
 // RMV-NOTIFY
 require_once XOOPS_ROOT_PATH.'/include/notification_select.php';
 
-
-// Content Assign
-
-
 // Display view
 $root->mController->executeView();
-
-
 ?>
Index: xoops2jp/html/header.php
diff -u xoops2jp/html/header.php:1.2.8.4 xoops2jp/html/header.php:1.2.8.4.2.1
--- xoops2jp/html/header.php:1.2.8.4	Wed Nov 16 01:40:00 2005
+++ xoops2jp/html/header.php	Sat Dec 16 23:10:29 2006
@@ -1,41 +1,21 @@
 <?php
-// $Id: header.php,v 1.2.8.4 2005/11/15 16:40:00 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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: header.php,v 1.2.8.4.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
-//--------------------------------------------
-// Prohibition of a direct kick
-//--------------------------------------------
-if (!defined('XOOPS_ROOT_PATH'))
-    exit();
+if (!defined('XOOPS_ROOT_PATH')) exit();
 
 $root=&XCube_Root::getSingleton();
-
-if(!is_object($root->mController))
-	exit();
+if(!is_object($root->mController)) exit();
 
 $root->mController->executeHeader();
-
 ?>
Index: xoops2jp/html/image.php
diff -u xoops2jp/html/image.php:1.2.8.2.2.1 xoops2jp/html/image.php:1.2.8.2.2.2
--- xoops2jp/html/image.php:1.2.8.2.2.1	Thu Nov  9 12:45:07 2006
+++ xoops2jp/html/image.php	Sat Dec 16 23:10:29 2006
@@ -1,7 +1,5 @@
 <?php
-
-
-// $Id: image.php,v 1.2.8.2.2.1 2006/11/09 03:45:07 nobunobu Exp $
+// $Id: image.php,v 1.2.8.2.2.2 2006/12/16 14:10:29 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
Index: xoops2jp/html/imagemanager.php
diff -u xoops2jp/html/imagemanager.php:1.2.8.4 xoops2jp/html/imagemanager.php:1.2.8.4.2.1
--- xoops2jp/html/imagemanager.php:1.2.8.4	Thu Jul 27 18:37:56 2006
+++ xoops2jp/html/imagemanager.php	Sat Dec 16 23:10:29 2006
@@ -1,11 +1,16 @@
 <?php
 /**
- * This file was full scratched in XOOPS Cube Legacy project.
- * 
+ *
  * @package Legacy
- * @version $Id: imagemanager.php,v 1.2.8.4 2006/07/27 09:37:56 minahito Exp $
+ * @version $Id: imagemanager.php,v 1.2.8.4.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
-
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 require_once "mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
Index: xoops2jp/html/index.php
diff -u xoops2jp/html/index.php:1.2.8.3 xoops2jp/html/index.php:1.2.8.3.2.1
--- xoops2jp/html/index.php:1.2.8.3	Mon Jul 31 18:45:51 2006
+++ xoops2jp/html/index.php	Sat Dec 16 23:10:29 2006
@@ -1,16 +1,17 @@
 <?php
 /**
+ *
  * @package Legacy
- * @version $Id: index.php,v 1.2.8.3 2006/07/31 09:45:51 minahito Exp $
+ * @version $Id: index.php,v 1.2.8.3.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
-
 require_once "./mainfile.php";
 require_once "./header.php";
 
-$root=&XCube_Root::getSingleton();
-
 $xoopsOption['show_cblock'] = 1;
 XCube_DelegateUtils::call("Legacypage.Top.Access");
 
 require_once "./footer.php";
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/lostpass.php
diff -u xoops2jp/html/lostpass.php:1.2.8.3.2.1 xoops2jp/html/lostpass.php:1.2.8.3.2.2
--- xoops2jp/html/lostpass.php:1.2.8.3.2.1	Sat Nov 18 21:59:51 2006
+++ xoops2jp/html/lostpass.php	Sat Dec 16 23:10:29 2006
@@ -1,34 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: lostpass.php,v 1.2.8.3.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-
 XCube_DelegateUtils::call("Legacypage.Lostpass.Access");
-
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/misc.php
diff -u xoops2jp/html/misc.php:1.2.8.5 xoops2jp/html/misc.php:1.2.8.5.2.1
--- xoops2jp/html/misc.php:1.2.8.5	Thu Jul 27 18:38:10 2006
+++ xoops2jp/html/misc.php	Sat Dec 16 23:10:29 2006
@@ -1,10 +1,16 @@
 <?php
 /**
- * This file was full scratched in XOOPS Cube Legacy project.
- * 
+ *
  * @package Legacy
- * @version $Id: misc.php,v 1.2.8.5 2006/07/27 09:38:10 minahito Exp $
+ * @version $Id: misc.php,v 1.2.8.5.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
Index: xoops2jp/html/notifications.php
diff -u xoops2jp/html/notifications.php:1.2.8.2 xoops2jp/html/notifications.php:1.2.8.2.2.1
--- xoops2jp/html/notifications.php:1.2.8.2	Wed Jul 26 19:49:31 2006
+++ xoops2jp/html/notifications.php	Sat Dec 16 23:10:29 2006
@@ -1,11 +1,19 @@
 <?php
 /**
- * @version $Id: notifications.php,v 1.2.8.2 2006/07/26 10:49:31 minahito Exp $
+ *
+ * @package Legacy
+ * @version $Id: notifications.php,v 1.2.8.2.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
 XCube_DelegateUtils::call('Legacypage.Notifications.Access');
-
 ?>
Index: xoops2jp/html/pmlite.php
diff -u xoops2jp/html/pmlite.php:1.2.8.4.2.1 xoops2jp/html/pmlite.php:1.2.8.4.2.2
--- xoops2jp/html/pmlite.php:1.2.8.4.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/pmlite.php	Sat Dec 16 23:10:29 2006
@@ -1,36 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: pmlite.php,v 1.2.8.4.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
-//
-// This is old page controller in Xoops 2.0.x
-// Raise event "Legacypage.Pmlite.Access"
-//
 XCube_DelegateUtils::call("Legacypage.Pmlite.Access");
-
 ?>
\ No newline at end of file
Index: xoops2jp/html/readpmsg.php
diff -u xoops2jp/html/readpmsg.php:1.2.8.2.2.1 xoops2jp/html/readpmsg.php:1.2.8.2.2.2
--- xoops2jp/html/readpmsg.php:1.2.8.2.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/readpmsg.php	Sat Dec 16 23:10:29 2006
@@ -1,32 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: readpmsg.php,v 1.2.8.2.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
 XCube_DelegateUtils::call("Legacypage.Readpmsg.Access");
-
 ?>
\ No newline at end of file
Index: xoops2jp/html/register.php
diff -u xoops2jp/html/register.php:1.2.8.3.2.1 xoops2jp/html/register.php:1.2.8.3.2.2
--- xoops2jp/html/register.php:1.2.8.3.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/register.php	Sat Dec 16 23:10:29 2006
@@ -1,32 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: register.php,v 1.2.8.3.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
 XCube_DelegateUtils::call("Legacypage.Register.Access");
-
 ?>
Index: xoops2jp/html/search.php
diff -u xoops2jp/html/search.php:1.2.8.3 xoops2jp/html/search.php:1.2.8.3.2.1
--- xoops2jp/html/search.php:1.2.8.3	Thu Jul 27 18:38:19 2006
+++ xoops2jp/html/search.php	Sat Dec 16 23:10:29 2006
@@ -1,17 +1,19 @@
 <?php
 /**
- * This file was full scratched in XOOPS Cube Legacy project.
- * 
- * @version $Id: search.php,v 1.2.8.3 2006/07/27 09:38:19 minahito Exp $
+ *
+ * @package Legacy
+ * @version $Id: search.php,v 1.2.8.3.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
-//
-// This is old page controller in Xoops 2.0.x
-// Raise event "Legacypage.Search.Access"
-//
 XCube_DelegateUtils::call('Legacypage.Search.Access');
-
 ?>
\ No newline at end of file
Index: xoops2jp/html/user.php
diff -u xoops2jp/html/user.php:1.2.8.6 xoops2jp/html/user.php:1.2.8.6.2.1
--- xoops2jp/html/user.php:1.2.8.6	Wed Jul 19 19:25:14 2006
+++ xoops2jp/html/user.php	Sat Dec 16 23:10:29 2006
@@ -1,34 +1,18 @@
 <?php
-// $Id: user.php,v 1.2.8.6 2006/07/19 10:25:14 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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: user.php,v 1.2.8.6.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-
 XCube_DelegateUtils::call("Legacypage.User.Access");
-
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/userinfo.php
diff -u xoops2jp/html/userinfo.php:1.2.8.4.2.1 xoops2jp/html/userinfo.php:1.2.8.4.2.2
--- xoops2jp/html/userinfo.php:1.2.8.4.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/userinfo.php	Sat Dec 16 23:10:29 2006
@@ -1,32 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: userinfo.php,v 1.2.8.4.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
 XCube_DelegateUtils::call("Legacypage.Userinfo.Access");
-
 ?>
Index: xoops2jp/html/viewpmsg.php
diff -u xoops2jp/html/viewpmsg.php:1.2.8.3.2.1 xoops2jp/html/viewpmsg.php:1.2.8.3.2.2
--- xoops2jp/html/viewpmsg.php:1.2.8.3.2.1	Sat Nov 18 17:44:08 2006
+++ xoops2jp/html/viewpmsg.php	Sat Dec 16 23:10:29 2006
@@ -1,32 +1,18 @@
 <?php
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/**
+ *
+ * @package Legacy
+ * @version $Id: viewpmsg.php,v 1.2.8.3.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 require_once "mainfile.php";
 
 XCube_DelegateUtils::call("Legacypage.Viewpmsg.Access");
-
-?>
\ No newline at end of file
+?>

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:29 +0900
Subject: [xoops-cvslog 6044] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061216141029.A27352AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.legacy_button.php
diff -u xoops2jp/html/class/smarty/plugins/function.legacy_button.php:1.1.2.1 xoops2jp/html/class/smarty/plugins/function.legacy_button.php:1.1.2.2
--- xoops2jp/html/class/smarty/plugins/function.legacy_button.php:1.1.2.1	Sat Oct 14 17:26:22 2006
+++ xoops2jp/html/class/smarty/plugins/function.legacy_button.php	Sat Dec 16 23:10:29 2006
@@ -1,5 +1,11 @@
 <?php
 /**
+ *
+ * @package Legacy
+ * @version $Id: function.legacy_button.php,v 1.1.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  * [ToDo]
  * 1) We may have to move this file to other module with following namespace or
  *    package.
@@ -8,7 +14,6 @@
  *    $params['script']... This function have not impletented that yet. At
  *    implementing, we will have to define the rule about sanitizing.
  *
- * @version $Id: function.legacy_button.php,v 1.1.2.1 2006/10/14 08:26:22 minahito Exp $
  */
 
 /*
Index: xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.1	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php	Sat Dec 16 23:10:29 2006
@@ -1,5 +1,11 @@
 <?php
 /**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  * [ToDo]
  * 1) We may have to move this file to other module with following namespace or
  *    package.
@@ -10,7 +16,6 @@
  *    used. For format xoops_xxxx functions, we may change XoopsForm class
  *    group.
  * 
- * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4.2.1 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 /*
Index: xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php:1.1.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php:1.1.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php:1.1.2.1	Thu Oct 12 20:00:26 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_explaceholder.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_explaceholder.php,v 1.1.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
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.2.2 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.3
--- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.2	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php	Sat Dec 16 23:10:29 2006
@@ -1,5 +1,11 @@
 <?php
 /**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_input.php,v 1.1.2.9.2.3 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  * [ToDo]
  * 1) We may have to move this file to other module with following namespace or
  *    package.
@@ -7,8 +13,7 @@
  * 3) Some users and developers want free elements at $params. For example,
  *    $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.2.2 2006/12/02 15:48:30 nobunobu Exp $
+ * 
  */
 
 /*
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.3 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.4
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.3	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_optionsArray.php,v 1.1.2.4.2.4 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.5 xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.6
--- xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php:1.1.2.3.2.5	Sun Dec  3 16:44:54 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_pagenavi.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_pagenavi.php,v 1.1.2.3.2.6 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.1	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php	Sat Dec 16 23:10:29 2006
@@ -1,5 +1,12 @@
 <?php
 /**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ * [ToDo]
  * [ToDo]
  * 1) We may have to move this file to other module with following namespace or
  *    package.
@@ -7,7 +14,6 @@
  *    $params['script']... This function have not impletented that yet. At
  *    implementing, we will have to define the rule about sanitizing.
  * 
- * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.1 2006/12/02 15:48:30 nobunobu Exp $
  */
 
 /*
Index: xoops2jp/html/class/smarty/plugins/function.xoops_token.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_token.php:1.1.2.4 xoops2jp/html/class/smarty/plugins/function.xoops_token.php:1.1.2.4.2.1
--- xoops2jp/html/class/smarty/plugins/function.xoops_token.php:1.1.2.4	Thu Jan 12 14:56:13 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_token.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: function.xoops_token.php,v 1.1.2.4.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_date_format.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.xoops_date_format.php:1.1.2.2 xoops2jp/html/class/smarty/plugins/modifier.xoops_date_format.php:1.1.2.2.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_date_format.php:1.1.2.2	Fri Nov 25 00:27:18 2005
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_date_format.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: modifier.xoops_date_format.php,v 1.1.2.2.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php:1.1.2.1 xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php:1.1.2.2
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php:1.1.2.1	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php	Sat Dec 16 23:10:29 2006
@@ -1,8 +1,11 @@
 <?php
 /**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
+ *
+ * @package Legacy
+ * @version $Id: modifier.xoops_escape.php,v 1.1.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
 
 /*
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_formattimestamp.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.xoops_formattimestamp.php:1.1.2.2 xoops2jp/html/class/smarty/plugins/modifier.xoops_formattimestamp.php:1.1.2.2.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_formattimestamp.php:1.1.2.2	Fri Nov 25 00:27:44 2005
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_formattimestamp.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: modifier.xoops_formattimestamp.php,v 1.1.2.2.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_user.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.xoops_user.php:1.1.2.3.2.1 xoops2jp/html/class/smarty/plugins/modifier.xoops_user.php:1.1.2.3.2.2
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_user.php:1.1.2.3.2.1	Sat Oct 14 20:30:36 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_user.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: modifier.xoops_user.php,v 1.1.2.3.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin
Index: xoops2jp/html/class/smarty/plugins/modifier.xoops_user_avatarize.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.xoops_user_avatarize.php:1.1.2.2.2.1 xoops2jp/html/class/smarty/plugins/modifier.xoops_user_avatarize.php:1.1.2.2.2.2
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_user_avatarize.php:1.1.2.2.2.1	Thu Oct 19 17:47:54 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_user_avatarize.php	Sat Dec 16 23:10:29 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: modifier.xoops_user_avatarize.php,v 1.1.2.2.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 /*
  * Smarty plugin

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:29 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:29 +0900
Subject: [xoops-cvslog 6045] CVS update: xoops2jp/html/class
Message-ID: <20061216141029.E21652AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/class/token.php
diff -u xoops2jp/html/class/token.php:1.3.6.3.2.4 xoops2jp/html/class/token.php:1.3.6.3.2.5
--- xoops2jp/html/class/token.php:1.3.6.3.2.4	Sun Dec  3 16:44:53 2006
+++ xoops2jp/html/class/token.php	Sat Dec 16 23:10:29 2006
@@ -1,5 +1,12 @@
 <?php
-// $Id: token.php,v 1.3.6.3.2.4 2006/12/03 07:44:53 nobunobu Exp $
+/**
+ *
+ * @package Legacy
+ * @version $Id: token.php,v 1.3.6.3.2.5 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 
 define ( 'XOOPS_TOKEN_TIMEOUT', 0 );
 define ( 'XOOPS_TOKEN_PREFIX', "XOOPS_TOKEN_" );
Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.2.8.7 xoops2jp/html/class/xoopsblock.php:1.2.8.7.2.1
--- xoops2jp/html/class/xoopsblock.php:1.2.8.7	Tue Apr 11 17:42:17 2006
+++ xoops2jp/html/class/xoopsblock.php	Sat Dec 16 23:10:29 2006
@@ -1,8 +1,13 @@
 <?php
-// $Id: xoopsblock.php,v 1.2.8.7 2006/04/11 08:42:17 nobunobu Exp $
-// this file is for backward compatibility only
-if (!defined('XOOPS_ROOT_PATH')) {
-	exit();
-}
+/**
+ *
+ * @package Legacy
+ * @version $Id: xoopsblock.php,v 1.2.8.7.2.1 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
 require_once XOOPS_ROOT_PATH.'/kernel/block.php';
 ?>
\ No newline at end of file
Index: xoops2jp/html/class/xoopssecurity.php
diff -u xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.4 xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.5
--- xoops2jp/html/class/xoopssecurity.php:1.3.6.1.2.4	Sun Dec  3 16:44:53 2006
+++ xoops2jp/html/class/xoopssecurity.php	Sat Dec 16 23:10:29 2006
@@ -1,6 +1,12 @@
 <?php
-// $Id: xoopssecurity.php,v 1.3.6.1.2.4 2006/12/03 07:44:53 nobunobu Exp $
-
+/**
+ *
+ * @package Legacy
+ * @version $Id: xoopssecurity.php,v 1.3.6.1.2.5 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 /**
  * Class for xoops.org 2.0.10 compatibility
  *

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6046] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20061216141030.0E3C52AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formtoken.php
diff -u xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.4 xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.5
--- xoops2jp/html/class/xoopsform/formtoken.php:1.3.6.1.2.4	Sun Dec  3 16:44:53 2006
+++ xoops2jp/html/class/xoopsform/formtoken.php	Sat Dec 16 23:10:29 2006
@@ -1,35 +1,12 @@
 <?php
-// $Id: formtoken.php,v 1.3.6.1.2.4 2006/12/03 07:44:53 nobunobu 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 // //  ------------------------------------------------------------------------ //
-
 /**
- * A hidden token field by XoopsToken instance.
- * This is a trial code.
  *
- * @author  minahito<minahito ＠ users.sourceforge.jp>
- * @copyright   copyright (c) 2000-2005 XOOPS.org
-*/
+ * @package Legacy
+ * @version $Id: formtoken.php,v 1.3.6.1.2.5 2006/12/16 14:10:29 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 class XoopsFormToken extends XoopsFormHidden {
     /**
      * Constructor

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6047] CVS update: xoops2jp/html/include
Message-ID: <20061216141030.368FD2AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.2.8.5.2.1 xoops2jp/html/include/checklogin.php:1.2.8.5.2.2
--- xoops2jp/html/include/checklogin.php:1.2.8.5.2.1	Sat Nov 18 17:44:09 2006
+++ xoops2jp/html/include/checklogin.php	Sat Dec 16 23:10:30 2006
@@ -1,41 +1,21 @@
 <?php
 /**
- @package base
- @deprecated
+ *
+ * @package Legacy
+ * @version $Id: checklogin.php,v 1.2.8.5.2.2 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
-// $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://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 //
-//  ------------------------------------------------------------------------ //
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 $root =& XCube_Root::getSingleton();
 $root->mController->checkLogin();
 
-//
 // ToDo Add after care!
-//
-
 ?>
Index: xoops2jp/html/include/common.php
diff -u xoops2jp/html/include/common.php:1.4.8.15.2.4 xoops2jp/html/include/common.php:1.4.8.15.2.5
--- xoops2jp/html/include/common.php:1.4.8.15.2.4	Sat Nov  4 14:20:46 2006
+++ xoops2jp/html/include/common.php	Sat Dec 16 23:10:30 2006
@@ -1,8 +1,16 @@
 <?php
 /**
+ *
  * @package Legacy
- * @version $Id: common.php,v 1.4.8.15.2.4 2006/11/04 05:20:46 nobunobu Exp $
+ * @version $Id: common.php,v 1.4.8.15.2.5 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 require_once XOOPS_ROOT_PATH . '/include/cubecore_init.php';
Index: xoops2jp/html/include/cp_header.php
diff -u xoops2jp/html/include/cp_header.php:1.2.8.5.2.3 xoops2jp/html/include/cp_header.php:1.2.8.5.2.4
--- xoops2jp/html/include/cp_header.php:1.2.8.5.2.3	Sun Oct 15 00:37:28 2006
+++ xoops2jp/html/include/cp_header.php	Sat Dec 16 23:10:30 2006
@@ -1,17 +1,19 @@
 <?php 
 /**
+ *
  * @package Legacy
- * @version $Id: cp_header.php,v 1.2.8.5.2.3 2006/10/14 15:37:28 minahito Exp $
- * @deprecated This file was a shortcut for XOOPS2 developers who don't want to load header.php
+ * @version $Id: cp_header.php,v 1.2.8.5.2.4 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
-if (!defined('XOOPS_ROOT_PATH')) {
-	require_once "../../../mainfile.php";
-}
-
-if (!defined('XOOPS_CPFUNC_LOADED')) {
-	require_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
-}
+if (!defined('XOOPS_ROOT_PATH')) require_once "../../../mainfile.php";
+if (!defined('XOOPS_CPFUNC_LOADED')) require_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
 
 //
 // [Special Mission] Additional CHECK!!
Index: xoops2jp/html/include/cubecore_init.php
diff -u xoops2jp/html/include/cubecore_init.php:1.1.2.1 xoops2jp/html/include/cubecore_init.php:1.1.2.2
--- xoops2jp/html/include/cubecore_init.php:1.1.2.1	Sat Nov  4 14:20:46 2006
+++ xoops2jp/html/include/cubecore_init.php	Sat Dec 16 23:10:30 2006
@@ -1,15 +1,15 @@
 <?php
 /**
+ *
  * @package Legacy
- * @version $Id: cubecore_init.php,v 1.1.2.1 2006/11/04 05:20:46 nobunobu Exp $
+ * @version $Id: cubecore_init.php,v 1.1.2.2 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
  */
 
-//
-// Prohibition of a direct kick
-//
-if (!defined("XOOPS_MAINFILE_INCLUDED")) {
-	die();
-}
+if (!defined("XOOPS_MAINFILE_INCLUDED")) exit();
+
 
 /**
  * This constant is the sign which this system is XOOPS Cube, for module
Index: xoops2jp/html/include/session.php
diff -u xoops2jp/html/include/session.php:1.3.2.1.2.4 xoops2jp/html/include/session.php:1.3.2.1.2.5
--- xoops2jp/html/include/session.php:1.3.2.1.2.4	Sun Dec  3 16:44:54 2006
+++ xoops2jp/html/include/session.php	Sat Dec 16 23:10:30 2006
@@ -1,7 +1,14 @@
 <?php
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
+/**
+ *
+ * @package Legacy
+ * @version $Id: session.php,v 1.3.2.1.2.5 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
 
 if (!function_exists('session_regenerate_id')) {
     if (!defined('XOOPS_SALT')) {

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6048] CVS update: xoops2jp/html/install/class
Message-ID: <20061216141030.56B132AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/install/class/simplewizard.php
diff -u xoops2jp/html/install/class/simplewizard.php:1.1.2.2 xoops2jp/html/install/class/simplewizard.php:1.1.2.2.2.1
--- xoops2jp/html/install/class/simplewizard.php:1.1.2.2	Thu Sep 14 19:23:15 2006
+++ xoops2jp/html/install/class/simplewizard.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: simplewizard.php,v 1.1.2.2.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 class SimpleWizard {
   var $_v;
   var $_op;

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6049] CVS update: xoops2jp/html/install/include
Message-ID: <20061216141030.761C92AC0C4@users.sourceforge.jp>

Index: xoops2jp/html/install/include/functions.php
diff -u xoops2jp/html/install/include/functions.php:1.1.2.3 xoops2jp/html/install/include/functions.php:1.1.2.3.2.1
--- xoops2jp/html/install/include/functions.php:1.1.2.3	Sat Sep  9 23:39:18 2006
+++ xoops2jp/html/install/include/functions.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,29 @@
 <?php
+// $Id: functions.php,v 1.1.2.3.2.1 2006/12/16 14:10:30 nobunobu 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 //
+//  ------------------------------------------------------------------------ //
 function getLanguage() {
 	$language_array = array(
 			'en' => 'english',

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6050] CVS update: xoops2jp/html/install
Message-ID: <20061216141030.9A0D42AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.2.8.5 xoops2jp/html/install/index.php:1.2.8.5.2.1
--- xoops2jp/html/install/index.php:1.2.8.5	Tue Apr 11 17:39:06 2006
+++ xoops2jp/html/install/index.php	Sat Dec 16 23:10:30 2006
@@ -1,31 +1,16 @@
 <?php
-// $Id: index.php,v 1.2.8.5 2006/04/11 08:39:06 nobunobu 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 //
-//  ------------------------------------------------------------------------ //
-
-//error_reporting (E_ALL);
+/**
+ *
+ * @package Legacy
+ * @version $Id: index.php,v 1.2.8.5.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
+/*------------------------------------------------------------------------*
+ |  This file was entirely rewritten by the XOOPS Cube Legacy project for |
+ |   keeping compatibility with XOOPS 2.0.x <http://www.xoops.org>        |
+ *------------------------------------------------------------------------*/
 
 include_once './passwd.php';
 if(INSTALL_USER != '' || INSTALL_PASSWD != ''){

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:30 +0900
Subject: [xoops-cvslog 6051] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20061216141030.BA6422AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/charset_mysql.php
diff -u xoops2jp/html/install/language/japanese/charset_mysql.php:1.1.2.2 xoops2jp/html/install/language/japanese/charset_mysql.php:1.1.2.2.2.1
--- xoops2jp/html/install/language/japanese/charset_mysql.php:1.1.2.2	Sat Jun 17 00:48:46 2006
+++ xoops2jp/html/install/language/japanese/charset_mysql.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: charset_mysql.php,v 1.1.2.2.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $this->db->queryF("/*!41000 SET NAMES ujis */");
     $this->db->queryF("/*!41000 SET SESSION character_set_database=ujis */");
     $this->db->queryF("/*!41000 SET SESSION character_set_server=ujis */");

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:31 +0900
Subject: [xoops-cvslog 6052] CVS update: xoops2jp/html/install/wizards
Message-ID: <20061216141031.12D752AC0B3@users.sourceforge.jp>

Index: xoops2jp/html/install/wizards/install_checkDB.inc.php
diff -u xoops2jp/html/install/wizards/install_checkDB.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_checkDB.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_checkDB.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_checkDB.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_checkDB.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     include_once './class/dbmanager.php';
     $dbm = new db_manager;
Index: xoops2jp/html/install/wizards/install_createDB.inc.php
diff -u xoops2jp/html/install/wizards/install_createDB.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_createDB.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_createDB.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_createDB.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_createDB.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     include_once './class/dbmanager.php';
     $dbm = new db_manager;
Index: xoops2jp/html/install/wizards/install_createTables.inc.php
diff -u xoops2jp/html/install/wizards/install_createTables.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_createTables.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_createTables.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_createTables.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_createTables.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     include_once './class/dbmanager.php';
     $dbm = new db_manager;
Index: xoops2jp/html/install/wizards/install_dbconfirm.inc.php
diff -u xoops2jp/html/install/wizards/install_dbconfirm.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_dbconfirm.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_dbconfirm.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_dbconfirm.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_dbconfirm.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once 'class/settingmanager.php';
     $sm = new setting_manager(true);
 
Index: xoops2jp/html/install/wizards/install_dbform.inc.php
diff -u xoops2jp/html/install/wizards/install_dbform.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_dbform.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_dbform.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_dbform.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_dbform.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     include_once 'class/settingmanager.php';
     $sm = new setting_manager();
Index: xoops2jp/html/install/wizards/install_dbsave.inc.php
diff -u xoops2jp/html/install/wizards/install_dbsave.inc.php:1.1.2.3 xoops2jp/html/install/wizards/install_dbsave.inc.php:1.1.2.3.2.1
--- xoops2jp/html/install/wizards/install_dbsave.inc.php:1.1.2.3	Sun Sep 17 11:54:20 2006
+++ xoops2jp/html/install/wizards/install_dbsave.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_dbsave.inc.php,v 1.1.2.3.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once './class/mainfilemanager.php';
     $mm = new mainfile_manager('../mainfile.php');
 
Index: xoops2jp/html/install/wizards/install_finish.inc.php
diff -u xoops2jp/html/install/wizards/install_finish.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_finish.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_finish.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_finish.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_finish.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include './language/'.$language.'/finish.php'; //This will set message to $content;
     $wizard->assign('finish', $content);
     $wizard->render('install_finish.tpl.php');
Index: xoops2jp/html/install/wizards/install_initial.inc.php
diff -u xoops2jp/html/install/wizards/install_initial.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_initial.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_initial.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_initial.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_initial.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     // confirm database setting
     include_once "../mainfile.php";
     $wizard->render('install_initial.tpl.php');
Index: xoops2jp/html/install/wizards/install_insertData.inc.php
diff -u xoops2jp/html/install/wizards/install_insertData.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_insertData.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_insertData.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_insertData.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_insertData.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $adminname = $myts->stripSlashesGPC(trim($_POST['adminname']));
     $adminpass = $myts->stripSlashesGPC($_POST['adminpass']);
     $adminmail = $myts->stripSlashesGPC(trim($_POST['adminmail']));
Index: xoops2jp/html/install/wizards/install_langselect.inc.php
diff -u xoops2jp/html/install/wizards/install_langselect.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_langselect.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_langselect.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_langselect.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_langselect.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     if (!defined('_INSTALL_L128')) {
         define('_INSTALL_L128', 'Choose language to be used for the installation process');
     }
Index: xoops2jp/html/install/wizards/install_mainfile.inc.php
diff -u xoops2jp/html/install/wizards/install_mainfile.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_mainfile.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_mainfile.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_mainfile.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_mainfile.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     // checking XOOPS_ROOT_PATH and XOOPS_URL
     include_once '../mainfile.php';
 
Index: xoops2jp/html/install/wizards/install_modcheck.inc.php
diff -u xoops2jp/html/install/wizards/install_modcheck.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_modcheck.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_modcheck.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_modcheck.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_modcheck.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $writeok = array('uploads/', 'cache/', 'templates_c/', 'mainfile.php');
     $error = false;
     foreach ($writeok as $wok) {
Index: xoops2jp/html/install/wizards/install_nextStep.inc.php
diff -u xoops2jp/html/install/wizards/install_nextStep.inc.php:1.1.2.1.2.1 xoops2jp/html/install/wizards/install_nextStep.inc.php:1.1.2.1.2.2
--- xoops2jp/html/install/wizards/install_nextStep.inc.php:1.1.2.1.2.1	Mon Oct 23 18:09:33 2006
+++ xoops2jp/html/install/wizards/install_nextStep.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_nextStep.inc.php,v 1.1.2.1.2.2 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     header('Location: ' . XOOPS_URL . '/');
 ?>
Index: xoops2jp/html/install/wizards/install_siteInit.inc.php
diff -u xoops2jp/html/install/wizards/install_siteInit.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_siteInit.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_siteInit.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_siteInit.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_siteInit.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once '../mainfile.php';
     $wizard->render('install_siteInit.tpl.php');
 ?>
Index: xoops2jp/html/install/wizards/install_start.inc.php
diff -u xoops2jp/html/install/wizards/install_start.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_start.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_start.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_start.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_start.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include './language/'.$language.'/welcome.php'; //This will set message to $content;
     $wizard->assign('welcome', $content);
     $wizard->render('install_start.tpl.php');
Index: xoops2jp/html/install/wizards/install_updateAvatars.inc.php
diff -u xoops2jp/html/install/wizards/install_updateAvatars.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateAvatars.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateAvatars.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateAvatars.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateAvatars.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $content = '<p>'._INSTALL_L151.'</p>';
     $b_next = array('updateAvatars_go', _INSTALL_L139);
     include 'install_tpl.php';
Index: xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateAvatars_go.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     unset($xoopsOption['nocommon']);
     include('../mainfile.php');
     $content = '';
Index: xoops2jp/html/install/wizards/install_updateComments.inc.php
diff -u xoops2jp/html/install/wizards/install_updateComments.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateComments.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateComments.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateComments.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateComments.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $content = "<p>"._INSTALL_L149."</p>\n";
     $b_next = array('updateComments_go', _INSTALL_L138);
     include 'install_tpl.php';
Index: xoops2jp/html/install/wizards/install_updateComments_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateComments_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateComments_go.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateComments_go.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateComments_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateComments_go.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     unset($xoopsOption['nocommon']);
     include '../mainfile.php';
     include '../class/xoopscomments.php';
Index: xoops2jp/html/install/wizards/install_updateConfig.inc.php
diff -u xoops2jp/html/install/wizards/install_updateConfig.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateConfig.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateConfig.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateConfig.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateConfig.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $b_next = array('updateConfig_go', _INSTALL_L144);
     $content = "<p>"._INSTALL_L143."</p>\n";
     include 'install_tpl.php';
Index: xoops2jp/html/install/wizards/install_updateConfig_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.2 xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.2.2.1
--- xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.2	Fri Aug 25 19:14:08 2006
+++ xoops2jp/html/install/wizards/install_updateConfig_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateConfig_go.inc.php,v 1.1.2.2.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once "../mainfile.php";
 
     $language = check_language($language);
Index: xoops2jp/html/install/wizards/install_updateModules.inc.php
diff -u xoops2jp/html/install/wizards/install_updateModules.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateModules.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateModules.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateModules.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateModules.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $b_next = array('updateModules_go', _INSTALL_L137);
     $content = "<p>"._INSTALL_L141."</p>\n";
     include 'install_tpl.php';
Index: xoops2jp/html/install/wizards/install_updateModules_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateModules_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateModules_go.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateModules_go.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateModules_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateModules_go.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     unset($xoopsOption['nocommon']);
     include_once "../mainfile.php";
     error_reporting(E_ERROR);
Index: xoops2jp/html/install/wizards/install_updateSmilies.inc.php
diff -u xoops2jp/html/install/wizards/install_updateSmilies.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateSmilies.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateSmilies.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateSmilies.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateSmilies.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     $content = '<p>'._INSTALL_L150.'</p>';
     $b_next = array('updateSmilies_go', _INSTALL_L140);
     include 'install_tpl.php';
Index: xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateSmilies_go.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     unset($xoopsOption['nocommon']);
     include('../mainfile.php');
     $result = $xoopsDB->query("SELECT * FROM ".$xoopsDB->prefix('smiles'));
Index: xoops2jp/html/install/wizards/install_updateTables.inc.php
diff -u xoops2jp/html/install/wizards/install_updateTables.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateTables.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateTables.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateTables.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateTables.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once "../mainfile.php";
     include_once './class/dbmanager.php';
     $db = new db_manager;
Index: xoops2jp/html/install/wizards/install_updateTables_go.inc.php
diff -u xoops2jp/html/install/wizards/install_updateTables_go.inc.php:1.1.2.1 xoops2jp/html/install/wizards/install_updateTables_go.inc.php:1.1.2.1.2.1
--- xoops2jp/html/install/wizards/install_updateTables_go.inc.php:1.1.2.1	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateTables_go.inc.php	Sat Dec 16 23:10:30 2006
@@ -1,4 +1,12 @@
 <?php
+/**
+ *
+ * @package Legacy
+ * @version $Id: install_updateTables_go.inc.php,v 1.1.2.1.2.1 2006/12/16 14:10:30 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
     include_once "../mainfile.php";
     $error = false;
     $g_webmasters = isset($g_webmasters) ? intval($g_webmasters) : 0;

From nobunobu ＠ users.sourceforge.jp  Sat Dec 16 23:10:31 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 16 Dec 2006 23:10:31 +0900
Subject: [xoops-cvslog 6053] CVS update: xoops2jp/html/settings
Message-ID: <20061216141031.396442AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/settings/definition.inc.php
diff -u xoops2jp/html/settings/definition.inc.php:1.1.4.5.2.2 xoops2jp/html/settings/definition.inc.php:1.1.4.5.2.3
--- xoops2jp/html/settings/definition.inc.php:1.1.4.5.2.2	Sun Oct 15 01:49:49 2006
+++ xoops2jp/html/settings/definition.inc.php	Sat Dec 16 23:10:31 2006
@@ -1,5 +1,12 @@
 <?php
-
+/**
+ *
+ * @package Legacy
+ * @version $Id: definition.inc.php,v 1.1.4.5.2.3 2006/12/16 14:10:31 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPSCube.org <http://xoopscube.org/> 
+ * @license http://www.gnu.org/licenses/gpl.txt GNU GENERAL PUBLIC LICENSE Version 2
+ *
+ */
 // Enum
 define("XOOPS_SIDEBLOCK_LEFT",0);
 define("XOOPS_SIDEBLOCK_RIGHT",1);

From tom_g3x ＠ users.sourceforge.jp  Mon Dec 25 15:24:53 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Mon, 25 Dec 2006 15:24:53 +0900
Subject: [xoops-cvslog 6054] CVS update: xoops2jp/html/include
Message-ID: <20061225062453.651F72AC154@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.8 xoops2jp/html/include/version.php:1.4.8.12.2.9
--- xoops2jp/html/include/version.php:1.4.8.12.2.8	Tue Nov  7 20:06:48 2006
+++ xoops2jp/html/include/version.php	Mon Dec 25 15:24:53 2006
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.8 2006/11/07 11:06:48 minahito Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.9 2006/12/25 06:24:53 tom_g3x Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 3-e");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 4");
 
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Dec 26 16:03:30 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 26 Dec 2006 16:03:30 +0900
Subject: [xoops-cvslog 6055] CVS update: xoops2jp/html/class
Message-ID: <20061226070330.383E32AC1D1@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsmailer.php
diff -u xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.1 xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.2
--- xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.1	Fri Oct 20 17:03:54 2006
+++ xoops2jp/html/class/xoopsmailer.php	Tue Dec 26 16:03:29 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmailer.php,v 1.2.8.3.2.1 2006/10/20 08:03:54 minahito Exp $
+// $Id: xoopsmailer.php,v 1.2.8.3.2.2 2006/12/26 07:03:29 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -139,7 +139,6 @@
 	// reset all properties to default
 	function reset()
 	{
-		$this->multimailer->ClearAllRecipients();
 		$this->fromEmail = "";
 		$this->fromName = "";
 		$this->fromUser = null; // RMV-NOTIFY
@@ -370,6 +369,7 @@
 	{
 		$subject = $this->encodeSubject($subject);
 		$this->encodeBody($body);
+		$this->multimailer->ClearAllRecipients();
 		$this->multimailer->AddAddress($email);
 		$this->multimailer->Subject = $subject;
 		$this->multimailer->Body = $body;

From nobunobu ＠ users.sourceforge.jp  Tue Dec 26 23:26:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 26 Dec 2006 23:26:51 +0900
Subject: [xoops-cvslog 6056] CVS update: xoops2jp/html/class/smarty/core
Message-ID: <20061226142651.0B7DD2AC09B@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/core/core.write_file.php
diff -u xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1 xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1.2.1
--- xoops2jp/html/class/smarty/core/core.write_file.php:1.1.8.1	Sun Nov 20 17:05:53 2005
+++ xoops2jp/html/class/smarty/core/core.write_file.php	Tue Dec 26 23:26:50 2006
@@ -23,8 +23,7 @@
         smarty_core_create_dir_structure($_params, $smarty);
     }
 
-    // write to tmp file, then rename it to avoid
-    // file locking race condition
+    // write to tmp file, then rename it to avoid file locking race condition
     $_tmp_file = tempnam($_dirname, 'wrt');
 
     if (!($fd = @fopen($_tmp_file, 'wb'))) {
@@ -38,12 +37,13 @@
     fwrite($fd, $params['contents']);
     fclose($fd);
 
-    // Delete the file if it allready exists (this is needed on Win,
-    // because it cannot overwrite files with rename()
-    if (file_exists($params['filename'])) {
+    if (PHP_OS == 'Windows' || !@rename($_tmp_file, $params['filename'])) {
+        // On platforms and filesystems that cannot overwrite with rename() 
+        // delete the file before renaming it -- because windows always suffers
+        // this, it is short-circuited to avoid the initial rename() attempt
         @unlink($params['filename']);
+        @rename($_tmp_file, $params['filename']);
     }
-    @rename($_tmp_file, $params['filename']);
     @chmod($params['filename'], $smarty->_file_perms);
 
     return true;
@@ -51,4 +51,4 @@
 
 /* vim: set expandtab: */
 
-?>
+?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Dec 26 23:26:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 26 Dec 2006 23:26:51 +0900
Subject: [xoops-cvslog 6057] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20061226142651.5C10C2AC09B@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.html_select_date.php
diff -u xoops2jp/html/class/smarty/plugins/function.html_select_date.php:1.2.8.2 xoops2jp/html/class/smarty/plugins/function.html_select_date.php:1.2.8.2.2.1
--- xoops2jp/html/class/smarty/plugins/function.html_select_date.php:1.2.8.2	Fri Jan 27 23:34:11 2006
+++ xoops2jp/html/class/smarty/plugins/function.html_select_date.php	Tue Dec 26 23:26:51 2006
@@ -22,11 +22,13 @@
  *                month values (Gary Loescher)
  *           - 1.3.1 added support for choosing format for
  *                day values (Marcus Bointon)
- *           - 1.3.2 suppport negative timestamps, force year
+ *           - 1.3.2 support negative timestamps, force year
  *             dropdown to include given date unless explicitly set (Monte)
+ *           - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
+ *             of 0000-00-00 dates (cybot, boots)
  * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
  *      (Smarty online manual)
- * @version 1.3.2
+ * @version 1.3.4
  * @author Andrei Zmievski
  * @author Monte Ohrt <monte at ohrt dot com>
  * @param array
@@ -131,19 +133,21 @@
         }
     }
 
-    if(preg_match('!^-\d+$!',$time)) {
+    if (preg_match('!^-\d+$!', $time)) {
         // negative timestamp, use date()
-        $time = date('Y-m-d',$time);
+        $time = date('Y-m-d', $time);
     }
     // If $time is not in format yyyy-mm-dd
-    if (!preg_match('/^\d{0,4}-\d{0,2}-\d{0,2}$/', $time)) {
+    if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
+        $time = $found[1];
+    } else {
         // use smarty_make_timestamp to get an unix timestamp and
         // strftime to make yyyy-mm-dd
         $time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
     }
     // Now split this in pieces, which later can be used to set the select
     $time = explode("-", $time);
-    
+
     // make syntax "+N" or "-N" work with start_year and end_year
     if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
         if ($match[1] == '+') {
@@ -159,7 +163,7 @@
             $start_year = strftime('%Y') - $match[2];
         }
     }
-    if (strlen($time[0]) > 0) { 
+    if (strlen($time[0]) > 0) {
         if ($start_year > $time[0] && !isset($params['start_year'])) {
             // force start year to include given date if not explicitly set
             $start_year = $time[0];
Index: xoops2jp/html/class/smarty/plugins/function.html_table.php
diff -u xoops2jp/html/class/smarty/plugins/function.html_table.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/function.html_table.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/function.html_table.php:1.2.8.1	Sun Nov 20 17:05:54 2005
+++ xoops2jp/html/class/smarty/plugins/function.html_table.php	Tue Dec 26 23:26:51 2006
@@ -15,12 +15,15 @@
  * Purpose:  make an html table from an array of data<br>
  * Input:<br>
  *         - loop = array to loop through
- *         - cols = number of columns
+ *         - cols = number of columns, comma separated list of column names
+ *                  or array of column names
  *         - rows = number of rows
  *         - table_attr = table attributes
+ *         - th_attr = table heading attributes (arrays are cycled)
  *         - tr_attr = table row attributes (arrays are cycled)
  *         - td_attr = table cell attributes (arrays are cycled)
  *         - trailpad = value to pad trailing cells with
+ *         - caption = text for caption element 
  *         - vdir = vertical direction (default: "down", means top-to-bottom)
  *         - hdir = horizontal direction (default: "right", means left-to-right)
  *         - inner = inner loop (default "cols": print $loop line by line,
@@ -31,10 +34,12 @@
  * <pre>
  * {table loop=$data}
  * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols=4 tr_attr=$colors}
+ * {table loop=$data cols="first,second,third" tr_attr=$colors}
  * </pre>
  * @author   Monte Ohrt <monte at ohrt dot com>
- * @version  1.0
+ * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
+ * @author credit to boots <boots dot smarty at yahoo dot com>
+ * @version  1.1
  * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
  *          (Smarty online manual)
  * @param array
@@ -45,13 +50,15 @@
 {
     $table_attr = 'border="1"';
     $tr_attr = '';
+    $th_attr = '';
     $td_attr = '';
-    $cols = 3;
+    $cols = $cols_count = 3;
     $rows = 3;
     $trailpad = '&nbsp;';
     $vdir = 'down';
     $hdir = 'right';
     $inner = 'cols';
+    $caption = '';
 
     if (!isset($params['loop'])) {
         $smarty->trigger_error("html_table: missing 'loop' parameter");
@@ -65,6 +72,19 @@
                 break;
 
             case 'cols':
+                if (is_array($_value) && !empty($_value)) {
+                    $cols = $_value;
+                    $cols_count = count($_value);
+                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+                    $cols = explode(',', $_value);
+                    $cols_count = count($cols);
+                } elseif (!empty($_value)) {
+                    $cols_count = (int)$_value;
+                } else {
+                    $cols_count = $cols;
+                }
+                break;
+
             case 'rows':
                 $$_key = (int)$_value;
                 break;
@@ -74,11 +94,13 @@
             case 'hdir':
             case 'vdir':
             case 'inner':
+            case 'caption':
                 $$_key = (string)$_value;
                 break;
 
             case 'tr_attr':
             case 'td_attr':
+            case 'th_attr':
                 $$_key = $_value;
                 break;
         }
@@ -87,25 +109,42 @@
     $loop_count = count($loop);
     if (empty($params['rows'])) {
         /* no rows specified */
-        $rows = ceil($loop_count/$cols);
+        $rows = ceil($loop_count/$cols_count);
     } elseif (empty($params['cols'])) {
         if (!empty($params['rows'])) {
             /* no cols specified, but rows */
-            $cols = ceil($loop_count/$rows);
+            $cols_count = ceil($loop_count/$rows);
         }
     }
 
     $output = "<table $table_attr>\n";
 
+    if (!empty($caption)) {
+        $output .= '<caption>' . $caption . "</caption>\n";
+    }
+
+    if (is_array($cols)) {
+        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+        $output .= "<thead><tr>\n";
+
+        for ($r=0; $r<$cols_count; $r++) {
+            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+            $output .= $cols[$r];
+            $output .= "</th>\n";
+        }
+        $output .= "</tr></thead>\n";
+    }
+
+    $output .= "<tbody>\n";
     for ($r=0; $r<$rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx =  ($vdir == 'down') ? $r*$cols : ($rows-1-$r)*$cols;
+        $rx =  ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
 
-        for ($c=0; $c<$cols; $c++) {
-            $x =  ($hdir == 'right') ? $rx+$c : $rx+$cols-1-$c;
+        for ($c=0; $c<$cols_count; $c++) {
+            $x =  ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
             if ($inner!='cols') {
                 /* shuffle x to loop over rows*/
-                $x = floor($x/$cols) + ($x%$cols)*$rows;
+                $x = floor($x/$cols_count) + ($x%$cols_count)*$rows;
             }
 
             if ($x<$loop_count) {
@@ -116,6 +155,7 @@
         }
         $output .= "</tr>\n";
     }
+    $output .= "</tbody>\n";
     $output .= "</table>\n";
     
     return $output;
Index: xoops2jp/html/class/smarty/plugins/function.mailto.php
diff -u xoops2jp/html/class/smarty/plugins/function.mailto.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/function.mailto.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/function.mailto.php:1.2.8.1	Sun Nov 20 17:05:54 2005
+++ xoops2jp/html/class/smarty/plugins/function.mailto.php	Tue Dec 26 23:26:51 2006
@@ -62,6 +62,8 @@
 
     // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
     // so, don't encode it.
+    $search = array('%40', '%2C');
+    $replace  = array('@', ',');
     $mail_parms = array();
     foreach ($params as $var=>$value) {
         switch ($var) {
@@ -69,7 +71,7 @@
             case 'bcc':
             case 'followupto':
                 if (!empty($value))
-                    $mail_parms[] = $var.'='.str_replace('%40','@',rawurlencode($value));
+                    $mail_parms[] = $var.'='.str_replace($search,$replace,rawurlencode($value));
                 break;
                 
             case 'subject':
Index: xoops2jp/html/class/smarty/plugins/modifier.capitalize.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.capitalize.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/modifier.capitalize.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.capitalize.php:1.2.8.1	Fri Jan 27 23:34:11 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.capitalize.php	Tue Dec 26 23:26:51 2006
@@ -21,7 +21,7 @@
 function smarty_modifier_capitalize($string, $uc_digits = false)
 {
     smarty_modifier_capitalize_ucfirst(null, $uc_digits);
-    return preg_replace_callback('!\b\w+\b!', 'smarty_modifier_capitalize_ucfirst', $string);
+    return preg_replace_callback('!\'?\b\w(\w|\')*\b!', 'smarty_modifier_capitalize_ucfirst', $string);
 }
 
 function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
@@ -33,7 +33,7 @@
         return;
     }
     
-    if(!preg_match('!\d!',$string[0]) || $_uc_digits)
+    if(substr($string[0],0,1) != "'" && !preg_match("!\d!",$string[0]) || $_uc_digits)
         return ucfirst($string[0]);
     else
         return $string[0];
Index: xoops2jp/html/class/smarty/plugins/modifier.date_format.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.date_format.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/modifier.date_format.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.date_format.php:1.2.8.1	Fri Jan 27 23:34:11 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.date_format.php	Tue Dec 26 23:26:51 2006
@@ -31,9 +31,11 @@
 function smarty_modifier_date_format($string, $format="%b %e, %Y", $default_date=null)
 {
     if (substr(PHP_OS,0,3) == 'WIN') {
-           $_win_from = array ('%e',  '%T',       '%D');
-           $_win_to   = array ('%#d', '%H:%M:%S', '%m/%d/%y');
-           $format = str_replace($_win_from, $_win_to, $format);
+        $hours = strftime('%I', $string);
+        $short_hours = ( $hours < 10 ) ? substr( $hours, -1) : $hours; 
+        $_win_from = array ('%e',  '%T',       '%D',        '%l');
+        $_win_to   = array ('%#d', '%H:%M:%S', '%m/%d/%y',  $short_hours);
+        $format = str_replace($_win_from, $_win_to, $format);
     }
     if($string != '') {
         return strftime($format, smarty_make_timestamp($string));
Index: xoops2jp/html/class/smarty/plugins/modifier.debug_print_var.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.debug_print_var.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/modifier.debug_print_var.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.debug_print_var.php:1.2.8.1	Fri Jan 27 23:34:11 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.debug_print_var.php	Tue Dec 26 23:26:51 2006
@@ -22,33 +22,66 @@
  */
 function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
 {
-    $_replace = array("\n"=>'<i>&#92;n</i>', "\r"=>'<i>&#92;r</i>', "\t"=>'<i>&#92;t</i>');
-    if (is_array($var)) {
-        $results = "<b>Array (".count($var).")</b>";
-        foreach ($var as $curr_key => $curr_val) {
-            $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
-            $results .= "<br>".str_repeat('&nbsp;', $depth*2)."<b>".strtr($curr_key, $_replace)."</b> =&gt; $return";
-        }
-    } else if (is_object($var)) {
-        $object_vars = get_object_vars($var);
-        $results = "<b>".get_class($var)." Object (".count($object_vars).")</b>";
-        foreach ($object_vars as $curr_key => $curr_val) {
-            $return = smarty_modifier_debug_print_var($curr_val, $depth+1, $length);
-            $results .= "<br>".str_repeat('&nbsp;', $depth*2)."<b>$curr_key</b> =&gt; $return";
-        }
-    } else if (is_resource($var)) {
-        $results = '<i>'.(string)$var.'</i>';
-    } else if (empty($var) && $var != "0") {
-        $results = '<i>empty</i>';
-    } else {
-        if (strlen($var) > $length ) {
-            $results = substr($var, 0, $length-3).'...';
-        } else {
-            $results = $var;
-        }
-        $results = htmlspecialchars($results);
-        $results = strtr($results, $_replace);
+    $_replace = array(
+        "\n" => '<i>\n</i>',
+        "\r" => '<i>\r</i>',
+        "\t" => '<i>\t</i>'
+    );
+
+    switch (gettype($var)) {
+        case 'array' :
+            $results = '<b>Array (' . count($var) . ')</b>';
+            foreach ($var as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
+                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    $depth--;
+            }
+            break;
+        case 'object' :
+            $object_vars = get_object_vars($var);
+            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
+            foreach ($object_vars as $curr_key => $curr_val) {
+                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
+                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
+                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
+                    $depth--;
+            }
+            break;
+        case 'boolean' :
+        case 'NULL' :
+        case 'resource' :
+            if (true === $var) {
+                $results = 'true';
+            } elseif (false === $var) {
+                $results = 'false';
+            } elseif (null === $var) {
+                $results = 'null';
+            } else {
+                $results = htmlspecialchars((string) $var);
+            }
+            $results = '<i>' . $results . '</i>';
+            break;
+        case 'integer' :
+        case 'float' :
+            $results = htmlspecialchars((string) $var);
+            break;
+        case 'string' :
+            $results = strtr($var, $_replace);
+            if (strlen($var) > $length ) {
+                $results = substr($var, 0, $length - 3) . '...';
+            }
+            $results = htmlspecialchars('"' . $results . '"');
+            break;
+        case 'unknown type' :
+        default :
+            $results = strtr((string) $var, $_replace);
+            if (strlen($results) > $length ) {
+                $results = substr($results, 0, $length - 3) . '...';
+            }
+            $results = htmlspecialchars($results);
     }
+
     return $results;
 }
 
Index: xoops2jp/html/class/smarty/plugins/modifier.regex_replace.php
diff -u xoops2jp/html/class/smarty/plugins/modifier.regex_replace.php:1.2.8.2 xoops2jp/html/class/smarty/plugins/modifier.regex_replace.php:1.2.8.2.2.1
--- xoops2jp/html/class/smarty/plugins/modifier.regex_replace.php:1.2.8.2	Fri Jan 27 23:34:11 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.regex_replace.php	Tue Dec 26 23:26:51 2006
@@ -11,7 +11,7 @@
  *
  * Type:     modifier<br>
  * Name:     regex_replace<br>
- * Purpose:  regular epxression search/replace
+ * Purpose:  regular expression search/replace
  * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
  * @author   Monte Ohrt <monte at ohrt dot com>
@@ -22,10 +22,11 @@
  */
 function smarty_modifier_regex_replace($string, $search, $replace)
 {
-    if (preg_match('!\W(\w+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
         /* remove eval-modifier from $search */
-        $search = substr($search, 0, -strlen($match[1])) . str_replace('e', '', $match[1]);
+        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
+       
     return preg_replace($search, $replace, $string);
 }
 
Index: xoops2jp/html/class/smarty/plugins/outputfilter.trimwhitespace.php
diff -u xoops2jp/html/class/smarty/plugins/outputfilter.trimwhitespace.php:1.2.8.1 xoops2jp/html/class/smarty/plugins/outputfilter.trimwhitespace.php:1.2.8.1.2.1
--- xoops2jp/html/class/smarty/plugins/outputfilter.trimwhitespace.php:1.2.8.1	Sun Nov 20 17:05:54 2005
+++ xoops2jp/html/class/smarty/plugins/outputfilter.trimwhitespace.php	Tue Dec 26 23:26:51 2006
@@ -49,14 +49,14 @@
     // preceeded by a php close tag.
     $source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
 
-    // replace script blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
+    // replace textarea blocks
+    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
 
     // replace pre blocks
     smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
 
-    // replace textarea blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
+    // replace script blocks
+    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
 
     return $source;
 }

From nobunobu ＠ users.sourceforge.jp  Tue Dec 26 23:30:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 26 Dec 2006 23:30:54 +0900
Subject: [xoops-cvslog 6058] CVS update: xoops2jp/html/core
Message-ID: <20061226143054.B50BB2AC1B5@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_ActionFilter.class.php
diff -u xoops2jp/html/core/XCube_ActionFilter.class.php:1.1.2.1 xoops2jp/html/core/XCube_ActionFilter.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_ActionFilter.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_ActionFilter.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_ActionFilter.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_ActionFilter.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.3 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.3	Sat Oct  7 18:26:31 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php	Tue Dec 26 23:30:54 2006
@@ -1,14 +1,18 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_ActionForm.class.php,v 1.1.2.3 2006/10/07 09:26:31 minahito Exp $
+ * @version $Id: XCube_ActionForm.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
-if (!defined('XOOPS_ROOT_PATH')) exit();
+if (!defined('XCUBE_CORE_PATH')) define('XCUBE_CORE_PATH', dirname(__FILE__));
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_Property.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_Validator.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_FormFile.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_Property.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_Validator.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_FormFile.class.php';
 
 //
 // TODO The difference of array and no-array is too big.
Index: xoops2jp/html/core/XCube_Controller.class.php
diff -u xoops2jp/html/core/XCube_Controller.class.php:1.1.2.8 xoops2jp/html/core/XCube_Controller.class.php:1.1.2.9
--- xoops2jp/html/core/XCube_Controller.class.php:1.1.2.8	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/core/XCube_Controller.class.php	Tue Dec 26 23:30:54 2006
@@ -1,26 +1,30 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Controller.class.php,v 1.1.2.8 2006/12/02 15:36:01 nobunobu Exp $
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.9 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
-if (!defined('XOOPS_ROOT_PATH')) exit();
+if (!defined('XCUBE_CORE_PATH')) define('XCUBE_CORE_PATH', dirname(__FILE__));
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionFilter.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_RenderSystem.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_Delegate.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_ActionFilter.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_RenderSystem.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_Delegate.class.php';
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_Object.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_Service.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_Object.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_Service.class.php';
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_Identity.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_RoleManager.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_Permission.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_Identity.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_RoleManager.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_Permission.class.php';
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_LanguageManager.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_LanguageManager.class.php';
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_ActionForm.class.php";
-require_once XOOPS_ROOT_PATH . "/core/XCube_TextFilter.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_ActionForm.class.php';
+require_once XCUBE_CORE_PATH . '/XCube_TextFilter.class.php';
 
 /**
  * Virtual or Actual front controller class.
@@ -453,7 +457,7 @@
 	 */
 	function &_createServiceManager()
 	{
-		require_once XOOPS_ROOT_PATH . "/core/XCube_ServiceManager.class.php";
+		require_once XCUBE_CORE_PATH . '/XCube_ServiceManager.class.php';
 		$serviceManager =& new XCube_ServiceManager();
 		return $serviceManager;
 	}
Index: xoops2jp/html/core/XCube_Delegate.class.php
diff -u xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.3 xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.3	Thu Oct 19 22:30:41 2006
+++ xoops2jp/html/core/XCube_Delegate.class.php	Tue Dec 26 23:30:54 2006
@@ -1,8 +1,12 @@
 <?php
 /**
- * @version $Id: XCube_Delegate.class.php,v 1.1.2.3 2006/10/19 13:30:41 minahito Exp $
+ *
+ * @package XCube
+ * @version $Id: XCube_Delegate.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
- 
 
 /**
  * This class is an expression of reference in delegation mechanism for PHP4.
Index: xoops2jp/html/core/XCube_FormFile.class.php
diff -u xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.2 xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.2	Mon Oct 16 16:38:16 2006
+++ xoops2jp/html/core/XCube_FormFile.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_FormFile.class.php,v 1.1.2.2 2006/10/16 07:38:16 minahito Exp $
+ * @version $Id: XCube_FormFile.class.php,v 1.1.2.3 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
@@ -175,9 +179,9 @@
 	 * @param $prefix string Prefix for random string.
 	 * @param $salt string Salt for generating token.
 	 */
-	function setRandomToBodyName($prefix,$salt=XOOPS_SALT)
+	function setRandomToBodyName($prefix,$salt='')
 	{
-		$filename = $prefix . $this->_getRandomString() . "." . $this->getExtension();
+		$filename = $prefix . $this->_getRandomString($salt) . "." . $this->getExtension();
 		$this->setFileName($filename);
 	}
 	
@@ -186,9 +190,9 @@
 	 * @param $prefix string Prefix for random string.
 	 * @param $salt string Salt for generating token.
 	 */
-	function setRandomToFilename($prefix,$salt=XOOPS_SALT)
+	function setRandomToFilename($prefix,$salt='')
 	{
-		$filename = $prefix . $this->_getRandomString();
+		$filename = $prefix . $this->_getRandomString($salt);
 		$this->setFileName($filename);
 	}
 	
@@ -197,8 +201,9 @@
 	@param $salt string Salt for generating token.
 	@return string
 	*/
-	function _getRandomString($salt=XOOPS_SALT)
+	function _getRandomString($salt='')
 	{
+	    if (empty($salt)) $salt = XOOPS_SALT;
 		srand( microtime() *1000000);
 		return md5($salt . rand());
 	}
@@ -232,7 +237,7 @@
 	 * @param $salt string Salt for generating token.
 	 * @return bool
 	 */
-	function saveAsRandBody($dir,$prefix='',$salt=XOOPS_SALT)
+	function saveAsRandBody($dir,$prefix='',$salt='')
 	{
 		$this->setRandomToBodyName($prefix,$salt);
 		return $this->saveAs($dir);
@@ -247,7 +252,7 @@
 	 * @param $salt string Salt for generating token.
 	 * @return bool
 	 */
-	function saveAsRand($dir,$prefix='',$salt=XOOPS_SALT)
+	function saveAsRand($dir,$prefix='',$salt='')
 	{
 		$this->setRandomToFileName($prefix,$salt);
 		return $this->saveAs($dir);
Index: xoops2jp/html/core/XCube_HttpContext.class.php
diff -u xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.5 xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.6
--- xoops2jp/html/core/XCube_HttpContext.class.php:1.1.2.5	Sat Oct 21 20:08:34 2006
+++ xoops2jp/html/core/XCube_HttpContext.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_HttpContext.class.php,v 1.1.2.5 2006/10/21 11:08:34 minahito Exp $
+ * @version $Id: XCube_HttpContext.class.php,v 1.1.2.6 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 define("XCUBE_CONTEXT_TYPE_DEFAULT", "web_browser");
Index: xoops2jp/html/core/XCube_Identity.class.php
diff -u xoops2jp/html/core/XCube_Identity.class.php:1.1.2.1 xoops2jp/html/core/XCube_Identity.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Identity.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Identity.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Identity.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_Identity.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_LanguageManager.class.php
diff -u xoops2jp/html/core/XCube_LanguageManager.class.php:1.1.2.1 xoops2jp/html/core/XCube_LanguageManager.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_LanguageManager.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_LanguageManager.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_LanguageManager.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_LanguageManager.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_Object.class.php
diff -u xoops2jp/html/core/XCube_Object.class.php:1.1.2.1 xoops2jp/html/core/XCube_Object.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Object.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Object.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Object.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_Object.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 function S_PUBLIC_VAR($definition)
Index: xoops2jp/html/core/XCube_PageNavigator.class.php
diff -u xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.7 xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.8
--- xoops2jp/html/core/XCube_PageNavigator.class.php:1.1.2.7	Fri Oct 13 18:59:16 2006
+++ xoops2jp/html/core/XCube_PageNavigator.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_PageNavigator.class.php,v 1.1.2.7 2006/10/13 09:59:16 minahito Exp $
+ * @version $Id: XCube_PageNavigator.class.php,v 1.1.2.8 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 define('XCUBE_PAGENAVI_START', 1);
Index: xoops2jp/html/core/XCube_Permission.class.php
diff -u xoops2jp/html/core/XCube_Permission.class.php:1.1.2.1 xoops2jp/html/core/XCube_Permission.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Permission.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Permission.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Permission.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_Permission.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_Property.class.php
diff -u xoops2jp/html/core/XCube_Property.class.php:1.1.2.5 xoops2jp/html/core/XCube_Property.class.php:1.1.2.6
--- xoops2jp/html/core/XCube_Property.class.php:1.1.2.5	Fri Nov 17 19:38:55 2006
+++ xoops2jp/html/core/XCube_Property.class.php	Tue Dec 26 23:30:54 2006
@@ -1,11 +1,13 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Property.class.php,v 1.1.2.5 2006/11/17 10:38:55 minahito Exp $
+ * @version $Id: XCube_Property.class.php,v 1.1.2.6 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
 /**
  * Defines a interface for the property class group.
  */
Index: xoops2jp/html/core/XCube_RenderCache.class.php
diff -u xoops2jp/html/core/XCube_RenderCache.class.php:1.1.2.1 xoops2jp/html/core/XCube_RenderCache.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_RenderCache.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_RenderCache.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_RenderCache.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_RenderCache.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 class XCube_RenderCache
Index: xoops2jp/html/core/XCube_RenderSystem.class.php
diff -u xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.4 xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_RenderSystem.class.php:1.1.2.4	Sat Nov 11 18:37:24 2006
+++ xoops2jp/html/core/XCube_RenderSystem.class.php	Tue Dec 26 23:30:54 2006
@@ -1,11 +1,13 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.4 2006/11/11 09:37:24 minahito Exp $
+ * @version $Id: XCube_RenderSystem.class.php,v 1.1.2.5 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
- if (!defined('XOOPS_ROOT_PATH')) exit();
-
 define("XCUBE_RENDER_MODE_NORMAL",1);
 define("XCUBE_RENDER_MODE_DIALOG",2);
 
Index: xoops2jp/html/core/XCube_RoleManager.class.php
diff -u xoops2jp/html/core/XCube_RoleManager.class.php:1.1.2.1 xoops2jp/html/core/XCube_RoleManager.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_RoleManager.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_RoleManager.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_RoleManager.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_RoleManager.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_Root.class.php
diff -u xoops2jp/html/core/XCube_Root.class.php:1.1.2.5 xoops2jp/html/core/XCube_Root.class.php:1.1.2.6
--- xoops2jp/html/core/XCube_Root.class.php:1.1.2.5	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/core/XCube_Root.class.php	Tue Dec 26 23:30:54 2006
@@ -1,10 +1,16 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Root.class.php,v 1.1.2.5 2006/12/02 15:36:01 nobunobu Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.6 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_HttpContext.class.php";
+if (!defined('XCUBE_CORE_PATH')) define('XCUBE_CORE_PATH', dirname(__FILE__));
+
+require_once XCUBE_CORE_PATH . '/XCube_HttpContext.class.php';
 
 /**
  * This class offers the access course same as global variable for a logic in old mechanism.
@@ -353,7 +359,7 @@
 		$ret = null;
 		
 		if ($classPath != null) {
-			require_once XOOPS_ROOT_PATH . $classPath . "/" . $className . ".class.php";
+			require_once $this->mSiteConfig['Cube']['Root'] . $classPath . "/" . $className . ".class.php";
 		}
 		
 		if (class_exists($className)) {
Index: xoops2jp/html/core/XCube_Service.class.php
diff -u xoops2jp/html/core/XCube_Service.class.php:1.1.2.1 xoops2jp/html/core/XCube_Service.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_Service.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_Service.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Service.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_Service.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_ServiceManager.class.php
diff -u xoops2jp/html/core/XCube_ServiceManager.class.php:1.1.2.1 xoops2jp/html/core/XCube_ServiceManager.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_ServiceManager.class.php:1.1.2.1	Fri Sep 29 17:13:22 2006
+++ xoops2jp/html/core/XCube_ServiceManager.class.php	Tue Dec 26 23:30:54 2006
@@ -1,12 +1,16 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_ServiceManager.class.php,v 1.1.2.1 2006/09/29 08:13:22 minahito Exp $
+ * @version $Id: XCube_ServiceManager.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
-if (!defined('XOOPS_ROOT_PATH')) exit();
+if (!defined('XCUBE_CORE_PATH')) define('XCUBE_CORE_PATH', dirname(__FILE__));
 
-require_once XOOPS_ROOT_PATH . "/core/XCube_Delegate.class.php";
+require_once XCUBE_CORE_PATH . '/XCube_Delegate.class.php';
 
 class XCube_ServiceUtils
 {
Index: xoops2jp/html/core/XCube_TextFilter.class.php
diff -u xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.1 xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.2
--- xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.1	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/core/XCube_TextFilter.class.php	Tue Dec 26 23:30:54 2006
@@ -1,8 +1,13 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_TextFilter.class.php,v 1.1.2.1 2006/12/02 15:36:01 nobunobu Exp $
+ * @version $Id: XCube_TextFilter.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
+
 /**
  *
  * @final
Index: xoops2jp/html/core/XCube_Theme.class.php
diff -u xoops2jp/html/core/XCube_Theme.class.php:1.1.2.3 xoops2jp/html/core/XCube_Theme.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_Theme.class.php:1.1.2.3	Mon Nov 27 15:53:52 2006
+++ xoops2jp/html/core/XCube_Theme.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Theme.class.php,v 1.1.2.3 2006/11/27 06:53:52 minahito Exp $
+ * @version $Id: XCube_Theme.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_Utils.class.php
diff -u xoops2jp/html/core/XCube_Utils.class.php:1.1.2.4 xoops2jp/html/core/XCube_Utils.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_Utils.class.php:1.1.2.4	Fri Oct 27 20:45:05 2006
+++ xoops2jp/html/core/XCube_Utils.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Utils.class.php,v 1.1.2.4 2006/10/27 11:45:05 minahito Exp $
+ * @version $Id: XCube_Utils.class.php,v 1.1.2.5 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**
Index: xoops2jp/html/core/XCube_Validator.class.php
diff -u xoops2jp/html/core/XCube_Validator.class.php:1.1.2.2 xoops2jp/html/core/XCube_Validator.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_Validator.class.php:1.1.2.2	Sat Oct  7 16:34:54 2006
+++ xoops2jp/html/core/XCube_Validator.class.php	Tue Dec 26 23:30:54 2006
@@ -1,7 +1,11 @@
 <?php
 /**
+ *
  * @package XCube
- * @version $Id: XCube_Validator.class.php,v 1.1.2.2 2006/10/07 07:34:54 ryuji_amano Exp $
+ * @version $Id: XCube_Validator.class.php,v 1.1.2.3 2006/12/26 14:30:54 nobunobu Exp $
+ * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
+ * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
+ *
  */
 
 /**

From nobunobu ＠ users.sourceforge.jp  Tue Dec 26 23:30:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 26 Dec 2006 23:30:54 +0900
Subject: [xoops-cvslog 6059] CVS update: xoops2jp/html/settings
Message-ID: <20061226143054.DD5132AC1D1@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.5 xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.6
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.5	Thu Dec 14 21:59:53 2006
+++ xoops2jp/html/settings/site_default.ini.php	Tue Dec 26 23:30:54 2006
@@ -2,6 +2,7 @@
 /**
 
 [Cube]
+Root=XOOPS_ROOT_PATH
 Controller=Legacy_Controller
 #SystemModules=system,legacy,user,legacyRender
 SystemModules=legacy,user,legacyRender,stdCache

From ryuji_amano ＠ users.sourceforge.jp  Thu Dec 28 12:16:27 2006
From: ryuji_amano ＠ users.sourceforge.jp (Ryuji AMANO)
Date: Thu, 28 Dec 2006 12:16:27 +0900
Subject: [xoops-cvslog 6060] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061228031627.086A42AC058@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/users.php
diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.7 xoops2jp/html/modules/user/class/users.php:1.1.2.7.2.1
--- xoops2jp/html/modules/user/class/users.php:1.1.2.7	Fri Aug 25 19:17:15 2006
+++ xoops2jp/html/modules/user/class/users.php	Thu Dec 28 12:16:26 2006
@@ -37,8 +37,8 @@
 		$this->initVar('last_login', XOBJ_DTYPE_INT, '0', false);
 		$this->initVar('umode', XOBJ_DTYPE_STRING, '', false, 10);
 		$this->initVar('uorder', XOBJ_DTYPE_BOOL, '0', false);
-		$this->initVar('notify_method', XOBJ_DTYPE_BOOL, '1', false);
-		$this->initVar('notify_mode', XOBJ_DTYPE_BOOL, '0', false);
+		$this->initVar('notify_method', XOBJ_DTYPE_INT, '1', false);
+		$this->initVar('notify_mode', XOBJ_DTYPE_INT, '0', false);
 		$this->initVar('user_occ', XOBJ_DTYPE_STRING, '', false, 100);
 		$this->initVar('bio', XOBJ_DTYPE_TEXT, '', false);
 		$this->initVar('user_intrest', XOBJ_DTYPE_STRING, '', false, 150);

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:09:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:09:44 +0900
Subject: [xoops-cvslog 6061] CVS update:
	xoops2jp/html/modules/legacy/admin/blocks
Message-ID: <20061228130944.835602AC0AC@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.3 xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.3	Sat Nov 11 18:34:33 2006
+++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php	Thu Dec 28 22:09:44 2006
@@ -68,10 +68,11 @@
 		$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";
+
+        $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}) " .
+               "AND ${mod}.hasadmin=1 " .
+               "ORDER BY ${mod}.weight, ${mod}.mid";
 
 		$result=$db->query($sql);
 		

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:15:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:15:22 +0900
Subject: [xoops-cvslog 6062] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061228131522.BE15C2AC0AC@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.18 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.19
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.18	Sat Dec 16 17:50:25 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Dec 28 22:15:22 2006
@@ -1074,34 +1074,36 @@
 		}
 	}
 	
-	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')));
+    function installBlockByInfo(&$info, &$module, &$log)
+    {
+        $handler =& xoops_gethandler('block');
+        $block =& $handler->create();
 
-			Legacy_ModuleInstallUtils::installBlockTemplate($block, $module, $log);
-			
-			return true;
-		}
-	}
+        $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);
+        $block->set('block_type', 'M');
+        $block->set('c_type', 1);
+
+        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.

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:24:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:24:51 +0900
Subject: [xoops-cvslog 6063] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20061228132451.1CB062AC045@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ModuleListAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/actions/ModuleListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/actions/ModuleListAction.class.php:1.1.2.2	Sun Oct 15 00:55:15 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ModuleListAction.class.php	Thu Dec 28 22:24:50 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: ModuleListAction.class.php,v 1.1.2.2 2006/10/14 15:55:15 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.3 2006/12/28 13:24:50 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -67,26 +67,34 @@
 		return LEGACY_FRAME_VIEW_INPUT;
 	}
 
-	function _processSave(&$controller, &$xoopsUser)
-	{
-		$moduleHandler =& xoops_gethandler('module');
-		$t_objectArr =& $moduleHandler->getObjects();
-		
-		$successFlag = true;
-		foreach($t_objectArr as $module) {
-			$mid = $module->get('mid');
-			$module->set('name', $this->mActionForm->get('name', $mid));
-			$module->set('weight', $this->mActionForm->get('weight', $mid));
-			$module->set('isactive', $this->mActionForm->get('isactive', $mid));
-
-			//
-			// Store.
-			//
-			$successFlag &= $moduleHandler->insert($module);
-		}
-		
-		return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
-	}
+    function _processSave(&$controller, &$xoopsUser)
+    {
+        $moduleHandler =& xoops_gethandler('module');
+        $t_objectArr =& $moduleHandler->getObjects();
+
+        $successFlag = true;
+        foreach($t_objectArr as $module) {
+            $mid = $module->get('mid');
+            $olddata['name'] = $module->get('name');
+            $olddata['weight'] = $module->get('weight');
+            $olddata['isactive'] = $module->get('isactive');
+            $newdata['name'] = $this->mActionForm->get('name', $mid);
+            $newdata['weight'] = $this->mActionForm->get('weight', $mid);
+            $newdata['isactive'] = $this->mActionForm->get('isactive', $mid);
+            if ( count(array_diff_assoc($olddata, $newdata)) > 0 ) {
+                $module->set('name', $this->mActionForm->get('name', $mid));
+                $module->set('weight', $this->mActionForm->get('weight', $mid));
+                $module->set('isactive', $this->mActionForm->get('isactive', $mid));
+
+                //
+                // Store.
+                //
+                $successFlag &= $moduleHandler->insert($module);
+            }
+        }
+
+        return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
+    }
 
 	/**
 	 * To support a template writer, this send the list of mid that actionForm kept.

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:27:05 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:27:05 +0900
Subject: [xoops-cvslog 6064] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061228132705.0A2212AC045@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.8 xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php:1.1.2.8	Wed Nov 15 20:33:20 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstaller.class.php	Thu Dec 28 22:27:04 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: ModuleInstaller.class.php,v 1.1.2.8 2006/11/15 11:33:20 minahito Exp $
+ * @version $Id: ModuleInstaller.class.php,v 1.1.2.9 2006/12/28 13:27:04 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -125,7 +125,7 @@
                     $readPerm->setVar('gperm_name', 'module_read');
 
                     if (!$gpermHandler->insert($readPerm)) {
-                        $log->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
+                        $this->mLog->addError(_AD_LEGACY_ERROR_COULD_NOT_SET_READ_PERMISSION);
                     }
                 }
             } else {

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:51:59 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:51:59 +0900
Subject: [xoops-cvslog 6065] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20061228135159.E97BF2AC045@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.19 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.20
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.19	Thu Dec 28 22:15:22 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Thu Dec 28 22:51:59 2006
@@ -613,6 +613,7 @@
 		$tplfile->set('tpl_lastmodified', time());
 
 		if ($tplHandler->insert($tplfile)) {
+		    $log->addReport(XCube_Utils::formatMessage(_AD_LEGACY_MESSAGE_BLOCK_TEMPLATE_INSTALLED, $block->get('template')));
 			return true;
 		}
 		else {

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:52:00 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:52:00 +0900
Subject: [xoops-cvslog 6066] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20061228135200.19DCF2AC05C@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.6 xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.7
--- xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.6	Mon Nov 27 14:54:51 2006
+++ xoops2jp/html/modules/legacy/language/english/admin.php	Thu Dec 28 22:51:59 2006
@@ -226,6 +226,7 @@
 define('_AD_LEGACY_LANG_WEIGHT', "Weight");
 define('_AD_LEGACY_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled");
 define('_AD_LEGACY_MESSAGE_BLOCK_INSTALLED', "Block {0} has been installed");
+define('_AD_LEGACY_MESSAGE_BLOCK_TEMPLATE_INSTALLED', "Block Template '{0}' has been installed.");
 define('_AD_LEGACY_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
 define('_AD_LEGACY_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?");
 define('_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished.");

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 22:52:00 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 22:52:00 +0900
Subject: [xoops-cvslog 6067] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061228135200.3F8CE2AC045@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.7 xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.8
--- xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.7	Mon Nov 27 14:54:51 2006
+++ xoops2jp/html/modules/legacy/language/japanese/admin.php	Thu Dec 28 22:52:00 2006
@@ -226,6 +226,7 @@
 define('_AD_LEGACY_LANG_WEIGHT', "並び順");
 define('_AD_LEGACY_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "ブロック {0} をアンインストールしました");
 define('_AD_LEGACY_MESSAGE_BLOCK_INSTALLED', "ブロック {0} をインストールしました");
+define('_AD_LEGACY_MESSAGE_BLOCK_TEMPLATE_INSTALLED', "ブロックテンプレート {0} をインストールしました");
 define('_AD_LEGACY_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_LEGACY_MESSAGE_CONFIRM_DELETE', "以下のデータを本当に削除しますか？");
 define('_AD_LEGACY_MESSAGE_DATABASE_SETUP_FINISHED', "データベーステーブルのセットアップを終了しました");

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 23:15:43 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 23:15:43 +0900
Subject: [xoops-cvslog 6068] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20061228141543.410BA2AC045@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/SearchShowallbyuserAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/SearchShowallbyuserAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/SearchShowallbyuserAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/SearchShowallbyuserAction.class.php:1.1.2.2	Sun Oct 15 00:44:10 2006
+++ xoops2jp/html/modules/legacy/actions/SearchShowallbyuserAction.class.php	Thu Dec 28 23:15:43 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: SearchShowallbyuserAction.class.php,v 1.1.2.2 2006/10/14 15:44:10 minahito Exp $
+ * @version $Id: SearchShowallbyuserAction.class.php,v 1.1.2.3 2006/12/28 14:15:43 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -13,7 +13,7 @@
 {
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new Legacy_SearchShowallbyuserForm($this->mConfig['keyword_min']);
+		$this->mActionForm =& new Legacy_SearchShowallbyuserForm(0);
 		$this->mActionForm->prepare();
 	}
 	

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 23:17:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 23:17:48 +0900
Subject: [xoops-cvslog 6069] CVS update: xoops2jp/html/core
Message-ID: <20061228141748.7B0CB2AC045@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.4 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.4	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php	Thu Dec 28 23:17:48 2006
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_ActionForm.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_ActionForm.class.php,v 1.1.2.5 2006/12/28 14:17:48 nobunobu Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -135,7 +135,9 @@
 	{
 		if ($this->_mToken == null) {
 			srand(microtime() * 100000);
-			$this->_mToken = md5(XOOPS_SALT . uniqid(rand(), true));
+			$root=&XCube_Root::getSingleton();
+			$salt = $root->getSiteConfig('Cube', 'Salt');
+			$this->_mToken = md5($salt . uniqid(rand(), true));
 			
 			$_SESSION['XCUBE_TOKEN'][$this->getTokenName()] = $this->_mToken;
 		}
Index: xoops2jp/html/core/XCube_FormFile.class.php
diff -u xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.3 xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.3	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_FormFile.class.php	Thu Dec 28 23:17:48 2006
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_FormFile.class.php,v 1.1.2.3 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_FormFile.class.php,v 1.1.2.4 2006/12/28 14:17:48 nobunobu Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -203,7 +203,10 @@
 	*/
 	function _getRandomString($salt='')
 	{
-	    if (empty($salt)) $salt = XOOPS_SALT;
+		if (empty($salt)) {
+			$root=&XCube_Root::getSingleton();
+			$salt = $root->getSiteConfig('Cube', 'Salt');
+		}
 		srand( microtime() *1000000);
 		return md5($salt . rand());
 	}

From nobunobu ＠ users.sourceforge.jp  Thu Dec 28 23:17:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 28 Dec 2006 23:17:48 +0900
Subject: [xoops-cvslog 6070] CVS update: xoops2jp/html/settings
Message-ID: <20061228141748.A491B2AC061@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.6 xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.7
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.17.2.6	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/settings/site_default.ini.php	Thu Dec 28 23:17:48 2006
@@ -8,6 +8,7 @@
 SystemModules=legacy,user,legacyRender,stdCache
 RecommendedModules=pm
 RoleManager=Legacy_RoleManager
+Salt=XOOPS_SALT
 
 #
 # You can register plural render systems.

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 22:09:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 22:09:04 +0900
Subject: [xoops-cvslog 6071] CVS update:
	xoops2jp/html/modules/legacy/lib/nusoap
Message-ID: <20061230130904.8D18D2AC172@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/nusoap/class.soapclient.php
diff -u xoops2jp/html/modules/legacy/lib/nusoap/class.soapclient.php:1.1.2.1 xoops2jp/html/modules/legacy/lib/nusoap/class.soapclient.php:1.1.2.2
--- xoops2jp/html/modules/legacy/lib/nusoap/class.soapclient.php:1.1.2.1	Sat Oct 14 23:55:27 2006
+++ xoops2jp/html/modules/legacy/lib/nusoap/class.soapclient.php	Sat Dec 30 22:09:04 2006
@@ -5,12 +5,12 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soap_client higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient = new soap_client( string path [ ,boolean wsdl] );
 *
 * // call method, get results
 * echo $soapclient->call( string methodname [ ,array parameters] );
@@ -19,7 +19,7 @@
 * unset($soapclient);
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: class.soapclient.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: class.soapclient.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class soap_client extends nusoap_base  {
Index: xoops2jp/html/modules/legacy/lib/nusoap/nusoap.php
diff -u xoops2jp/html/modules/legacy/lib/nusoap/nusoap.php:1.1.2.1 xoops2jp/html/modules/legacy/lib/nusoap/nusoap.php:1.1.2.2
--- xoops2jp/html/modules/legacy/lib/nusoap/nusoap.php:1.1.2.1	Sat Oct 14 23:55:27 2006
+++ xoops2jp/html/modules/legacy/lib/nusoap/nusoap.php	Sat Dec 30 22:09:04 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-$Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+$Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -59,7 +59,7 @@
 * nusoap_base
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class nusoap_base {
@@ -83,7 +83,7 @@
 	 * @var string
 	 * @access private
 	 */
-	var $revision = '$Revision: 1.1.2.1 $';
+	var $revision = '$Revision: 1.1.2.2 $';
     /**
      * Current error string (manipulated by getError/setError)
 	 *
@@ -910,7 +910,7 @@
 * Mainly used for returning faults from deployed functions
 * in a server instance.
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access public
 */
 class soap_fault extends nusoap_base {
@@ -996,7 +996,7 @@
 * tutorials I refer to :)
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class XMLSchema extends nusoap_base  {
@@ -1899,7 +1899,7 @@
 * xsd:anyType and user-defined types.
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class soapval extends nusoap_base {
@@ -2000,7 +2000,7 @@
 * NOTE: PHP must be compiled with the CURL extension for HTTPS support
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access public
 */
 class soap_transport_http extends nusoap_base {
@@ -3038,7 +3038,7 @@
 * NOTE: WSDL functionality is experimental
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class soap_server extends nusoap_base {
@@ -4069,7 +4069,7 @@
 * parses a WSDL file, allows access to it's data, other utility methods
 * 
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access public 
 */
 class wsdl extends nusoap_base {
@@ -5794,7 +5794,7 @@
 * soap_parser class parses SOAP XML messages into native PHP values
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class soap_parser extends nusoap_base {
@@ -6387,12 +6387,12 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soap_client higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient = new soap_client( string path [ ,boolean wsdl] );
 *
 * // call method, get results
 * echo $soapclient->call( string methodname [ ,array parameters] );
@@ -6401,7 +6401,7 @@
 * unset($soapclient);
 *
 * @author   Dietrich Ayala <dietrich ＠ ganx4.com>
-* @version  $Id: nusoap.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoap.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class soap_client extends nusoap_base  {
Index: xoops2jp/html/modules/legacy/lib/nusoap/nusoapmime.php
diff -u xoops2jp/html/modules/legacy/lib/nusoap/nusoapmime.php:1.1.2.1 xoops2jp/html/modules/legacy/lib/nusoap/nusoapmime.php:1.1.2.2
--- xoops2jp/html/modules/legacy/lib/nusoap/nusoapmime.php:1.1.2.1	Sat Oct 14 23:55:27 2006
+++ xoops2jp/html/modules/legacy/lib/nusoap/nusoapmime.php	Sat Dec 30 22:09:04 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-$Id: nusoapmime.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+$Id: nusoapmime.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -42,10 +42,10 @@
 *
 * @author   Scott Nichol <snichol ＠ sourceforge.net>
 * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoapmime.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
-class soapclientmime extends soapclient {
+class soapclientmime extends soap_client {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
 	 * data, filename, contenttype, cid
@@ -262,7 +262,7 @@
 *
 * @author   Scott Nichol <snichol ＠ sourceforge.net>
 * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php,v 1.1.2.1 2006/10/14 14:55:27 minahito Exp $
+* @version  $Id: nusoapmime.php,v 1.1.2.2 2006/12/30 13:09:04 nobunobu Exp $
 * @access   public
 */
 class nusoapservermime extends soap_server {

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 22:10:11 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 22:10:11 +0900
Subject: [xoops-cvslog 6072] CVS update: xoops2jp/docs
Message-ID: <20061230131011.468742AC16F@users.sourceforge.jp>

Index: xoops2jp/docs/COPYING.txt
diff -u xoops2jp/docs/COPYING.txt:1.1 xoops2jp/docs/COPYING.txt:1.1.10.1
--- xoops2jp/docs/COPYING.txt:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/docs/COPYING.txt	Sat Dec 30 22:10:11 2006
@@ -1,88 +1,47 @@
-GNU GENERAL PUBLIC LICENSE Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it.  By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.  This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it.  (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.)  You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have.  You must make sure that they, too, receive or can get the source code.  And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software.  If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.  We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary.  To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-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
-
+---------------------------------------------------------
+Copyright and License notice about XOOPS Cube Legacy 2.1.
+---------------------------------------------------------
+
+Most of the files included in XOOPS Cube Legacy 2.1 packages are licensed under 
+the "GNU PUBLIC LICENSE VERSION 2.0". (see /docs/GPL_V2.txt)
+
+ Many of these files are delivered from 
+  -XOOPS 2.0.9.3
+    Copyright 2000 XOOPS Project
+    http://www.xoops.org
+
+ But the other files are newly added  or completely rewritten by XOOPS Cube Legacy Project.
+    Copyright 2005, 2006 XOOPSCube.org
+    http://xoopscube.org
+
+But some special files are licensed under the other license models those can co-exist with GPL V2 files.
+
+*Licensed under the "Modified BSD License"  (see /docs/ModifiedBSD.txt)
+  -XOOPS Cube Core Files (/html/core/*)  
+     Copyright 2005, 2006 XOOPSCube.org
+     http://xoopscube.org
+     (These files are developed by XOOPS Cube Core Project and are fully isolated from
+     XOOPS files. Then we decide to change the license modle from GPL to Modified BSD.)
+
+*Licensed under the "GNU LESSER GENERAL PUBLIC LICENSE Version 2.1"  (see /docs/LGPL_V2_1.txt)
+  -Smarty (/html/class/smarty/*)
+     Copyright (c) 2001-2005 New Digital Group, Inc. All rights reserved. 
+     (http://smarty.php.net/)
+  -PHPDownloader(/html/classs/class.tar.php, /html/classs/class.zipfile.php)
+     Copyright (c) 2002 - www.ipunkt.biz (rok)
+     (http://www.ipunkt.biz/service/php-downloader/index.html)
+  -Snoopy(/html/classs/class.tar.php)
+     Copyright (c): 1999-2000 ispi, all rights reserved
+     (http://sourceforge.net/projects/snoopy/)
+  -PHPMailer(/html/classs/mail/phpmailer/*)
+     Copyright (C) 2001 - 2003  Brent R. Matzelle
+     (http://phpmailer.sourceforge.net/)
+  -eXtremePHP (/html/classs/xml/saxparser.php, /html/classs/xml/xmltaghandler.php)
+     Copyright (C) 2001 - eXtremePHP Ken Egervari <ken ＠ extremephp.org> Remi Michalski <remi ＠ extremephp.org>
+     http://www.extremephp.org/
+  -The Coolest DHTML Calendar(/html/include/calendar.js, /html/include/calendar-blue.css)
+     Copyright Mihai Bazon, 2002
+     http://sourceforge.net/projects/jscalendar
+  -NuSOAP modules/legacy/lib/nusoap/ 
+     Copyright (c) 2002 NuSphere Corporation
+     http://dietrich.ganx4.com/nusoap
\ No newline at end of file
Index: xoops2jp/docs/GPL_V2.txt
diff -u /dev/null xoops2jp/docs/GPL_V2.txt:1.1.2.1
--- /dev/null	Sat Dec 30 22:10:11 2006
+++ xoops2jp/docs/GPL_V2.txt	Sat Dec 30 22:10:11 2006
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    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
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.
+
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Index: xoops2jp/docs/LGPL_V2_1.txt
diff -u /dev/null xoops2jp/docs/LGPL_V2_1.txt:1.1.2.1
--- /dev/null	Sat Dec 30 22:10:11 2006
+++ xoops2jp/docs/LGPL_V2_1.txt	Sat Dec 30 22:10:11 2006
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be 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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+  11. 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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Index: xoops2jp/docs/ModifiedBSD.txt
diff -u /dev/null xoops2jp/docs/ModifiedBSD.txt:1.1.2.1
--- /dev/null	Sat Dec 30 22:10:11 2006
+++ xoops2jp/docs/ModifiedBSD.txt	Sat Dec 30 22:10:11 2006
@@ -0,0 +1,25 @@
+Copyright (c) 2005-2006, XOOPS Cube Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+  2. 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.
+  3. Neither the name of the author nor the names of its contributors may not
+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.
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 22:49:24 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 22:49:24 +0900
Subject: [xoops-cvslog 6073] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20061230134924.BA2402AC173@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6.2.1 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6.2.2
--- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.6.2.1	Thu Oct  5 19:18:12 2006
+++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php	Sat Dec 30 22:49:24 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserActivateAction.class.php,v 1.1.2.6.2.1 2006/10/05 10:18:12 minahito Exp $
+ * @version $Id: UserActivateAction.class.php,v 1.1.2.6.2.2 2006/12/30 13:49:24 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,7 +18,7 @@
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_getmodulehandler('users');
+		$handler =& xoops_getmodulehandler('users', 'user');
 		return $handler;
 	}
 	
@@ -62,9 +62,9 @@
 		$this->mObjectHandler->insert($this->mObject, true);
 
 		if ($this->mConfig['activation_type'] == 2) {
-			$builder =& new RegistAdminCommitMailBuilder();
-			$director =& new UserRegistMailDirector($this->mObject, $controller->mRoot->mContext->getXoopsConfig(), $this->mConfig);
-			$director->contruct($builder);
+			$builder =& new User_RegistAdminCommitMailBuilder();
+			$director =& new User_UserRegistMailDirector($builder, $this->mObject, $controller->mRoot->mContext->getXoopsConfig(), $this->mConfig);
+			$director->contruct();
 			$mailer=&$builder->getResult();
 			if ($mailer->send()) {
 				$controller->executeRedirect(XOOPS_URL . '/', 5, sprintf(_MD_USER_MESSAGE_ACTVMAILOK, $this->mObject->get('uname')));

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 22:51:40 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 22:51:40 +0900
Subject: [xoops-cvslog 6074] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20061230135140.804AA2AC17D@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.2 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8.2.3
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.8.2.2	Fri Nov 10 20:30:00 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Sat Dec 30 22:51:40 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: RegistMailBuilder.class.php,v 1.1.2.8.2.2 2006/11/10 11:30:00 minahito Exp $
+ * @version $Id: RegistMailBuilder.class.php,v 1.1.2.8.2.3 2006/12/30 13:51:40 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -125,7 +125,6 @@
 	{
 		$memberHandler=&xoops_gethandler('member');
 		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
-		$this->mMailer->setToUsers($user);
 	}
 	
 	function setFromUser($xoopsConfig)

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 22:52:41 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 22:52:41 +0900
Subject: [xoops-cvslog 6075] CVS update: xoops2jp/html/class
Message-ID: <20061230135241.A136A2AC177@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsmailer.php
diff -u xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.2 xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.3
--- xoops2jp/html/class/xoopsmailer.php:1.2.8.3.2.2	Tue Dec 26 16:03:29 2006
+++ xoops2jp/html/class/xoopsmailer.php	Sat Dec 30 22:52:41 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmailer.php,v 1.2.8.3.2.2 2006/12/26 07:03:29 nobunobu Exp $
+// $Id: xoopsmailer.php,v 1.2.8.3.2.3 2006/12/30 13:52:41 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -469,7 +469,8 @@
 	function setToUsers(&$user)
 	{
 		if ( !is_array($user) ) {
-			if ( strtolower(get_class($user)) == "xoopsuser" ) {
+		    //@ToDo $user should be either XoopsUser or UserUsersObject now
+			if ( in_array(strtolower(get_class($user)) , array("xoopsuser", "userusersobject"))) {
 				array_push($this->toUsers, $user);
 			}
 		} else {

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 23:01:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 23:01:25 +0900
Subject: [xoops-cvslog 6076] CVS update: xoops2jp/html/modules/user
Message-ID: <20061230140125.12A312AC176@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.10 xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.11
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.24.2.10	Sun Dec  3 00:58:31 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Sat Dec 30 23:01:24 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24.2.10 2006/12/02 15:58:31 nobunobu Exp $
+// $Id: xoops_version.php,v 1.1.2.24.2.11 2006/12/30 14:01:24 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -141,7 +141,7 @@
 		"title"=>"_MI_USER_CONF_NEW_NTF_GROUP",
 		"formtype"=>"group",
 		"valuetype"=>"int",
-		"default"=>1
+		"default"=>XOOPS_GROUP_ADMIN
 	);
 
 $modversion['config'][]=array (
@@ -159,7 +159,7 @@
 		"description"=>"_MI_USER_CONF_ACTV_GROUP_DESC",
 		"formtype"=>"group",
 		"valuetype"=>"int",
-		"default"=>1
+		"default"=>XOOPS_GROUP_ADMIN
 	);
 
 $modversion['config'][]=array (

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 23:42:12 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 23:42:12 +0900
Subject: [xoops-cvslog 6077] CVS update: xoops2jp/html/modules/legacy/forms
Message-ID: <20061230144212.9F48C2AC177@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php
diff -u xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.3 xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php:1.1.2.3	Tue Nov  7 17:24:51 2006
+++ xoops2jp/html/modules/legacy/forms/SearchResultsForm.class.php	Sat Dec 30 23:42:12 2006
@@ -45,12 +45,17 @@
 			$this->mQueries[] = $myts->addSlashes($this->get('query'));
 		}
 		else {
+			$query = $this->get('query');
+			if (defined('XOOPS_USE_MULTIBYTES')) {
+				$query = xoops_trim($query);
+			}
+
 			$separator = '/[\s,]+/';
 			if (defined('_MD_LEGACY_FORMAT_SEARCH_SEPARATOR')) {
 				$separator = _MD_LEGACY_FORMAT_SEARCH_SEPARATOR;
 			}
 		
-			$tmpArr = preg_split($separator, $this->get('query'));
+			$tmpArr = preg_split($separator, $query);
 			foreach ($tmpArr as $tmp) {
 				if (strlen($tmp) >= $this->_mKeywordMin) {
 					$this->mQueries[] = $myts->addSlashes($tmp);

From nobunobu ＠ users.sourceforge.jp  Sat Dec 30 23:42:12 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat, 30 Dec 2006 23:42:12 +0900
Subject: [xoops-cvslog 6078] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20061230144212.C8DEE2AC178@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/main.php
diff -u xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.3 xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.4
--- xoops2jp/html/modules/legacy/language/japanese/main.php:1.1.2.3	Sat Dec 16 20:44:56 2006
+++ xoops2jp/html/modules/legacy/language/japanese/main.php	Sat Dec 30 23:42:12 2006
@@ -11,7 +11,7 @@
 define('_MD_LEGACY_ERROR_SEARCH_NOT_ENABLED', "検索が無効です");
 define('_MD_LEGACY_ERROR_SEARCH_QUERY_REQUIRED', "有効な長さの検索キーワードを入力してください。");
 define('_MD_LEGACY_ERROR_YOU_MUST_UPLOAD', "画像をアップロードしてください");
-define('_MD_LEGACY_FORMAT_SEARCH_SEPARATOR', "/[\s,　]+/");
+define('_MD_LEGACY_FORMAT_SEARCH_SEPARATOR', "/[\s,]+/");
 define('_MD_LEGACY_LANG_ANDOR', "AndOr");
 define('_MD_LEGACY_LANG_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
 define('_MD_LEGACY_LANG_CODE', "コード");