From nobunobu ＠ users.sourceforge.jp  Mon Jan  1 02:37:49 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  1 Jan 2007 02:37:49 +0900
Subject: [xoops-cvslog 6079] CVS update: xoops2jp/html/kernel
Message-ID: <20061231173749.A0DDF2AC083@users.sourceforge.jp>

Index: xoops2jp/html/kernel/group.php
diff -u xoops2jp/html/kernel/group.php:1.2.8.4 xoops2jp/html/kernel/group.php:1.2.8.4.2.1
--- xoops2jp/html/kernel/group.php:1.2.8.4	Tue May 16 22:25:07 2006
+++ xoops2jp/html/kernel/group.php	Mon Jan  1 02:37:49 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: group.php,v 1.2.8.4 2006/05/16 13:25:07 nobunobu Exp $
+// $Id: group.php,v 1.2.8.4.2.1 2006/12/31 17:37:49 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -430,7 +430,7 @@
      * @param int $start offset of first entry to return
      * @return array array of users belonging to the group
      */
-    function getUsersByGroup($groupid, $limit=0, $start=0)
+    function &getUsersByGroup($groupid, $limit=0, $start=0)
     {
         $ret = array();
         $sql = 'SELECT uid FROM ' . $this->db->prefix('groups_users_link') . ' WHERE groupid='.intval($groupid);
@@ -448,7 +448,7 @@
     /**
      * @see getUsersByGroup
      */
-    function getUsersByNoGroup($groupid, $limit=0, $start=0)
+    function &getUsersByNoGroup($groupid, $limit=0, $start=0)
     {
         $ret = array();
 
Index: xoops2jp/html/kernel/member.php
diff -u xoops2jp/html/kernel/member.php:1.2.8.7 xoops2jp/html/kernel/member.php:1.2.8.7.2.1
--- xoops2jp/html/kernel/member.php:1.2.8.7	Sun Apr 23 00:53:00 2006
+++ xoops2jp/html/kernel/member.php	Mon Jan  1 02:37:49 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: member.php,v 1.2.8.7 2006/04/22 15:53:00 nobunobu Exp $
+// $Id: member.php,v 1.2.8.7.2.1 2006/12/31 17:37:49 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -330,7 +330,7 @@
      * @return array Array of {@link XoopsUser} objects (if $asobject is TRUE)
      * or of associative arrays matching the record structure in the database.
      */
-    function getUsersByGroup($group_id, $asobject = false, $limit = 0, $start = 0)
+    function &getUsersByGroup($group_id, $asobject = false, $limit = 0, $start = 0)
     {
         $user_ids =& $this->_mHandler->getUsersByGroup($group_id, $limit, $start);
         if (!$asobject) {
@@ -351,7 +351,7 @@
     /**
      * @see getUsersByGroup
      */
-    function getUsersByNoGroup($group_id, $asobject = false, $limit = 0, $start = 0)
+    function &getUsersByNoGroup($group_id, $asobject = false, $limit = 0, $start = 0)
     {
         $user_ids =& $this->_mHandler->getUsersByNoGroup($group_id, $limit, $start);
         if (!$asobject) {
@@ -410,7 +410,7 @@
     }
 
     /**
-     * logs in a user with an nd5 encrypted password
+     * logs in a user with an md5 encrypted password
      *
      * @param string $uname username
      * @param string $md5pwd password encrypted with md5

From nobunobu ＠ users.sourceforge.jp  Wed Jan  3 23:56:07 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  3 Jan 2007 23:56:07 +0900
Subject: [xoops-cvslog 6080] CVS update: xoops2jp/html/class
Message-ID: <20070103145607.3B42F2AC0AD@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.3 xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.4
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.3	Sat Dec  9 23:11:48 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Wed Jan  3 23:56:07 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.9.2.3 2006/12/09 14:11:48 nobunobu Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.9.2.4 2007/01/03 14:56:07 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -172,6 +172,37 @@
     }
 
     /**
+     * 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
@@ -244,6 +275,30 @@
     }
 
     /**
+     * Filters textarea data for display
+     * (This method makes overhead but needed for compatibility)
+     *
+     * @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) {
+        $text = $this->codePreConv($text, $xcode);
+        if ($html != 1) $text = $this->htmlSpecialChars($text);
+        $text = $this->makeClickable($text);
+        if ($smiley != 0) $text = $this->smiley($text);
+        if ($xcode != 0) $text = $this->xoopsCodeDecode($text, $image);
+        if ($br != 0) $text = $this->nl2Br($text);
+        $text = $this->codeConv($text, $xcode, $image);
+        return $text;
+    }
+
+    /**
      * Filters textarea form data in DB for display
      *
      * @param   string  $text
@@ -256,7 +311,7 @@
      **/
     function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
-        $text = $this->mTextFilter->ToShowTarea($text, $html, $smiley, $xcode, $image, $br, true);
+        $text = $this->_ToShowTarea($text, $html, $smiley, $xcode, $image, $br);
         return $text;
     }
 
@@ -274,7 +329,7 @@
     function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
         $text =& $this->stripSlashesGPC($text);
-        $text = $this->mTextFilter->ToShowTarea($text, $html, $smiley, $xcode, $image, $br, true);
+        $text = $this->_ToShowTarea($text, $html, $smiley, $xcode, $image, $br);
         return $text;
     }
 
@@ -337,14 +392,14 @@
      */
     function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
-        $text = $this->mTextFilter->ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1, true);
+        $text = $this->_ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1);
         return $text;
     }
 
     function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
     {
         $text = $this->oopsStripSlashesGPC($text);
-        $text = $this->mTextFilter->ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1, true);
+        $text = $this->_ToShowTarea($text, $allowhtml, $smiley, $bbcode, 1, 1);
         return $text;
     }
 

From nobunobu ＠ users.sourceforge.jp  Thu Jan  4 23:05:26 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu,  4 Jan 2007 23:05:26 +0900
Subject: [xoops-cvslog 6081] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20070104140526.07DEB2AC21C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php:1.1.2.4	Thu Nov  9 15:11:30 2006
+++ xoops2jp/html/modules/legacy/admin/actions/HelpAction.class.php	Thu Jan  4 23:05:25 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: HelpAction.class.php,v 1.1.2.4 2006/11/09 06:11:30 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.5 2007/01/04 14:05:25 nobunobu Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -146,7 +146,7 @@
 		$moduleHandler =& xoops_gethandler('module');
 		$this->mModuleObject =& $moduleHandler->getByDirname($this->_mDirname);
 		
-		$language =& $controller->mRoot->mContext->getXoopsConfig('language');
+		$language = $controller->mRoot->mContext->getXoopsConfig('language');
 
 		//
 		// TODO We must change the following lines to ActionForm.

From nobunobu ＠ users.sourceforge.jp  Sun Jan  7 00:30:44 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  7 Jan 2007 00:30:44 +0900
Subject: [xoops-cvslog 6082] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20070106153044.02D942AC101@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.5 xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/templates/comment_list.html:1.1.2.5	Fri Nov 10 20:29:15 2006
+++ xoops2jp/html/modules/legacy/admin/templates/comment_list.html	Sun Jan  7 00:30:43 2007
@@ -9,7 +9,7 @@
 <form method="get" action="./index.php">
   <input type="hidden" name="action" value="CommentList" />
   <select name="com_modid">
-    <option value="0"><{$smarty.const._AD_LEGACY_LANG_ALL_MODULE}></option>
+    <option value="0"><{$smarty.const._AD_LEGACY_LANG_ALL_MODULES}></option>
     <{foreach item=module from=$moduleArr}>
       <{if $pageNavi->mExtra.com_modid == $module->get('mid')}>
         <option value="<{$module->getShow('mid')}>" selected="selected"><{$module->getShow('name')}></option>

From nobunobu ＠ users.sourceforge.jp  Sun Jan  7 00:30:44 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  7 Jan 2007 00:30:44 +0900
Subject: [xoops-cvslog 6083] CVS update:
	xoops2jp/html/modules/legacy/language/english
Message-ID: <20070106153044.29A232AC102@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.7 xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.8
--- xoops2jp/html/modules/legacy/language/english/admin.php:1.1.2.7	Thu Dec 28 22:51:59 2006
+++ xoops2jp/html/modules/legacy/language/english/admin.php	Sun Jan  7 00:30:44 2007
@@ -5,7 +5,7 @@
 define('_AD_LEGACY_ERROR_BLOCK_TEMPLATE_INSTALL', "Could not install block template '{0}'");
 define('_AD_LEGACY_ERROR_BMODULE', "You must specify one or more modules as the target module in which to display the block.");
 define('_AD_LEGACY_ERROR_CASE_OF_ACTIVE_MODULE', "Can't uninstall active module. To uninstall, turn off the active-status of the module.");
-define('_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates　: {0}");
+define('_AD_LEGACY_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates : {0}");
 define('_AD_LEGACY_ERROR_COULD_NOT_INSERT_CONFIG', "Could not insert config '{0}'");
 define('_AD_LEGACY_ERROR_COULD_NOT_INSTALL_BLOCK', "Could not install '{0}' block.");
 define('_AD_LEGACY_ERROR_COULD_NOT_INSTALL_TEMPLATE', "Could not install '{0}' template.");
@@ -46,7 +46,6 @@
 define('_AD_LEGACY_LANG_ADMINMENU_NAME', "Name of Administration Menu");
 define('_AD_LEGACY_LANG_ADMINMENU_URL', "URL of Administration Menu");
 define('_AD_LEGACY_LANG_AGREE', "Agree");
-define('_AD_LEGACY_LANG_ALL_MODULE', "All modules");
 define('_AD_LEGACY_LANG_ALL_MODULES', "All modules");
 define('_AD_LEGACY_LANG_ALL_STATUS', "All status");
 define('_AD_LEGACY_LANG_AUTHOR', "author");
Index: xoops2jp/html/modules/legacy/language/english/main.php
diff -u xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.3 xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.4
--- xoops2jp/html/modules/legacy/language/english/main.php:1.1.2.3	Sat Dec 16 20:44:56 2006
+++ xoops2jp/html/modules/legacy/language/english/main.php	Sun Jan  7 00:30:44 2007
@@ -40,7 +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_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  Sun Jan  7 00:30:44 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  7 Jan 2007 00:30:44 +0900
Subject: [xoops-cvslog 6084] CVS update:
	xoops2jp/html/modules/legacy/language/japanese
Message-ID: <20070106153044.56FF82AC101@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.8 xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.9
--- xoops2jp/html/modules/legacy/language/japanese/admin.php:1.1.2.8	Thu Dec 28 22:52:00 2006
+++ xoops2jp/html/modules/legacy/language/japanese/admin.php	Sun Jan  7 00:30:44 2007
@@ -46,7 +46,6 @@
 define('_AD_LEGACY_LANG_ADMINMENU_NAME', "管理画面名");
 define('_AD_LEGACY_LANG_ADMINMENU_URL', "管理画面URL");
 define('_AD_LEGACY_LANG_AGREE', "同意する");
-define('_AD_LEGACY_LANG_ALL_MODULE', "すべてのモジュール");
 define('_AD_LEGACY_LANG_ALL_MODULES', "すべてのモジュール");
 define('_AD_LEGACY_LANG_ALL_STATUS', "すべてのステータス");
 define('_AD_LEGACY_LANG_AUTHOR', "作者");

From tom_g3x ＠ users.sourceforge.jp  Tue Jan  9 16:20:50 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue,  9 Jan 2007 16:20:50 +0900
Subject: [xoops-cvslog 6085] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20070109072050.2FE4A2AC196@users.sourceforge.jp>

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.3 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24.2.4
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.24.2.3	Sun Dec  3 00:50:20 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html	Tue Jan  9 16:20:50 2007
@@ -143,12 +143,13 @@
             <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->mOverride->getShow('tpl_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
             <a href="index.php?action=TplfileDelete&amp;tpl_id=<{$obj->mOverride->getShow('tpl_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
             <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->mOverride->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>
+            </td>
             <td class="legacyRender_list_control">
               <{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|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>
+            </td>
+            <td class="legacyRender_list_control">&nbsp;
           <{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>

From nobunobu ＠ users.sourceforge.jp  Wed Jan 10 17:09:26 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 10 Jan 2007 17:09:26 +0900
Subject: [xoops-cvslog 6086] CVS update: xoops2jp/html/modules/legacy/class
Message-ID: <20070110080926.3E8C72AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/class/blockctype.php
diff -u xoops2jp/html/modules/legacy/class/blockctype.php:1.1.2.2 xoops2jp/html/modules/legacy/class/blockctype.php:1.1.2.3
--- xoops2jp/html/modules/legacy/class/blockctype.php:1.1.2.2	Sun Oct 15 01:29:02 2006
+++ xoops2jp/html/modules/legacy/class/blockctype.php	Wed Jan 10 17:09:26 2007
@@ -37,7 +37,7 @@
 		return $ret;
 	}
 	
-	function get($id)
+	function &get($id)
 	{
 		if (isset($this->_mResults[$id])) {
 			return $this->_mResults[$id];

From nobunobu ＠ users.sourceforge.jp  Wed Jan 10 17:37:12 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 10 Jan 2007 17:37:12 +0900
Subject: [xoops-cvslog 6087] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20070110083712.3AC512AC1AD@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/BlockListAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/BlockListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/admin/actions/BlockListAction.class.php:1.1.2.3	Mon Oct 23 19:33:47 2006
+++ xoops2jp/html/modules/legacy/admin/actions/BlockListAction.class.php	Wed Jan 10 17:37:12 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: BlockListAction.class.php,v 1.1.2.3 2006/10/23 10:33:47 minahito Exp $
+ * @version $Id: BlockListAction.class.php,v 1.1.2.4 2007/01/10 08:37:12 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -60,13 +60,22 @@
 		foreach (array_keys($weightArr) as $bid) {
 			$block =& $handler->get($bid);
 			if (is_object($block) && $block->get('isactive') == 1 && $block->get('visible') == 1) {
-				$block->set('weight', $this->mActionForm->get('weight', $bid));
-				$block->set('side', $this->mActionForm->get('side', $bid));
-				$block->set('bcachetime', $this->mActionForm->get('bcachetime', $bid));
-				
-				if (!$handler->insert($block)) {
-					return LEGACY_FRAME_VIEW_ERROR;
-				}
+                $olddata['weight'] = $block->get('weight');
+                $olddata['side'] = $block->get('side');
+                $olddata['bcachetime'] = $block->get('bcachetime');
+                $newdata['weight'] = $this->mActionForm->get('weight', $bid);
+                $newdata['side'] = $this->mActionForm->get('side', $bid);
+                $newdata['bcachetime'] = $this->mActionForm->get('bcachetime', $bid);
+                if ( count(array_diff_assoc($olddata, $newdata)) > 0 ) {
+    				$block->set('weight', $this->mActionForm->get('weight', $bid));
+    				$block->set('side', $this->mActionForm->get('side', $bid));
+    				$block->set('bcachetime', $this->mActionForm->get('bcachetime', $bid));
+    				$block->set('last_modified', time());
+    				
+    				if (!$handler->insert($block)) {
+    					return LEGACY_FRAME_VIEW_ERROR;
+    				}
+    			}
 			}
 		}
 		

From nobunobu ＠ users.sourceforge.jp  Wed Jan 10 17:42:50 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 10 Jan 2007 17:42:50 +0900
Subject: [xoops-cvslog 6088] CVS update:
	xoops2jp/html/modules/legacy/admin/class
Message-ID: <20070110084250.A8A1B2AC1AD@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.20 xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.21
--- xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php:1.1.2.20	Thu Dec 28 22:51:59 2006
+++ xoops2jp/html/modules/legacy/admin/class/ModuleInstallUtils.class.php	Wed Jan 10 17:42:50 2007
@@ -387,8 +387,6 @@
 			return true;
 		}
 		
-		$handler =& xoops_gethandler('block');
-
 		$func_num = 0;
 		foreach ($definedBlocks as $block) {
 			$func_num++;

From nobunobu ＠ users.sourceforge.jp  Wed Jan 10 17:46:06 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed, 10 Jan 2007 17:46:06 +0900
Subject: [xoops-cvslog 6089] CVS update: xoops2jp/html/kernel
Message-ID: <20070110084606.210142AC094@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.14.2.2 xoops2jp/html/kernel/module.php:1.2.8.14.2.3
--- xoops2jp/html/kernel/module.php:1.2.8.14.2.2	Fri Nov 10 15:53:24 2006
+++ xoops2jp/html/kernel/module.php	Wed Jan 10 17:46:05 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.14.2.2 2006/11/10 06:53:24 minahito Exp $
+// $Id: module.php,v 1.2.8.14.2.3 2007/01/10 08:46:05 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -211,7 +211,7 @@
 		
         $this->modinfo =& $modversion;
 		
-		if (!isset($this->modinfo['version'])) {
+		if (isset($this->modinfo['version'])) {
 			$this->modinfo['version'] = floatval($this->modinfo['version']);
 		}
     }

From nobunobu ＠ users.sourceforge.jp  Thu Jan 11 14:10:15 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 11 Jan 2007 14:10:15 +0900
Subject: [xoops-cvslog 6090] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070111051015.792E02AC0DC@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.27 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.28
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.27	Sun Dec  3 00:36:01 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Thu Jan 11 14:10:15 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.27 2006/12/02 15:36:01 nobunobu Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.28 2007/01/11 05:10:15 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -314,7 +314,7 @@
 				//
 				if ($cacheInfo->isEnableCache() && $this->existActiveCacheFile($filepath, $blockProcedure->getCacheTime())) {
 					$content = $this->loadCache($filepath);
-					if ($blockProcedure->isDisplay()) {
+					if ($blockProcedure->isDisplay() && !empty($content)) {
 						$context->mAttributes['legacy_BlockShowFlags'][$blockProcedure->getEntryIndex()] = true;
 						$context->mAttributes['legacy_BlockContents'][$blockProcedure->getEntryIndex()][] = array(
 							'id' => $blockProcedure->getId(),

From tom_g3x ＠ users.sourceforge.jp  Thu Jan 11 21:38:31 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 11 Jan 2007 21:38:31 +0900
Subject: [xoops-cvslog 6091] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20070111123831.676822AC022@users.sourceforge.jp>

Index: xoops2jp/html/themes/cube_default/style.css
diff -u xoops2jp/html/themes/cube_default/style.css:1.1.2.1.2.3 xoops2jp/html/themes/cube_default/style.css:1.1.2.1.2.4
--- xoops2jp/html/themes/cube_default/style.css:1.1.2.1.2.3	Sun Dec  3 16:44:54 2006
+++ xoops2jp/html/themes/cube_default/style.css	Thu Jan 11 21:38:31 2007
@@ -503,11 +503,16 @@
 	padding:0 1em;
 	min-height:4em;
 	height:auto;
+	white-space: pre-wrap;       /* css-3 */
+	white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+	white-space: -pre-wrap;      /* Opera 4-6 */
+	white-space: -o-pre-wrap;    /* Opera 7 */
+	word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 /* for IExplorer */
 * html div.xoopsCode pre {
 	height:4em;
-	height:auto;   /* IE 6.x */
+	height:auto;	/* IE 6.x */
 	width:40em;
 }
 

From nobunobu ＠ users.sourceforge.jp  Sun Jan 14 01:25:20 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 14 Jan 2007 01:25:20 +0900
Subject: [xoops-cvslog 6092] CVS update: xoops2jp/html/kernel
Message-ID: <20070113162520.189C82AC2B6@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.14.2.3 xoops2jp/html/kernel/module.php:1.2.8.14.2.4
--- xoops2jp/html/kernel/module.php:1.2.8.14.2.3	Wed Jan 10 17:46:05 2007
+++ xoops2jp/html/kernel/module.php	Sun Jan 14 01:25:19 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.14.2.3 2007/01/10 08:46:05 nobunobu Exp $
+// $Id: module.php,v 1.2.8.14.2.4 2007/01/13 16:25:19 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -86,7 +86,7 @@
             $this->loadInfo($dirname, $verbose);
         }
         $this->setVar('name', $this->modinfo['name'], true);
-        $this->setVar('version', round(100 * floatval($this->modinfo['version'])));
+        $this->setVar('version', Legacy_Utils::convertVersionFromModinfoToInt($this->modinfo['version']));
         $this->setVar('dirname', $this->modinfo['dirname'], true);
         $hasmain = (isset($this->modinfo['hasMain']) && $this->modinfo['hasMain'] == 1) ? 1 : 0;
         $hasadmin = (isset($this->modinfo['hasAdmin']) && $this->modinfo['hasAdmin'] == 1) ? 1 : 0;
@@ -213,6 +213,8 @@
 		
 		if (isset($this->modinfo['version'])) {
 			$this->modinfo['version'] = floatval($this->modinfo['version']);
+		} else {
+		    $this->modinfo['version'] = 0;
 		}
     }
 

From nobunobu ＠ users.sourceforge.jp  Sun Jan 14 01:27:11 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 14 Jan 2007 01:27:11 +0900
Subject: [xoops-cvslog 6093] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070113162711.B72E62AC2AB@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.28 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.29
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.28	Thu Jan 11 14:10:15 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Sun Jan 14 01:27:11 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.28 2007/01/11 05:10:15 nobunobu Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.29 2007/01/13 16:27:11 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -679,8 +679,6 @@
 
 	function _setupSession()
 	{
-		global $xoopsDB;
-
 		$sessionHandler=&xoops_gethandler('session');
 		
 		session_set_save_handler( 

From nobunobu ＠ users.sourceforge.jp  Sun Jan 14 01:32:15 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 14 Jan 2007 01:32:15 +0900
Subject: [xoops-cvslog 6094] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20070113163215.297262AC2BA@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/actions/SearchAction.class.php
diff -u xoops2jp/html/modules/legacy/actions/SearchAction.class.php:1.1.2.2 xoops2jp/html/modules/legacy/actions/SearchAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/actions/SearchAction.class.php:1.1.2.2	Sun Oct 15 00:43:22 2006
+++ xoops2jp/html/modules/legacy/actions/SearchAction.class.php	Sun Jan 14 01:32:15 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: SearchAction.class.php,v 1.1.2.2 2006/10/14 15:43:22 minahito Exp $
+ * @version $Id: SearchAction.class.php,v 1.1.2.3 2007/01/13 16:32:15 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -18,7 +18,7 @@
 		if (is_object($service)) {
 			$client =& $root->mServiceManager->createClient($service);
 
-			$this->mModules =& $client->call('getActiveModules', array());
+			$this->mModules = $client->call('getActiveModules', array());
 		}
 		
 		return LEGACY_FRAME_VIEW_INDEX;

From minahito ＠ users.sourceforge.jp  Mon Jan 15 15:00:55 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 15 Jan 2007 15:00:55 +0900
Subject: [xoops-cvslog 6095] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070115060055.5AEA62AC0FB@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.29 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.30
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.29	Sun Jan 14 01:27:11 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Mon Jan 15 15:00:55 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.29 2007/01/13 16:27:11 nobunobu Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.30 2007/01/15 06:00:55 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -500,6 +500,9 @@
 				define('XOOPS_DB_PROXY', 1);
 			}
 		}
+		elseif ($_SERVER['REQUEST_METHOD'] != 'POST') {
+			define('XOOPS_DB_PROXY', 1);
+		}
 
 		$this->mDB =& XoopsDatabaseFactory::getDatabaseConnection();
 

From minahito ＠ users.sourceforge.jp  Wed Jan 17 14:40:42 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 14:40:42 +0900
Subject: [xoops-cvslog 6096] CVS update: xoops2jp/html/core
Message-ID: <20070117054042.1CB672AC18E@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Root.class.php
diff -u xoops2jp/html/core/XCube_Root.class.php:1.1.2.6 xoops2jp/html/core/XCube_Root.class.php:1.1.2.7
--- xoops2jp/html/core/XCube_Root.class.php:1.1.2.6	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_Root.class.php	Wed Jan 17 14:40:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_Root.class.php,v 1.1.2.6 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.7 2007/01/17 05:40:41 minahito Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -35,7 +35,11 @@
 	
 	var $mServiceManager = null;
 
-	var $mRenderSystems = array();
+	/**
+	 * @public
+	 * @remark Only the kernel system should access this member property.
+	 */
+	var $_mRenderSystems = array();
 	
 	var $mSiteConfig = array();
 	
@@ -259,7 +263,7 @@
 	{
 		return $this->mServiceManager;
 	}
-
+	
 	/**
 	 * Return the instance of the render system by the name. If the render
 	 * system specified by $name doesn't exist, raise fatal error. This member
@@ -270,23 +274,23 @@
 	 */
 	function &getRenderSystem($name)
 	{
-		if (isset($this->mRenderSystems[$name])) {
-			return $this->mRenderSystems[$name];
+		if (isset($this->_mRenderSystems[$name])) {
+			return $this->_mRenderSystems[$name];
 		}
 		
 		//
 		// create
 		//
 		$chunkName = $this->mSiteConfig['RenderSystems'][$name];
-		$this->mRenderSystems[$name] =& $this->_createInstance($this->mSiteConfig[$chunkName]['class'], $this->mSiteConfig[$chunkName]['path']);
+		$this->_mRenderSystems[$name] =& $this->_createInstance($this->mSiteConfig[$chunkName]['class'], $this->mSiteConfig[$chunkName]['path']);
 		
-		if (!is_object($this->mRenderSystems[$name])) {
+		if (!is_object($this->_mRenderSystems[$name])) {
 			die("NO");
 		}
 		
-		$this->mRenderSystems[$name]->prepare($this->mController);
+		$this->_mRenderSystems[$name]->prepare($this->mController);
 		
-		return $this->mRenderSystems[$name];
+		return $this->_mRenderSystems[$name];
 	}
 	
 	function setPermissionManager(&$manager)

From minahito ＠ users.sourceforge.jp  Wed Jan 17 14:52:37 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 14:52:37 +0900
Subject: [xoops-cvslog 6097] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070117055237.36AD02AC10D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.11 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.12
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.11	Sat Nov 11 18:34:44 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Wed Jan 17 14:52:37 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Module.class.php,v 1.1.2.11 2006/11/11 09:34:44 minahito Exp $
+ * @version $Id: Legacy_Module.class.php,v 1.1.2.12 2007/01/17 05:52:37 minahito Exp $
  */
 
  /**
@@ -191,8 +191,7 @@
 	 */	
 	function _createRenderTarget()
 	{
-		$root =& XCube_Root::getSingleton();
-		$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
+		$renderSystem =& $this->getRenderSystem();
 		
 		$this->mRender =& $renderSystem->createRenderTarget('main');
 		if ($this->mXoopsModule != null) {
@@ -202,6 +201,9 @@
 	
 	/**
 	 * Gets a name of the dependency render system.
+	 * @remark If this module depends on other systems than the main render
+	 *         system  by Legacy, override this.
+	 * @see getRenderSystem()
 	 * @return string
 	 */
 	function getRenderSystemName()
@@ -211,6 +213,20 @@
 	}
 	
 	/**
+	 * Gets the dependency render system.
+	 * @remark If this module uses the unregistered render system is used,
+	 *         override this.
+	 * @return XCube_RenderSystem
+	 */
+	function &getRenderSystem()
+	{
+		$root =& XCube_Root::getSingleton();
+		$renderSystem =& $root->getRenderSystem($this->getRenderSystemName());
+		
+		return $renderSystem;
+	}
+	
+	/**
 	 * Gets a value indicating whether this modules is an active.
 	 * @return bool
 	 */
@@ -247,7 +263,7 @@
 	{
 		$this->mCacheInfo =& new Legacy_ModuleCacheInformation();
 		$this->mCacheInfo->mURL = xoops_getenv('REQUEST_URI');
-		$this->mCacheInfo->setModule($xoopsModule);
+		$this->mCacheInfo->setModule($this->mXoopsModule);
 		
 		return $this->mCacheInfo;
 	}

From minahito ＠ users.sourceforge.jp  Wed Jan 17 15:00:21 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 15:00:21 +0900
Subject: [xoops-cvslog 6098] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20070117060021.32D6F2AC023@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2 xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2.2.1
--- xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2	Thu Jul 27 22:04:05 2006
+++ xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php	Wed Jan 17 15:00:21 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: DeleteOneAction.class.php,v 1.1.2.2 2006/07/27 13:04:05 minahito Exp $
+ * @version $Id: DeleteOneAction.class.php,v 1.1.2.2.2.1 2007/01/17 06:00:21 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -63,7 +63,7 @@
 	function executeViewCancel(&$controller, &$xoopsUser, &$render)
 	{
 		if (is_object($this->mObject)) {
-			$controller->executeForward(XOOPS_MODULE_URL . "/pm/index.php?action=read&msg_id=" . $this->mObject->get('msg_id'));
+			$controller->executeForward(XOOPS_URL . "/viewpmsg.php?msg_id=" . $this->mObject->get('msg_id'));
 		}
 		else {
 			$controller->executeForward(XOOPS_URL . "/viewpmsg.php");

From minahito ＠ users.sourceforge.jp  Wed Jan 17 15:00:35 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 15:00:35 +0900
Subject: [xoops-cvslog 6099] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20070117060035.914192AC023@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DefaultAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DefaultAction.class.php:1.1.2.2.2.4 xoops2jp/html/modules/pm/actions/DefaultAction.class.php:1.1.2.2.2.5
--- xoops2jp/html/modules/pm/actions/DefaultAction.class.php:1.1.2.2.2.4	Fri Oct 13 14:09:58 2006
+++ xoops2jp/html/modules/pm/actions/DefaultAction.class.php	Wed Jan 17 15:00:35 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: DefaultAction.class.php,v 1.1.2.2.2.4 2006/10/13 05:09:58 minahito Exp $
+ * @version $Id: DefaultAction.class.php,v 1.1.2.2.2.5 2007/01/17 06:00:35 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -37,7 +37,7 @@
 		$pmHandler =& xoops_gethandler('privmessage');
 		$total = $pmHandler->getCountByFromUid($xoopsUser->uid());
 
-		$this->mPageNavi =& new XCube_PageNavigator("./index.php", XCUBE_PAGENAVI_START);
+		$this->mPageNavi =& new XCube_PageNavigator(XOOPS_URL . "./viewpmsg.php", XCUBE_PAGENAVI_START);
 		$this->mPageNavi->setTotalItems($total);
 		$this->mPageNavi->fetch();
 

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:20:54 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:20:54 +0900
Subject: [xoops-cvslog 6100] CVS update: xoops2jp/html/include
Message-ID: <20070117072054.D5DF12AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_edit.php
diff -u xoops2jp/html/include/comment_edit.php:1.2.8.2.2.4 xoops2jp/html/include/comment_edit.php:1.2.8.2.2.5
--- xoops2jp/html/include/comment_edit.php:1.2.8.2.2.4	Sat Nov 11 18:33:49 2006
+++ xoops2jp/html/include/comment_edit.php	Wed Jan 17 16:20:54 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_edit.php,v 1.2.8.2.2.4 2006/11/11 09:33:49 minahito Exp $
+// $Id: comment_edit.php,v 1.2.8.2.2.5 2007/01/17 07:20:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -105,7 +105,9 @@
 	//
 	// Render comment-form to render buffer with using Legacy_RenderSystem.
 	//
-	$renderTarget =& new Legacy_RenderTargetMain();
+	$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+	$renderTarget =& $renderSystem->createRenderTarget('main');
+	
 	$renderTarget->setTemplateName("legacy_comment_edit.html");
 
 	$renderTarget->setAttribute("actionForm", $actionForm);
@@ -115,8 +117,7 @@
 	//
 	// Rendering
 	//
-	$renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-	$renderer->render($renderTarget);
+	$rendererSystem->render($renderTarget);
 
 	//
 	// Display now.
Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.5 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.6
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.5	Sat Nov 11 18:33:49 2006
+++ xoops2jp/html/include/comment_reply.php	Wed Jan 17 16:20:54 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.3.2.5 2006/11/11 09:33:49 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.6 2007/01/17 07:20:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -126,7 +126,9 @@
 //
 // Render comment-form to render buffer with using Legacy_RenderSystem.
 //
-$renderTarget =& new Legacy_RenderTargetMain();
+$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+$renderTarget =& $renderSystem->createRendeerTarget('main');
+
 $renderTarget->setTemplateName("legacy_comment_edit.html");
 
 $renderTarget->setAttribute("actionForm", $actionForm);
@@ -136,8 +138,7 @@
 //
 // Rendering
 //
-$renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-$renderer->render($renderTarget);
+$renderSystem->render($renderTarget);
 
 //
 // Display now.
Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.5.2.1 xoops2jp/html/include/comment_view.php:1.2.8.5.2.2
--- xoops2jp/html/include/comment_view.php:1.2.8.5.2.1	Sat Nov 11 18:33:55 2006
+++ xoops2jp/html/include/comment_view.php	Wed Jan 17 16:20:54 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.5.2.1 2006/11/11 09:33:55 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.5.2.2 2007/01/17 07:20:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -154,7 +154,9 @@
 			}
 		}
 		
-		$renderTarget =& new Legacy_RenderTargetMain();
+		$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+		$renderTarget =& $renderSystem->createRendeerTarget('main');
+
 		$renderTarget->setTemplateName("legacy_comment_navi.html");
 		$renderTarget->setAttribute("pageName", $comment_config['pageName']);
 		
@@ -206,8 +208,7 @@
 		$renderTarget->setAttribute("link_extra", $link_extra);
 		$renderTarget->setAttribute("postcomment_link", $postcomment_link);
 		
-		$renderer =& $root->getRenderSystem('Legacy_RenderSystem');
-		$renderer->render($renderTarget);
+		$renderSystem->render($renderTarget);
 		
 		//
 		// TODO We change raw string data, we must change template for guarding XSS.
Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.4 xoops2jp/html/include/comment_new.php:1.2.8.3.2.5
--- xoops2jp/html/include/comment_new.php:1.2.8.3.2.4	Sat Nov 11 18:33:49 2006
+++ xoops2jp/html/include/comment_new.php	Wed Jan 17 16:20:54 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_new.php,v 1.2.8.3.2.4 2006/11/11 09:33:49 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3.2.5 2007/01/17 07:20:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -127,7 +127,9 @@
 //
 // Render comment-form to render buffer with using Legacy_RenderSystem.
 //
-$renderTarget =& new Legacy_RenderTargetMain();
+$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
+$renderTarget =& $renderSystem->createRendeerTarget('main');
+
 $renderTarget->setTemplateName("legacy_comment_edit.html");
 
 $renderTarget->setAttribute("actionForm", $actionForm);
@@ -137,8 +139,7 @@
 //
 // Rendering
 //
-$renderer =& $root->getRenderSystem("Legacy_RenderSystem");
-$renderer->render($renderTarget);
+$rendererSystem->render($renderTarget);
 
 //
 // Display now.

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:33:52 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:33:52 +0900
Subject: [xoops-cvslog 6101] CVS update:
	xoops2jp/html/modules/legacyRender/admin/class
Message-ID: <20070117073352.730FD2AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4.2.1 xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4.2.2
--- xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php:1.1.2.4.2.1	Fri Nov 10 18:11:40 2006
+++ xoops2jp/html/modules/legacyRender/admin/class/LegacyTheme.class.php	Wed Jan 17 16:33:52 2007
@@ -47,9 +47,6 @@
 					if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
 						$manifesto = parse_ini_file($mnfFile, true);
 					}
-					elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
-						$manifesto = parse_ini_file($mnfFile, true);
-					}
 					
 					if(count($manifesto) > 0) {
 						//

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:34:12 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:34:12 +0900
Subject: [xoops-cvslog 6102] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20070117073412.4B6F42AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/theme.php
diff -u xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5.2.1 xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5.2.2
--- xoops2jp/html/modules/legacyRender/class/theme.php:1.1.2.5.2.1	Fri Nov 10 18:11:32 2006
+++ xoops2jp/html/modules/legacyRender/class/theme.php	Wed Jan 17 16:34:12 2007
@@ -22,9 +22,6 @@
 		if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
 			$this->mPackage = parse_ini_file($mnfFile, true);
 		}
-		elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
-			$this->mPackage = parse_ini_file($mnfFile, true);
-		}
 					
 		if (isset($this->mPackage['Manifesto'])) {
 			//
@@ -84,9 +81,6 @@
 					if (file_exists($mnfFile = $themeDir . "/manifesto.ini.php")) {
 						$manifesto = parse_ini_file($mnfFile, true);
 					}
-					elseif (file_exists($mnfFile = $themeDir . "/package.ini.php")) {
-						$manifesto = parse_ini_file($mnfFile, true);
-					}
 					
 					if(count($manifesto) > 0) {
 						//

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:34:30 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:34:30 +0900
Subject: [xoops-cvslog 6103] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20070117073430.71FFA2AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php
diff -u xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.2 xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.3
--- xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php:1.1.2.1.2.2	Fri Nov 10 18:11:26 2006
+++ xoops2jp/html/modules/legacyRender/kernel/DelegateFunctions.class.php	Wed Jan 17 16:34:30 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: DelegateFunctions.class.php,v 1.1.2.1.2.2 2006/11/10 09:11:26 minahito Exp $
+ * @version $Id: DelegateFunctions.class.php,v 1.1.2.1.2.3 2007/01/17 07:34:30 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -31,11 +31,6 @@
 							$results[] =& $theme;
 						}
 					}
-					elseif ($theme->loadManifesto($themeDir . "/package.ini.php")) {
-						if ($theme->mRenderSystemName == 'Legacy_RenderSystem') {
-							$results[] =& $theme;
-						}
-					}
 					else {
 						if (file_exists($themeDir . "/theme.html")) {
 							$theme->mName = $dirname;

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:43:29 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:43:29 +0900
Subject: [xoops-cvslog 6104] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070117074329.564232AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.12 xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.13
--- xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php:1.1.2.12	Wed Jan 17 14:52:37 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Module.class.php	Wed Jan 17 16:43:29 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Module.class.php,v 1.1.2.12 2007/01/17 05:52:37 minahito Exp $
+ * @version $Id: Legacy_Module.class.php,v 1.1.2.13 2007/01/17 07:43:29 minahito Exp $
  */
 
  /**
@@ -303,7 +303,8 @@
 	 * 
 	 * @return bool
 	 * @note Side menu blocks may not display the admin menu if this member
-	 * function returns false.
+	 *       function returns false.
+	 * @remark Controller fetches the list of modules from DB before. So, 'override' may not be able to change the process.
 	 */
 	function hasAdminIndex()
 	{
@@ -313,6 +314,7 @@
 	/**
 	 * Gets an absolute URL indicating the top page of this module for the
 	 * control panel side.
+	 * @remark Controller fetches the list of modules from DB before. So, 'override' may not be able to change the process.
 	 * @return string
 	 */
 	function getAdminIndex()
@@ -502,12 +504,18 @@
 		return $ret;
 	}
 	
+	/**
+	 * @final
+	 */
 	function hasAdminIndex()
 	{
 		$dmy =& $this->mXoopsModule->getInfo();
 		return isset($this->mXoopsModule->modinfo['adminindex']) && $this->mXoopsModule->modinfo['adminindex'] != null;
 	}
 	
+	/**
+	 * @final
+	 */
 	function getAdminIndex()
 	{
 		$dmy =& $this->mXoopsModule->getInfo();

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:46:36 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:46:36 +0900
Subject: [xoops-cvslog 6105] CVS update:
	xoops2jp/html/modules/legacy/lib/EasyLex
Message-ID: <20070117074636.B6C4B2AC1CC@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php
diff -u xoops2jp/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php:1.1.2.2 xoops2jp/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php:1.1.2.2	Mon Oct 30 18:54:56 2006
+++ xoops2jp/html/modules/legacy/lib/EasyLex/EasyLex_SQLScanner.class.php	Wed Jan 17 16:46:36 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package EasyLexSQL
- * @varsion $Id: EasyLex_SQLScanner.class.php,v 1.1.2.2 2006/10/30 09:54:56 minahito Exp $
+ * @varsion $Id: EasyLex_SQLScanner.class.php,v 1.1.2.3 2007/01/17 07:46:36 minahito Exp $
  * 
  * In the original BSD license, both occurrences of the phrase "COPYRIGHT
  * HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
@@ -88,7 +88,7 @@
  */
 class EasyLex_SQLScanner
 {
-	var $mTokens;
+	var $mTokens = array();
 	var $mStatus = EASYLEX_SQL_UNKNOWN;
 	
 	/**

From minahito ＠ users.sourceforge.jp  Wed Jan 17 16:50:32 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 16:50:32 +0900
Subject: [xoops-cvslog 6106] CVS update:
	xoops2jp/html/modules/legacy/admin/blocks
Message-ID: <20070117075032.5BEF82AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php
diff -u xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.2 xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.3
--- xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php:1.1.2.2	Sat Nov 11 18:34:33 2006
+++ xoops2jp/html/modules/legacy/admin/blocks/AdminActionSearch.class.php	Wed Jan 17 16:50:32 2007
@@ -27,7 +27,7 @@
 		return 0;
 	}
 
-	function enableCached()
+	function isEnableCache()
 	{
 		return false;
 	}
Index: xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php
diff -u 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.5
--- xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php:1.1.2.4	Thu Dec 28 22:09:44 2006
+++ xoops2jp/html/modules/legacy/admin/blocks/AdminSideMenu.class.php	Wed Jan 17 16:50:32 2007
@@ -38,7 +38,7 @@
 		return 0;
 	}
 
-	function enableCache()
+	function isEnableCache()
 	{
 		return false;
 	}

From minahito ＠ users.sourceforge.jp  Wed Jan 17 17:22:48 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 17:22:48 +0900
Subject: [xoops-cvslog 6107] CVS update: xoops2jp/html/core
Message-ID: <20070117082248.5730C2AC1B7@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_Delegate.class.php
diff -u xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.4 xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_Delegate.class.php:1.1.2.4	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_Delegate.class.php	Wed Jan 17 17:22:48 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_Delegate.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_Delegate.class.php,v 1.1.2.5 2007/01/17 08:22:48 minahito Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -294,6 +294,16 @@
 		}
 	}
 	
+	/**
+	 * Gets a value indicating whether this object has callback functions.
+	 * @public
+	 * @return bool
+	 */    
+    function isEmpty()
+    {
+    	return (count($this->_mCallbacks) == 0);
+    }
+    
 	function getID()
 	{
 	    return $this->_mUniqueID;
@@ -301,13 +311,6 @@
 }
 
 /**
- * Compatibility class name.
- */
-class XCube_NewDelegate extends XCube_Delegate
-{
-}
-
-/**
  * This is the agent of un-registered delegate objects. Usually, connected
  * functions can't be added to un-registered delegates. When destination
  * delegates are un-registered yet, this manager is keeping those functions
@@ -424,6 +427,21 @@
 	    }
 	}
 	
+	/**
+	 * Gets a value indicating whether the specified delegate has callback functions.
+	 * @public
+	 * @param string $name delegate's name
+	 * @return bool
+	 */
+	function isEmpty($name)
+	{
+		if (isset($this->_mDelegates[$name])) {
+			return $this->_mDelegates[$name]->isEmpty();
+		}
+		
+		return isset($this->_mCallbacks[$name]) ? (count($this->_mCallbacks[$name]) == 0) : false;
+	}
+	
 	
    /**
     * 

From minahito ＠ users.sourceforge.jp  Wed Jan 17 19:14:46 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 19:14:46 +0900
Subject: [xoops-cvslog 6108] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20070117101446.B54692AC0F9@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.4 xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.4	Tue Nov  7 17:06:05 2006
+++ xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php	Wed Jan 17 19:14:46 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: BlockEditAction.class.php,v 1.1.2.4 2006/11/07 08:06:05 minahito Exp $
+ * @version $Id: BlockEditAction.class.php,v 1.1.2.5 2007/01/17 10:14:46 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -118,7 +118,7 @@
 			$gpermArr =&  $permHandler->getObjects($criteria);
 			foreach ($gpermArr as $gperm) {
 				if (!in_array($gperm->get('gperm_groupid', $currentGroupid))) {
-					$permHandler->delete($gperm, $force);
+					$permHandler->delete($gperm);
 				}
 			}
 			

From minahito ＠ users.sourceforge.jp  Wed Jan 17 19:15:20 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 17 Jan 2007 19:15:20 +0900
Subject: [xoops-cvslog 6109] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070117101520.B8B362AC0F9@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.8 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.9
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.8	Sun Dec 10 22:34:48 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Wed Jan 17 19:15:20 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.8 2006/12/10 13:34:48 nobunobu Exp $
+ * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.9 2007/01/17 10:15:20 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) die();
@@ -279,6 +279,23 @@
 			}
 		}
 		
+		//
+		// The block may have options, even it doesn't have end_func 
+		//
+		if ($this->_mBlock->get('options')) {
+			$root =& XCube_Root::getSingleton();
+	        $textFilter =& $root->getTextFilter();
+	        
+			$buf = "";
+			$options = explode('|', $this->_mBlock->get('options'));
+			foreach ($options as $val) {
+				$val = $textFilter->ToEdit($val);
+				$buf .= "<input type='hidden' name='options[]' value='${val}'/>";
+			}
+			
+			return $buf;
+		}
+
 		return null;
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Jan 18 14:05:11 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 18 Jan 2007 14:05:11 +0900
Subject: [xoops-cvslog 6110] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20070118050511.B91B92AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.5 xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php:1.1.2.5	Wed Jan 17 19:14:46 2007
+++ xoops2jp/html/modules/legacy/admin/actions/BlockEditAction.class.php	Thu Jan 18 14:05:11 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: BlockEditAction.class.php,v 1.1.2.5 2007/01/17 10:14:46 minahito Exp $
+ * @version $Id: BlockEditAction.class.php,v 1.1.2.6 2007/01/18 05:05:11 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -196,8 +196,21 @@
 		// Get html of option form rendered.
 		//
 		$this->_mOptionForm = $this->_getOptionForm();
+		$render->setAttribute('hasVisibleOptionForm', $this->_hasVisibleOptionForm());
 		$render->setAttribute('optionForm', $this->_mOptionForm);
 	}
+
+	/**
+	 * @private
+	 * Gets a value indicating whether the option form needs the row in the table to display its form.
+	 * @remark This method is requred for the compatibility with XOOPS2.
+	 * @return bool
+	 */	
+	function _hasVisibleOptionForm()
+	{
+		$block =& Legacy_Utils::createBlockProcedure($this->mObject);
+		return $block->_hasVisibleOptionForm();
+	}
 	
 	/**
 	 * Gets rendered HTML buffer of the block optional edit form.

From minahito ＠ users.sourceforge.jp  Thu Jan 18 14:05:22 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 18 Jan 2007 14:05:22 +0900
Subject: [xoops-cvslog 6111] CVS update:
	xoops2jp/html/modules/legacy/admin/templates
Message-ID: <20070118050522.B44FA2AC03B@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html
diff -u 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.6
--- xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html:1.1.2.5	Sun Dec  3 00:50:20 2006
+++ xoops2jp/html/modules/legacy/admin/templates/blockinstall_edit.html	Thu Jan 18 14:05:22 2007
@@ -19,6 +19,9 @@
 <form action="index.php?action=BlockInstallEdit" method="post">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+  <{if !$hasVisibleOptionForm && $optionForm != null}>
+    <{$optionForm}>
+  <{/if}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACY_LANG_BLOCK_INSTALL}></th>
@@ -67,7 +70,7 @@
         </select>
       </td>
     </tr>
-    <{if $optionForm != null}>
+    <{if $hasVisibleOptionForm && $optionForm != null}>
       <tr>
         <td class="head"><{$smarty.const._AD_LEGACY_LANG_OPTIONS}></td>
         <td class="<{cycle values="odd,even"}>">
Index: xoops2jp/html/modules/legacy/admin/templates/block_edit.html
diff -u 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.7
--- xoops2jp/html/modules/legacy/admin/templates/block_edit.html:1.1.2.6	Thu Dec 14 22:02:49 2006
+++ xoops2jp/html/modules/legacy/admin/templates/block_edit.html	Thu Jan 18 14:05:22 2007
@@ -19,6 +19,9 @@
 <form action="index.php?action=BlockEdit" method="post">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+  <{if !$hasVisibleOptionForm && $optionForm != null}>
+    <{$optionForm}>
+  <{/if}>
   <table class="outer">
     <tr>
       <th colspan="2"><{$smarty.const._AD_LEGACY_LANG_BLOCK_EDIT}></th>
@@ -73,7 +76,7 @@
         </select>
       </td>
     </tr>
-    <{if $optionForm != null}>
+    <{if $hasVisibleOptionForm && $optionForm != null}>
       <tr>
         <td class="head"><{$smarty.const._AD_LEGACY_LANG_OPTIONS}></td>
         <td class="<{cycle values="odd,even"}>">

From minahito ＠ users.sourceforge.jp  Thu Jan 18 14:05:32 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 18 Jan 2007 14:05:32 +0900
Subject: [xoops-cvslog 6112] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070118050532.0EBB42AC042@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.9 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.10
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.9	Wed Jan 17 19:15:20 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Thu Jan 18 14:05:31 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.9 2007/01/17 10:15:20 minahito Exp $
+ * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.10 2007/01/18 05:05:31 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) die();
@@ -207,6 +207,16 @@
 	}
 	
 	/**
+	 * @public
+	 * @breaf [Secret Agreement] Gets a value indicating whether the option form of this block needs the row to display the form.
+	 * @remark Only block management actions should use this method, and this method should not be overrided usually.
+	 */
+	function _hasVisibleOptionForm()
+	{
+		return true;
+	}
+	
+	/**
 	 * Gets rendered HTML buffer for the option form of the control panel.
 	 * @return string
 	 */
@@ -256,6 +266,11 @@
 		return $this->_mDisplayFlag;
 	}
 
+	function _hasVisibleOptionForm()
+	{
+		return ($this->_mBlock->get('func_file') && $this->_mBlock->get('edit_func'));
+	}
+	
 	function getOptionForm()
 	{
 		if ($this->_mBlock->get('func_file') && $this->_mBlock->get('edit_func')) {

From minahito ＠ users.sourceforge.jp  Thu Jan 18 14:17:25 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 18 Jan 2007 14:17:25 +0900
Subject: [xoops-cvslog 6113] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070118051725.1BFA72AC0D4@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.10 xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.11
--- xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php:1.1.2.10	Thu Jan 18 14:05:31 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php	Thu Jan 18 14:17:24 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.10 2007/01/18 05:05:31 minahito Exp $
+ * @version $Id: Legacy_BlockProcedure.class.php,v 1.1.2.11 2007/01/18 05:17:24 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) die();
@@ -222,6 +222,7 @@
 	 */
 	function getOptionForm()
 	{
+		return null;
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Thu Jan 18 19:20:41 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 18 Jan 2007 19:20:41 +0900
Subject: [xoops-cvslog 6114] CVS update: xoops2jp/html/class
Message-ID: <20070118102041.A5E5B2AC0D7@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.4 xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.5
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.9.2.4	Wed Jan  3 23:56:07 2007
+++ xoops2jp/html/class/module.textsanitizer.php	Thu Jan 18 19:20:41 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.9.2.4 2007/01/03 14:56:07 nobunobu Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.9.2.5 2007/01/18 10:20:41 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -126,7 +126,7 @@
      */
     function &smiley($text)
     {
-        $text = $this->mTextFilter->Smiley($text);
+        $text = $this->mTextFilter->smiley($text);
         return $text;
     }
 
@@ -138,7 +138,7 @@
      **/
     function &makeClickable(&$text)
     {
-        $text = $this->mTextFilter->MakeClickable($text);
+        $text = $this->mTextFilter->makeClickable($text);
 
         // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
@@ -159,7 +159,7 @@
      **/
     function &xoopsCodeDecode(&$text, $allowimage = 1)
     {
-        $text = $this->mTextFilter->ConvertXCode($text, $allowimage);
+        $text = $this->mTextFilter->convertXCode($text, $allowimage);
         
         // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
@@ -211,7 +211,7 @@
      */
     function &nl2Br($text)
     {
-        $ret = $this->mTextFilter->Nl2Br($text);
+        $ret = $this->mTextFilter->nl2Br($text);
         return $ret;
     }
 
@@ -254,9 +254,9 @@
     function &htmlSpecialChars($text, $forEdit=false)
     {
         if (!$forEdit) {
-            $ret = $this->mTextFilter->ToShow($text, true);
+            $ret = $this->mTextFilter->toShow($text, true);
         } else {
-            $ret = $this->mTextFilter->ToEdit($text);
+            $ret = $this->mTextFilter->toEdit($text);
         }
 		return $ret;
     }
@@ -373,14 +373,14 @@
      */
     function codePreConv($text, $xcode = 1) {
         if($xcode != 0){
-            $text = $this->mTextFilter->PreConvertXCode($text, $xcode);
+            $text = $this->mTextFilter->preConvertXCode($text, $xcode);
         }
         return $text;
     }
 
     function codeConv($text, $xcode = 1, $image = 1){
         if($xcode != 0){
-            $text = $this->mTextFilter->PostConvertXCode($text, $xcode);
+            $text = $this->mTextFilter->postConvertXCode($text, $xcode);
         }
         return $text;
     }
@@ -410,26 +410,26 @@
 
     function makeTboxData4Show($text, $smiley=0)
     {
-        $text = $this->mTextFilter->ToShow($text, true);
+        $text = $this->mTextFilter->toShow($text, true);
         return $text;
     }
 
     function makeTboxData4Edit($text)
     {
-        return $this->mTextFilter->ToEdit($text);
+        return $this->mTextFilter->toEdit($text);
     }
 
     function makeTboxData4Preview($text, $smiley=0)
     {
         $text = $this->stripSlashesGPC($text);
-        $text = $this->mTextFilter->ToShow($text, true);
+        $text = $this->mTextFilter->toShow($text, true);
         return $text;
     }
 
     function makeTboxData4PreviewInForm($text)
     {
         $text = $this->stripSlashesGPC($text);
-        return $this->mTextFilter->ToEdit($text);
+        return $this->mTextFilter->toEdit($text);
     }
 
     function makeTareaData4Save($text)
@@ -445,7 +445,7 @@
 
     function makeTareaData4Edit($text)
     {
-        return $this->mTextFilter->ToEdit($text);
+        return $this->mTextFilter->toEdit($text);
     }
 
     function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
@@ -458,12 +458,12 @@
     {
         //if magic_quotes_gpc is on, do stipslashes
         $text = $this->stripSlashesGPC($text);
-        return $this->mTextFilter->ToEdit($text);
+        return $this->mTextFilter->toEdit($text);
     }
 
     function makeTareaData4InsideQuotes($text)
     {
-        return $this->mTextFilter->ToShow($text, true);
+        return $this->mTextFilter->toShow($text, true);
     }
 
     function &oopsStripSlashesGPC($text)
@@ -488,7 +488,7 @@
 
     function &oopsHtmlSpecialChars($text)
     {
-        $ret = $this->mTextFilter->ToShow($text, true);
+        $ret = $this->mTextFilter->toShow($text, true);
         return $ret;
     }
 

From nobunobu ＠ users.sourceforge.jp  Thu Jan 18 19:20:41 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 18 Jan 2007 19:20:41 +0900
Subject: [xoops-cvslog 6115] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20070118102041.DCEB62AC0D7@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.2.2 xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.3
--- xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4.2.2	Sat Dec 16 23:10:29 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package Legacy
- * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4.2.3 2007/01/18 10:20:41 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
  *
@@ -58,7 +58,7 @@
 		$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']) ? $textFilter->ToEdit(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;
 
 		//
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.3 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.4
--- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.9.2.3	Sat Dec 16 23:10:29 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package Legacy
- * @version $Id: function.xoops_input.php,v 1.1.2.9.2.3 2006/12/16 14:10:29 nobunobu Exp $
+ * @version $Id: function.xoops_input.php,v 1.1.2.9.2.4 2007/01/18 10:20:41 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
  *
@@ -54,7 +54,7 @@
 		$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']) ? $textFilter->ToEdit($params['value']) : 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.4 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.5
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.4.2.4	Sat Dec 16 23:10:29 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package Legacy
- * @version $Id: function.xoops_optionsArray.php,v 1.1.2.4.2.4 2006/12/16 14:10:29 nobunobu Exp $
+ * @version $Id: function.xoops_optionsArray.php,v 1.1.2.4.2.5 2007/01/18 10:20:41 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
  *
@@ -41,8 +41,8 @@
     $root =& XCube_Root::getSingleton();
     $textFilter =& $root->getTextFilter();
 	foreach ($objectArr as $object) {
-	    $value = $textFilter->ToShow($object->get($params['value']));
-	    $label = $textFilter->ToShow($object->get($params['label']));
+	    $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.2.2 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.3
--- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.5.2.2	Sat Dec 16 23:10:29 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package Legacy
- * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @version $Id: function.xoops_textarea.php,v 1.1.2.5.2.3 2007/01/18 10:20:41 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
  *
@@ -53,7 +53,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']) ? $textFilter->ToEdit($params['value']) : 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 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.3
--- xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php:1.1.2.2	Sat Dec 16 23:10:29 2006
+++ xoops2jp/html/class/smarty/plugins/modifier.xoops_escape.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package Legacy
- * @version $Id: modifier.xoops_escape.php,v 1.1.2.2 2006/12/16 14:10:29 nobunobu Exp $
+ * @version $Id: modifier.xoops_escape.php,v 1.1.2.3 2007/01/18 10:20:41 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
  *
@@ -29,10 +29,10 @@
     $textFilter =& $root->getTextFilter();
     switch ($esc_type) {
         case 'show':
-            return $textFilter->ToShow($string);
+            return $textFilter->toShow($string);
 
         case 'edit':
-            return $textFilter->ToEdit($string);
+            return $textFilter->toEdit($string);
 
         case 'plain':
         case 'link':

From nobunobu ＠ users.sourceforge.jp  Thu Jan 18 19:20:42 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 18 Jan 2007 19:20:42 +0900
Subject: [xoops-cvslog 6116] CVS update: xoops2jp/html/core
Message-ID: <20070118102042.108A12AC0E4@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_TextFilter.class.php
diff -u xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.2 xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.3
--- xoops2jp/html/core/XCube_TextFilter.class.php:1.1.2.2	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_TextFilter.class.php	Thu Jan 18 19:20:41 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_TextFilter.class.php,v 1.1.2.2 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_TextFilter.class.php,v 1.1.2.3 2007/01/18 10:20:41 nobunobu Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -22,11 +22,11 @@
         }
     }
     
-    function ToShow($str) {
+    function toShow($str) {
         return htmlspecialchars($str, ENT_QUOTES);
     }
 
-    function ToEdit($str) {
+    function toEdit($str) {
         return htmlspecialchars($str, ENT_QUOTES);
     }
 

From nobunobu ＠ users.sourceforge.jp  Thu Jan 18 19:20:42 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 18 Jan 2007 19:20:42 +0900
Subject: [xoops-cvslog 6117] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20070118102042.392D32AC0D7@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.16 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.17
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.30.2.16	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Thu Jan 18 19:20:42 2007
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.16 2006/12/02 15:48:30 nobunobu Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.30.2.17 2007/01/18 10:20:42 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -141,9 +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', $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')));
+		$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
@@ -155,12 +155,12 @@
 			$configHandler =& xoops_gethandler('config');
 			$configs =& $configHandler->getConfigsByCat(0, $legacyRender->get('mid'));
 			
-			$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_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.
 			
 			//
@@ -223,9 +223,9 @@
    		$this->mXoopsTpl->assign('xoops_imageurl', XOOPS_THEME_URL . "/${themeName}/");
    		$this->mXoopsTpl->assign('xoops_themecss', xoops_getcss($themeName));
 
-		$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')));
+		$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.

From nobunobu ＠ users.sourceforge.jp  Thu Jan 18 19:20:42 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 18 Jan 2007 19:20:42 +0900
Subject: [xoops-cvslog 6118] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070118102042.612372AC0E4@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.3 xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.3	Sat Dec  9 23:11:48 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php	Thu Jan 18 19:20:42 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.3 2006/12/09 14:11:48 nobunobu Exp $
+ * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.4 2007/01/18 10:20:42 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -100,7 +100,7 @@
      * @return  string
      *
      **/
-    function ToShow($text, $x2comat=false) {
+    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.
@@ -119,7 +119,7 @@
      * @return  string
      *
      **/
-    function ToEdit($text) {
+    function toEdit($text) {
         return preg_replace("/&amp;(#0?[0-9]{4,6};)/i", '&$1', htmlspecialchars($text, ENT_QUOTES));
     }
 
@@ -134,14 +134,14 @@
      * @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);
+    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;
     }
 
@@ -172,7 +172,7 @@
      *
      * @return  string
      */
-    function &Smiley($text) {
+    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);
@@ -186,7 +186,7 @@
      * @param   string  $text
      * @return  string
      **/
-    function MakeClickable($text) {
+    function makeClickable($text) {
         if (empty($this->mClickablePatterns)) {
             // Delegate Call 'Legacy_TextFilter.MakeClickableConvertTable'
             //  Delegate may replace makeClickable conversion table
@@ -210,7 +210,7 @@
         return $text;
     }
 
-    function MakeClickableConvertTable(&$patterns, &$replacements) {
+    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";
@@ -229,7 +229,7 @@
      *                              On FALSE, uses links to images.
      * @return  string
      **/
-    function ConvertXCode($text, $allowimage = 1) {
+    function convertXCode($text, $allowimage = 1) {
         if (empty($this->mXCodePatterns)) {
             // Delegate Call 'Legacy_TextFilter.MakeXCodeConvertTable'
             //  Delegate may replace makeClickable conversion table
@@ -268,11 +268,11 @@
         return $text;
     }
     
-    function MakeXCodeCheckImgPatterns(&$patterns) {
+    function makeXCodeCheckImgPatterns(&$patterns) {
         $patterns[] = "/\[img( align=\w+)]([^\"\(\)\?\&'<>]*)\[\/img\]/sU";
     }
 
-    function MakeXCodeConvertTable(&$patterns, &$replacements) {
+    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";
@@ -357,7 +357,7 @@
      *
      * @return  string
      */
-    function Nl2Br($text)
+    function nl2Br($text)
     {
         return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
     }
@@ -371,7 +371,7 @@
      *
      * @return  string
      */
-    function PreConvertXCode($text, $xcode = 1) {
+    function preConvertXCode($text, $xcode = 1) {
         if($xcode != 0){
             if (empty($this->mPreXCodePatterns)) {
                 // RaiseEvent 'Legacy_TextFilter.MakePreXCodeConvertTable'
@@ -387,7 +387,7 @@
         return $text;
     }
     
-    function MakePreXCodeConvertTable(&$patterns, &$replacements) {
+    function makePreXCodeConvertTable(&$patterns, &$replacements) {
         $patterns[] = "/\[code](.*)\[\/code\]/esU";
         $replacements[] = "'[code]'.base64_encode('$1').'[/code]'";
     }
@@ -402,7 +402,7 @@
      *
      * @return  string
      */
-    function PostConvertXCode($text, $xcode=1, $image=1){
+    function postConvertXCode($text, $xcode=1, $image=1){
         if($xcode != 0){
             if (empty($this->mPostXCodePatterns)) {
                 // RaiseEvent 'Legacy_TextFilter.MakePostXCodeConvertTable'
@@ -425,14 +425,14 @@
         return $text;
     }
 
-    function MakePostXCodeConvertTable(&$patterns, &$replacements) {
+    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 codeSanitizer($text, $image = 1){
-        return $this->ConvertXCode(htmlspecialchars(str_replace('\"', '"', base64_decode($text)),ENT_QUOTES), $image);
+        return $this->convertXCode(htmlspecialchars(str_replace('\"', '"', base64_decode($text)),ENT_QUOTES), $image);
     }
 }
 ?>
Index: xoops2jp/html/modules/legacy/kernel/object.php
diff -u xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.2 xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.3
--- xoops2jp/html/modules/legacy/kernel/object.php:1.1.2.2	Sun Dec  3 00:48:30 2006
+++ xoops2jp/html/modules/legacy/kernel/object.php	Thu Jan 18 19:20:42 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacy
- * @version $Id: object.php,v 1.1.2.2 2006/12/02 15:48:30 nobunobu Exp $
+ * @version $Id: object.php,v 1.1.2.3 2007/01/18 10:20:42 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -160,7 +160,7 @@
 			case XOBJ_DTYPE_STRING:
                 $root =& XCube_Root::getSingleton();
                 $textFilter =& $root->getTextFilter();
-			    $value = $textFilter->ToShow($this->mVars[$key]['value']);
+			    $value = $textFilter->toShow($this->mVars[$key]['value']);
 				break;
 
 			case XOBJ_DTYPE_TEXT:

From minahito ＠ users.sourceforge.jp  Fri Jan 19 02:23:55 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 19 Jan 2007 02:23:55 +0900
Subject: [xoops-cvslog 6119] CVS update: xoops2jp/html/include
Message-ID: <20070118172355.5C4942AC097@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.3.2.5 xoops2jp/html/include/comment_new.php:1.2.8.3.2.6
--- xoops2jp/html/include/comment_new.php:1.2.8.3.2.5	Wed Jan 17 16:20:54 2007
+++ xoops2jp/html/include/comment_new.php	Fri Jan 19 02:23:55 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_new.php,v 1.2.8.3.2.5 2007/01/17 07:20:54 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3.2.6 2007/01/18 17:23:55 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -128,7 +128,7 @@
 // Render comment-form to render buffer with using Legacy_RenderSystem.
 //
 $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
-$renderTarget =& $renderSystem->createRendeerTarget('main');
+$renderTarget =& $renderSystem->createRenderTarget('main');
 
 $renderTarget->setTemplateName("legacy_comment_edit.html");
 
Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.5.2.2 xoops2jp/html/include/comment_view.php:1.2.8.5.2.3
--- xoops2jp/html/include/comment_view.php:1.2.8.5.2.2	Wed Jan 17 16:20:54 2007
+++ xoops2jp/html/include/comment_view.php	Fri Jan 19 02:23:55 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.5.2.2 2007/01/17 07:20:54 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.5.2.3 2007/01/18 17:23:55 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -155,7 +155,7 @@
 		}
 		
 		$renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
-		$renderTarget =& $renderSystem->createRendeerTarget('main');
+		$renderTarget =& $renderSystem->createRenderTarget('main');
 
 		$renderTarget->setTemplateName("legacy_comment_navi.html");
 		$renderTarget->setAttribute("pageName", $comment_config['pageName']);
Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.3.2.6 xoops2jp/html/include/comment_reply.php:1.2.8.3.2.7
--- xoops2jp/html/include/comment_reply.php:1.2.8.3.2.6	Wed Jan 17 16:20:54 2007
+++ xoops2jp/html/include/comment_reply.php	Fri Jan 19 02:23:55 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.3.2.6 2007/01/17 07:20:54 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3.2.7 2007/01/18 17:23:55 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -127,7 +127,7 @@
 // Render comment-form to render buffer with using Legacy_RenderSystem.
 //
 $renderSystem =& $root->getRenderSystem($root->mContext->mBaseRenderSystemName);
-$renderTarget =& $renderSystem->createRendeerTarget('main');
+$renderTarget =& $renderSystem->createRenderTarget('main');
 
 $renderTarget->setTemplateName("legacy_comment_edit.html");
 

From tom_g3x ＠ users.sourceforge.jp  Fri Jan 19 20:48:29 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Fri, 19 Jan 2007 20:48:29 +0900
Subject: [xoops-cvslog 6120] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20070119114829.EEC782AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html
diff -u 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.3
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.2	Sun Dec  3 00:50:21 2006
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html	Fri Jan 19 20:48:29 2007
@@ -275,4 +275,4 @@
 <img onclick='javascript:setVisible("<{$element->_xoopsHiddenText}>");makeLineThrough("<{$element->_xoopsHiddenText}>");' src='<{$xoops_url}>/images/linethrough.gif' alt='linethrough' onmouseover='style.cursor="hand"' />&nbsp;&nbsp;
 <input type='text' id='<{$element->getId()}>Addtext' size='20' />&nbsp;
 <input type='button' onclick='xoopsCodeText("<{$element->getId()}>", "<{$element->_xoopsHiddenText}>", "<{$smarty.const._ENTERTEXTBOX}>")' class='formButton' value='<{$smarty.const._ADD}>' /><br /><br />
-<textarea id='<{$element->getId()}>' name='<{$element->getName()}>' class='<{$class|default:none}>' style='<{$style|default:none}>' cols='<{$element->getCols()}>' rows='<{$element->getRows()}>' onselect="xoopsSavePosition('<{$element->getId()}>');" onclick="xoopsSavePosition('<{$element->getId()}>');" onkeyup="xoopsSavePosition('<{$element->getId()}>');"><{$element->getValue()}></textarea><br />
+<textarea id='<{$element->getId()}>' name='<{$element->getName()}>' <{if $class}>class='<{$class}>' <{/if}><{if $style}>style='<{$style}>' <{/if}>cols='<{$element->getCols()}>' rows='<{$element->getRows()}>' onselect="xoopsSavePosition('<{$element->getId()}>');" onclick="xoopsSavePosition('<{$element->getId()}>');" onkeyup="xoopsSavePosition('<{$element->getId()}>');"><{$element->getValue()}></textarea><br />

From tom_g3x ＠ users.sourceforge.jp  Sat Jan 20 22:19:57 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 20 Jan 2007 22:19:57 +0900
Subject: [xoops-cvslog 6121] CVS update: xoops2jp/html/modules/legacy/templates
Message-ID: <20070120131957.E96E22AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html
diff -u xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.3 xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.4
--- xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html:1.1.2.3	Fri Jan 19 20:48:29 2007
+++ xoops2jp/html/modules/legacy/templates/legacy_xoopsform_dhtmltextarea.html	Sat Jan 20 22:19:57 2007
@@ -275,4 +275,4 @@
 <img onclick='javascript:setVisible("<{$element->_xoopsHiddenText}>");makeLineThrough("<{$element->_xoopsHiddenText}>");' src='<{$xoops_url}>/images/linethrough.gif' alt='linethrough' onmouseover='style.cursor="hand"' />&nbsp;&nbsp;
 <input type='text' id='<{$element->getId()}>Addtext' size='20' />&nbsp;
 <input type='button' onclick='xoopsCodeText("<{$element->getId()}>", "<{$element->_xoopsHiddenText}>", "<{$smarty.const._ENTERTEXTBOX}>")' class='formButton' value='<{$smarty.const._ADD}>' /><br /><br />
-<textarea id='<{$element->getId()}>' name='<{$element->getName()}>' <{if $class}>class='<{$class}>' <{/if}><{if $style}>style='<{$style}>' <{/if}>cols='<{$element->getCols()}>' rows='<{$element->getRows()}>' onselect="xoopsSavePosition('<{$element->getId()}>');" onclick="xoopsSavePosition('<{$element->getId()}>');" onkeyup="xoopsSavePosition('<{$element->getId()}>');"><{$element->getValue()}></textarea><br />
+<textarea id='<{$element->getId()}>' name='<{$element->getName()}>' <{if $class}>class='<{$class}>' <{/if}>cols='<{$element->getCols()}>' rows='<{$element->getRows()}>' onselect="xoopsSavePosition('<{$element->getId()}>');" onclick="xoopsSavePosition('<{$element->getId()}>');" onkeyup="xoopsSavePosition('<{$element->getId()}>');"><{$element->getValue()}></textarea><br />

From tom_g3x ＠ users.sourceforge.jp  Sat Jan 20 22:23:28 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 20 Jan 2007 22:23:28 +0900
Subject: [xoops-cvslog 6122] CVS update: xoops2jp/html/core
Message-ID: <20070120132328.C0C1E2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.5 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.6
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.5	Thu Dec 28 23:17:48 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php	Sat Jan 20 22:23:28 2007
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_ActionForm.class.php,v 1.1.2.5 2006/12/28 14:17:48 nobunobu Exp $
+ * @version $Id: XCube_ActionForm.class.php,v 1.1.2.6 2007/01/20 13:23:28 tom_g3x Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -162,7 +162,7 @@
 	 *  $this->set('name', 'Bob');  // Set 'Bob' to 'name'.
 	 * 
 	 * Example (2):
-	 *  $this->set('names', 0, 'Bob');  // Set 'Bob' to 'name[0]'.
+	 *  $this->set('names', 0, 'Bob');  // Set 'Bob' to 'names[0]'.
 	 */
 	function set()
 	{

From tom_g3x ＠ users.sourceforge.jp  Sat Jan 20 22:47:25 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 20 Jan 2007 22:47:25 +0900
Subject: [xoops-cvslog 6123] CVS update: xoops2jp/html/modules/legacy/actions
Message-ID: <20070120134725.D17D72AC00E@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.3 xoops2jp/html/modules/legacy/actions/ImageListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacy/actions/ImageListAction.class.php:1.1.2.3	Sat Dec 16 20:44:56 2006
+++ xoops2jp/html/modules/legacy/actions/ImageListAction.class.php	Sat Jan 20 22:47:25 2007
@@ -34,7 +34,7 @@
 		return XOOPS_URL . "/imagemanager.php?op=list";
 	}
 	
-	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  Sat Jan 20 22:47:26 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 20 Jan 2007 22:47:26 +0900
Subject: [xoops-cvslog 6124] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20070120134726.046F42AC027@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php:1.1.2.3.2.1 xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php:1.1.2.3.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php:1.1.2.3.2.1	Sun Oct 15 17:18:09 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php	Sat Jan 20 22:47:25 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: TplsetUploadAction.class.php,v 1.1.2.3.2.1 2006/10/15 08:18:09 minahito Exp $
+ * @version $Id: TplsetUploadAction.class.php,v 1.1.2.3.2.2 2007/01/20 13:47:25 tom_g3x Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -115,7 +115,7 @@
 			} elseif ((!isset($infoArr[4]) || trim($infoArr[4]) == '') && $infoArr[1] == 'templates') {
 				$default =& $handler->find('default', 'module', null, trim($infoArr[2]), trim($infoArr[3]));
 			} elseif (isset($infoArr[3]) && trim($infoArr[3]) == 'images') {
-				$infoArr[2] = trim($infoarr[2]);
+				$infoArr[2] = trim($infoArr[2]);
 				if (preg_match("/(.*)\.(gif|jpg|jpeg|png)$/i", $infoArr[2], $match)) {
 					$themeimages[] = array('name' => $infoArr[2], 'content' => $info['file']);
 				}

From tom_g3x ＠ users.sourceforge.jp  Sat Jan 20 23:22:22 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 20 Jan 2007 23:22:22 +0900
Subject: [xoops-cvslog 6125] CVS update: xoops2jp/html/class/xml/rpc
Message-ID: <20070120142222.E1CEE2AC070@users.sourceforge.jp>

Index: xoops2jp/html/class/xml/rpc/xmlrpcparser.php
diff -u xoops2jp/html/class/xml/rpc/xmlrpcparser.php:1.2 xoops2jp/html/class/xml/rpc/xmlrpcparser.php:1.2.22.1
--- xoops2jp/html/class/xml/rpc/xmlrpcparser.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/xml/rpc/xmlrpcparser.php	Sat Jan 20 23:22:22 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: xmlrpcparser.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: xmlrpcparser.php,v 1.2.22.1 2007/01/20 14:22:22 tom_g3x Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -41,7 +41,7 @@
 * @package   XOOPS
 * @copyright Copyright (c) 2001 xoops.org. All rights reserved.
 * @author    Kazumi Ono <onokazu ＠ xoops.org>
-* @version   1.6 ($Date: 2005/03/18 12:51:55 $) $Revision: 1.2 $
+* @version   1.6 ($Date: 2007/01/20 14:22:22 $) $Revision: 1.2.22.1 $
 * @access    public
 */
 
@@ -662,7 +662,7 @@
         if (!preg_match("/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/", $data, $matches)) {
             $parser->setTempValue(time());
         } else {
-            $parser->setTempValue(gmmktime($matches[4], $matches[5], $meatches[6], $matches[2], $matches[3], $matches[1]));
+            $parser->setTempValue(gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]));
         }
     }
 }

From minahito ＠ users.sourceforge.jp  Sun Jan 21 10:12:41 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 21 Jan 2007 10:12:41 +0900
Subject: [xoops-cvslog 6126] CVS update:
	xoops2jp/html/modules/user/preload/Primary
Message-ID: <20070121011241.225B72AC0A3@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/preload/Primary/Primary.class.php
diff -u xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.6 xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.7
--- xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.7.2.6	Fri Oct  6 17:28:13 2006
+++ xoops2jp/html/modules/user/preload/Primary/Primary.class.php	Sun Jan 21 10:12:40 2007
@@ -12,6 +12,7 @@
 	{
 		$root =& XCube_Root::getSingleton();
 		$this->mController->mSetupUser->add("User_Utils::setupUser");
+		$this->mController->_mNotifyRedirectToUser->add("User_Utils::convertUrlToUser");
 
 		$file = XOOPS_ROOT_PATH . "/modules/user/kernel/LegacypageFunctions.class.php";
 		
@@ -83,6 +84,17 @@
 			$principal = new Legacy_GenericPrincipal($identity, array("Site.GuestUser"));
 		}
 	}
+	
+	function convertUrlToUser(&$url)
+	{
+		global $xoopsRequestUri;
+		if (!strstr($url, '?')) {
+			$url .= "?xoops_redirect=" . urlencode($xoopsRequestUri);
+		}
+		else {
+			$url .= "&amp;xoops_redirect=" . urlencode($xoopsRequestUri);
+		}
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sun Jan 21 10:12:56 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 21 Jan 2007 10:12:56 +0900
Subject: [xoops-cvslog 6127] CVS update: xoops2jp/html/modules/legacy/kernel
Message-ID: <20070121011256.8CF542AC093@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.30 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.31
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.30	Mon Jan 15 15:00:55 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php	Sun Jan 21 10:12:56 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: Legacy_Controller.class.php,v 1.1.2.30 2007/01/15 06:00:55 minahito Exp $
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.31 2007/01/21 01:12:56 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -76,6 +76,14 @@
 	var $mSetupDebugger = null;
 	
 	/**
+	 * @public
+	 * @var XCube_Delegate
+	 * [Secret Agreement] In execute_redirect(), notice the redirection which directs toward user.php.
+	 * @remark Only the special module should access this member property.
+	 */
+	var $_mNotifyRedirectToUser = null;
+	
+	/**
 	 * @var XoopsLogger
 	 */
 	var $mLogger = null;
@@ -109,6 +117,8 @@
 
 	    $this->mSetupTextFilter->add('Legacy_TextFilter::getInstance',XCUBE_DELEGATE_PRIORITY_FINAL-1);
 
+		$this->_mNotifyRedirectToUser =& new XCube_Delegate();
+		
 		set_magic_quotes_runtime(0);	// ^^;
 	}
 	
@@ -1023,13 +1033,14 @@
 	 * wrong value, some problems may be raised. If you can't understand the
 	 * difference, use not this function but redirect_header().
 	 * 
-	 * @param string $url     redirect URL. Don't use user's variables or request.
-	 * @param int    $time    waiting time (sec)
-	 * @param string $message This string doesn't include tags.
+	 * @param string $url          redirect URL. Don't use user's variables or request.
+	 * @param int    $time         waiting time (sec)
+	 * @param string $message      This string doesn't include tags.
+	 * @param bool   $addRedirect  A value indicationg whether this method adds URL automatically for user.php.
 	 * 
 	 * @todo We'll change this function to delegate.
 	 */
-	function executeRedirect($url, $time = 1, $message = null)
+	function executeRedirect($url, $time = 1, $message = null, $addRedirect = true)
 	{
 		global $xoopsConfig, $xoopsRequestUri;
 
@@ -1052,6 +1063,12 @@
 		}
 		
 		$url = htmlspecialchars($url, ENT_QUOTES);
+		
+		// XOOPS2 Compatibility
+		if ($addRedirect && strstr($url, 'user.php')) {
+			$this->_mNotifyRedirectToUser->call(new XCube_Ref($url));
+		}
+		
 		if (defined('SID') && (! isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
 			if (!strstr($url, '?')) {
 				$url .= '?' . SID;

From minahito ＠ users.sourceforge.jp  Sun Jan 21 10:44:22 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 21 Jan 2007 10:44:22 +0900
Subject: [xoops-cvslog 6128] CVS update: xoops2jp/html/modules/legacy
Message-ID: <20070121014422.9C3BA2AC19C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/xoops_version.php
diff -u xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.12 xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.13
--- xoops2jp/html/modules/legacy/xoops_version.php:1.1.2.12	Sun Dec  3 00:58:31 2006
+++ xoops2jp/html/modules/legacy/xoops_version.php	Sun Jan 21 10:44:22 2007
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.12 2006/12/02 15:58:31 nobunobu Exp $
+// $Id: xoops_version.php,v 1.1.2.13 2007/01/21 01:44:22 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -26,7 +26,7 @@
 // ------------------------------------------------------------------------- //
 
 $modversion['name'] = _MI_LEGACY_NAME;
-$modversion['version'] = 2.07;
+$modversion['version'] = 2.08;
 $modversion['description'] = _MI_LEGACY_NAME_DESC;
 $modversion['author'] = "";
 $modversion['credits'] = "The XOOPS Cube Project";
@@ -145,6 +145,7 @@
 $modversion['hasMain'] = 0;
 
 // Blocks
+$modversion['blocks'][1]['func_num'] = 1;
 $modversion['blocks'][1]['file'] = "legacy_usermenu.php";
 $modversion['blocks'][1]['name'] = _MI_LEGACY_BLOCK_USERMENU_NAME;
 $modversion['blocks'][1]['description'] = _MI_LEGACY_BLOCK_USERMENU_DESC;
@@ -153,6 +154,7 @@
 $modversion['blocks'][1]['visible_any'] = true;
 $modversion['blocks'][1]['show_all_module'] = true;
 
+$modversion['blocks'][2]['func_num'] = 2;
 $modversion['blocks'][2]['file'] = "legacy_mainmenu.php";
 $modversion['blocks'][2]['name'] = _MI_LEGACY_BLOCK_MAINMENU_NAME;
 $modversion['blocks'][2]['description'] = _MI_LEGACY_BLOCK_MAINMENU_DESC;
@@ -161,6 +163,7 @@
 $modversion['blocks'][2]['visible_any'] = true;
 $modversion['blocks'][2]['show_all_module'] = true;
 
+$modversion['blocks'][3]['func_num'] = 3;
 $modversion['blocks'][3]['file'] = "legacy_search.php";
 $modversion['blocks'][3]['name'] = _MI_LEGACY_BLOCK_SEARCH_NAME;
 $modversion['blocks'][3]['description'] = _MI_LEGACY_BLOCK_SEARCH_DESC;
@@ -168,12 +171,14 @@
 $modversion['blocks'][3]['template'] = 'legacy_block_search.html';
 $modversion['blocks'][3]['show_all_module'] = true;
 
+$modversion['blocks'][4]['func_num'] = 4;
 $modversion['blocks'][4]['file'] = "legacy_waiting.php";
 $modversion['blocks'][4]['name'] = _MI_LEGACY_BLOCK_WAITING_NAME;
 $modversion['blocks'][4]['description'] = _MI_LEGACY_BLOCK_WAITING_DESC;
 $modversion['blocks'][4]['show_func'] = "b_legacy_waiting_show";
 $modversion['blocks'][4]['template'] = 'legacy_block_waiting.html';
 
+$modversion['blocks'][5]['func_num'] = 5;
 $modversion['blocks'][5]['file'] = "legacy_siteinfo.php";
 $modversion['blocks'][5]['name'] = _MI_LEGACY_BLOCK_SITEINFO_NAME;
 $modversion['blocks'][5]['description'] = _MI_LEGACY_BLOCK_SITEINFO_DESC;
@@ -183,6 +188,7 @@
 $modversion['blocks'][5]['template'] = 'legacy_block_siteinfo.html';
 $modversion['blocks'][5]['show_all_module'] = true;
 
+$modversion['blocks'][6]['func_num'] = 6;
 $modversion['blocks'][6]['file'] = "legacy_comments.php";
 $modversion['blocks'][6]['name'] = _MI_LEGACY_BLOCK_COMMENTS_NAME;
 $modversion['blocks'][6]['description'] = _MI_LEGACY_BLOCK_COMMENTS_DESC;
@@ -192,12 +198,14 @@
 $modversion['blocks'][6]['template'] = 'legacy_block_comments.html';
 $modversion['blocks'][6]['show_all_module'] = true;
 
+$modversion['blocks'][7]['func_num'] = 7;
 $modversion['blocks'][7]['file'] = "legacy_notification.php";
 $modversion['blocks'][7]['name'] = _MI_LEGACY_BLOCK_NOTIFICATION_NAME;
 $modversion['blocks'][7]['description'] = _MI_LEGACY_BLOCK_NOTIFICATION_DESC;
 $modversion['blocks'][7]['show_func'] = "b_legacy_notification_show";
 $modversion['blocks'][7]['template'] = 'legacy_block_notification.html';
 
+$modversion['blocks'][8]['func_num'] = 8;
 $modversion['blocks'][8]['file'] = "legacy_themes.php";
 $modversion['blocks'][8]['name'] = _MI_LEGACY_BLOCK_THEMES_NAME;
 $modversion['blocks'][8]['description'] = _MI_LEGACY_BLOCK_THEMES_DESC;

From minahito ＠ users.sourceforge.jp  Sun Jan 21 11:32:25 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 21 Jan 2007 11:32:25 +0900
Subject: [xoops-cvslog 6129] CVS update: xoops2jp/html/include
Message-ID: <20070121023225.0894C2AC180@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.4.8.12.2.9 xoops2jp/html/include/version.php:1.4.8.12.2.10
--- xoops2jp/html/include/version.php:1.4.8.12.2.9	Mon Dec 25 15:24:53 2006
+++ xoops2jp/html/include/version.php	Sun Jan 21 11:32:24 2007
@@ -1,9 +1,9 @@
 <?php
 /**
  * @package Legacy
- * @version $Id: version.php,v 1.4.8.12.2.9 2006/12/25 06:24:53 tom_g3x Exp $
+ * @version $Id: version.php,v 1.4.8.12.2.10 2007/01/21 02:32:24 minahito Exp $
  */
 
-define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 beta version 4");
+define("XOOPS_VERSION", "XOOPS Cube Legacy 2.1 RC");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sun Jan 21 11:36:03 2007
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 21 Jan 2007 11:36:03 +0900
Subject: [xoops-cvslog 6130] CVS update: xoops2jp/extras
Message-ID: <20070121023603.AD09C2AC0BB@users.sourceforge.jp>

Index: xoops2jp/extras/DevelopPHPDebugger.class.php
diff -u /dev/null xoops2jp/extras/DevelopPHPDebugger.class.php:1.1.2.1
--- /dev/null	Sun Jan 21 11:36:03 2007
+++ xoops2jp/extras/DevelopPHPDebugger.class.php	Sun Jan 21 11:36:03 2007
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @brief This is all bells and whistles. This preload improve reports of the standard debugger.
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/modules/legacy/class/Legacy_Debugger.class.php";
+
+class DevelopPHPDebugger extends XCube_ActionFilter
+{
+	function preFilter()
+	{
+		$this->mController->mSetupDebugger->add("DevelopPHPDebugger::myFactory");
+	}
+	
+	function myFactory(&$instance, $debug_mode)
+	{
+		switch($debug_mode) {
+			case XOOPS_DEBUG_PHP:
+				$instance = new My_PHPDebugger();
+				break;
+
+			case XOOPS_DEBUG_MYSQL:
+				$instance = new My_MysqlDebugger();
+				break;
+
+			case XOOPS_DEBUG_SMARTY:
+				$instance = new My_SmartyDebugger();
+				break;
+			
+			case XOOPS_DEBUG_OFF:
+			default:
+				$instance = new Legacy_NonDebugger();
+				break;
+		}
+	}
+}
+
+class My_PHPDebugger extends Legacy_PHPDebugger
+{
+	function prepare()
+	{
+		error_reporting(E_ALL);
+	}
+}
+
+class My_MysqlDebugger extends Legacy_MysqlDebugger
+{
+	function prepare()
+	{
+	}
+}
+
+class My_SmartyDebugger extends Legacy_SmartyDebugger
+{
+	function prepare()
+	{
+	}
+}
+
+
+?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Mon Jan 22 23:55:20 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 22 Jan 2007 23:55:20 +0900
Subject: [xoops-cvslog 6131] CVS update:
	xoops2jp/html/modules/legacy/language/english/help
Message-ID: <20070122145520.7748C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/english/help/block.html
diff -u xoops2jp/html/modules/legacy/language/english/help/block.html:1.1.2.2 xoops2jp/html/modules/legacy/language/english/help/block.html:1.1.2.2.2.1
--- xoops2jp/html/modules/legacy/language/english/help/block.html:1.1.2.2	Sun Oct 15 01:41:57 2006
+++ xoops2jp/html/modules/legacy/language/english/help/block.html	Mon Jan 22 23:55:20 2007
@@ -35,5 +35,5 @@
 You can re-install the block anytime.</p>
 
 <h5>FOR XOOPS2 USERS</h5>
-<p>XOOPS Cube Legacy 2.1 has separated the list of un-used blocks from Block Manage.
-It is like Module Manage.</p>
+<p>XOOPS Cube Legacy 2.1 has separated the list of un-used blocks from Block Management.
+It is like Module Management.</p>
Index: xoops2jp/html/modules/legacy/language/english/help/help.html
diff -u xoops2jp/html/modules/legacy/language/english/help/help.html:1.1.2.5 xoops2jp/html/modules/legacy/language/english/help/help.html:1.1.2.5.2.1
--- xoops2jp/html/modules/legacy/language/english/help/help.html:1.1.2.5	Wed Oct 25 02:32:58 2006
+++ xoops2jp/html/modules/legacy/language/english/help/help.html	Mon Jan 22 23:55:20 2007
@@ -1,4 +1,4 @@
-<h4>XOOPS Cube Legacy KICK START GUIDE</h4>
+<h4>XOOPS Cube Legacy 2.1 KICK START GUIDE</h4>
 <img src="<{'abc_index_title.png'|helpimage}>" align="left" />
 <p class="preface">This is the kick start guide for you who have not used XOOPS Cube Legacy. If you don't know what you should do next,<br />
 <div class="remark"><img src="<{'abc_index_arrow.png'|helpimage}>" align="left" /><a href="<{'abc_index.html'|helpurl}>" align="left">read this guide</a>.</div>
@@ -8,7 +8,6 @@
 <ul>
   <li>This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.</li>
   <li>Also, it provides module operation menu and theme engine for admin menu.</li>
-  <li>This module is incomplete in this release. It should be used together with System module.</li>
 </ul>
 
 <h4>Action Search</h4>
@@ -17,11 +16,6 @@
   <li>Please perform search when you need to know how to use the XOOPS Cube.</li>
 </ul>
 
-<h4>Index</h4>
-<ul>
-  <li><a href="<{'theme.html'|helpurl}>">Theme management</a></li>
-</ul>
-
 <h4>Module administration / installation</h4>
 <ul>
   <li>When you go to this area, you see a list of installed module in your XOOPS Cube.</li>
@@ -40,14 +34,13 @@
   <li>Click <a href="<{'theme.html'|helpurl}>">here</a> to understand this feature.</li>
 </ul>
 
-<h4>Migration guide (from XOOPS 2.0.x)</h4>
+<h4>Migration guide (for XOOPS 2.0.x users)</h4>
 <ul>
   <li>Please refer <a href="<{'xoops2.html'|helpurl}>">here.</a></li>
 </ul>
 
 <h4>TODO (What's coming?)</h4>
 <ul>
-  <li>Name of this module would be changed to 'Legacy module' form 'Base module'.</li>
   <li>Some modules which depend on minor global variables of XOOPS2, can not be installed in XOOPS Cube Legacy 2.1.
 </ul>
 
Index: xoops2jp/html/modules/legacy/language/english/help/xoops2.html
diff -u xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.2 xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.2.2.1
--- xoops2jp/html/modules/legacy/language/english/help/xoops2.html:1.1.2.2	Mon Nov 27 14:58:30 2006
+++ xoops2jp/html/modules/legacy/language/english/help/xoops2.html	Mon Jan 22 23:55:20 2007
@@ -1,22 +1,19 @@
-<h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
+<h4>XOOPS Cube Legacy 2.1 migration guide (for XOOPS 2.0.x users)</h4>
 <h5>Getting first</h5>
-<p>All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p>
-
-<p>These features will be ported to 'Legacy module' until stable release.</p>
+<p>XOOPS Cube Legacy 2.1 does not have <strong>System module</strong>, that XOOPS 2.0.x had.
+If you migrate from XOOPS 2.0.x, you can keep using a <strong>System module</strong> to avoid some troubles with some XOOPS 2.0.x modules. But some preference parameters move to another new XOOPS Cube modules.</p>
 
 <h5>Module management</h5>
 <ul>
-<li>You can manage modules on 'Legacy system' module.</li>
+<li>You can manage modules on <strong>Legacy module</strong>.</li>
 <li>'Install module' and 'Module management' has each control page.</li>
 <li>Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.</li>
-<li>Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.</li>
 <li>Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.</li>
 </ul>
 
 <h5>User management</h5>
 <ul>
-<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to <strong>user module</strong>.</li>
-<li>However, 'Sending mail' hasn't ported yet.</li>
+<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' is ported to <strong>User module</strong>.</li>
 </ul>
 
 <h5>Theme management</h5>
@@ -25,11 +22,12 @@
 <li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
 </ul>
 
-<div style="color:red;">New!</div>
 <h5>Block management</h5>
 <ul>
 <li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>
-<li>If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.</li>
-<li>If you uninstall the block, it returns to the list of 'Install block' page.</li>
-<li>You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.
+<li>If you install module, the module's blocks are registered to XOOPS Cube Legacy.<br />
+But you cannot use it, until you go to 'Install block' page and click install icon of block which you want to install at</li>
+<li>If you uninstall the block, it moves back to the list of 'Install block' page.</li>
+<li>You can't edit uninstalled blocks' group permission, target column and target module. <br />
+But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.</li>
 </ul>

From nobunobu ＠ users.sourceforge.jp  Mon Jan 22 23:55:20 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 22 Jan 2007 23:55:20 +0900
Subject: [xoops-cvslog 6132] CVS update:
	xoops2jp/html/modules/legacy/language/japanese/help
Message-ID: <20070122145520.9ED8C2AC198@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/language/japanese/help/help.html
diff -u xoops2jp/html/modules/legacy/language/japanese/help/help.html:1.1.2.3 xoops2jp/html/modules/legacy/language/japanese/help/help.html:1.1.2.3.2.1
--- xoops2jp/html/modules/legacy/language/japanese/help/help.html:1.1.2.3	Mon Oct 23 20:25:34 2006
+++ xoops2jp/html/modules/legacy/language/japanese/help/help.html	Mon Jan 22 23:55:20 2007
@@ -14,7 +14,6 @@
   <li>このモジュールをインストールすると、XOOPS CubeにXOOPSモジュールを動かすための各クラスを実装して、XOOPS 2.0.xと互換性のある動作を提供します。</li>
   <li>また、XOOPS 2.0.x互換モジュールの管理機能を提供します。</li>
   <li>管理者メニューに対して管理用のテーマエンジンを提供します。</li>
-  <li>未完成のため、systemモジュールを併用してご利用ください。</li>
 </ul>
 
 <h4>コマンド検索(アクションサーチ)</h4>
@@ -42,14 +41,13 @@
   <li>詳しくは<a href="<{'theme.html'|helpurl}>">こちら</a>をご覧下さい。</li>
 </ul>
 
-<h4>XOOPS 2.0.x 操作移行リスト</h4>
+<h4>XOOPS 2.0.x ユーザのための移行ガイド</h4>
 <ul>
   <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
 </ul>
 
-<h4>Cube 2.1 alpha 既知の問題点・注意事項</h4>
+<h4>Cube 2.1 RC 既知の問題点・注意事項</h4>
 <ul>
-  <li>「base module」の名称（ディレクトリ名を含む）は、正式版までに「Legacy module」に変更の予定です。</li>
   <li>幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。</li>
 </ul>
 
Index: xoops2jp/html/modules/legacy/language/japanese/help/xoops2.html
diff -u xoops2jp/html/modules/legacy/language/japanese/help/xoops2.html:1.1.2.1 xoops2jp/html/modules/legacy/language/japanese/help/xoops2.html:1.1.2.1.2.1
--- xoops2jp/html/modules/legacy/language/japanese/help/xoops2.html:1.1.2.1	Sat Oct 14 23:55:25 2006
+++ xoops2jp/html/modules/legacy/language/japanese/help/xoops2.html	Mon Jan 22 23:55:20 2007
@@ -1,23 +1,21 @@
-<h4>XOOPS2移行リスト</h4>
+<h4>XOOPS 2.0.x ユーザのための移行ガイド</h4>
 <h5>まずはじめに</h5>
-<p>
-  systemモジュールの管理機能もすべて有効ですが、これは開発途中のためです。<br/>
-   すべての管理機能は各モジュールの管理機能へ適切に移行する予定です。
+<p>XOOPS Cube Legacy2.1にsystemモジュールは同梱されていません。
+XOOPS2.0.xからのアップグレードを行った場合にはsystemモジュールを古いモジュールの互換性維持の目的で継続使用することは可能です。
 </p>
 
 <h5>モジュールの管理</h5>
 <ul>
-<li>baseモジュールの管理からモジュールの管理を行うことが出来ます。</li>
+<li>互換モジュール（Legacy)の管理からモジュールの管理を行うことが出来ます。</li>
 <li>今回、未インストールのモジュールとインストール済のモジュールは操作が分けられました。</li>
 <li>インストール済みのモジュールを管理する場合は「モジュールの管理」、新たにモジュールをインストールする場合は、「モジュールのインストール」を使ってください。</li>
 <li>インストーラはコールバックを行っていないなど、現在不完全な点があります。</li>
-<li>従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。baseモジュールでは、管理者に対してのみ権限を振っています。</li>
+<li>従来のインストーラでは、インストールを行ったユーザーの権限にあわせて権限設定が行われました。互換モジュール（Legacy)では、管理者に対してのみ権限を振っています。</li>
 </ul>
 
 <h5>ユーザーの管理</h5>
 <ul>
-<li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
-<li>このうち、メールに関しては移行を終えていません。</li>
+<li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動しました。</li>
 </ul>
 
 <h5>テーマの管理</h5>
@@ -34,13 +32,3 @@
 <li>アンインストールすると、そのブロックはインストール候補リストに戻ります。</li>
 <li>XOOPS Cube 2.1 では非インストールブロックには権限の概念も、アサイン列の概念も、アサインモジュールの概念もありません。ただし、設定は記憶されており、再インストール時の初期値は最後のパラメータが使用されます。</li>
 </ul>
-
-<h5>TODO</h5>
-<ul>
-<li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
-<li>コメント機能は新しいものを作っていますが、まだ移行を終えきっていないため、旧ファイルでの動作を行ってます。</li>
-<li>イベント通知機能はインストールおよび動作面でコードを抜いてあるため、機能しません。</li>
-<li>XOOPS 2.0.x からのデータ移行（現在はデータベーステーブルを定義しないことでインストールを可能としている）</li>
-</ul>
-
-

From tom_g3x ＠ users.sourceforge.jp  Tue Jan 23 18:29:38 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 23 Jan 2007 18:29:38 +0900
Subject: [xoops-cvslog 6133] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20070123092938.B7ED92AC0B0@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3.2.1
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.16.2.3	Thu Nov 16 17:16:46 2006
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Tue Jan 23 18:29:38 2007
@@ -2,8 +2,9 @@
 <{if $feature.user.profile}>
   <a href="<{$xoops_url}>/userinfo.php?uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_PM_LANG_PROFILE}></a>&nbsp;&raquo;&raquo;&nbsp;
 <{/if}>
-<a href="index.php"><{$smarty.const._MD_PM_LANG_INBOX}></a>
+<a href="viewpmsg.php"><{$smarty.const._MD_PM_LANG_INBOX}></a>
 &nbsp;&raquo;&raquo;&nbsp;<{$privMessage->getShow('subject')}>
+<br /><br />
 
 <form action='<{$xoops_url}>/readpmsg.php' method='post' name='delete<{$privMessage->getShow('msg_id')}>'>
   <table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%">
@@ -29,7 +30,7 @@
     <tr class="even">
       <td><{$smarty.const._MD_PM_LANG_SUBJECTC}><img src="<{$xoops_url}>/images/subject/<{$privMessage->getShow('msg_image')}>" alt='' title='' />&nbsp;<b><{$privMessage->getShow('subject')}></b></td>
     </tr>
-    <tr class="'odd">
+    <tr class="odd">
       <td colspan="2">
         <{$privMessage->getShow('msg_text')}><br /><br />
       </td>
@@ -43,6 +44,7 @@
         <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._MD_PM_LANG_DELETE}>" title="<{$smarty.const._MD_PM_LANG_DELETE}>" /></a>
       </td>
     </tr>
+    <{if $previousMessage || $nextMessage}>
     <tr>
       <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
         <{if $previousMessage}>
@@ -54,5 +56,6 @@
         <{/if}>
       </td>
     </tr>
+    <{/if}>
   </table>
 </form>

From nobunobu ＠ users.sourceforge.jp  Tue Jan 23 22:02:41 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 23 Jan 2007 22:02:41 +0900
Subject: [xoops-cvslog 6134] CVS update:
	xoops2jp/html/modules/legacy/admin/actions
Message-ID: <20070123130241.382552AC104@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3 xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3.2.1
--- xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php:1.1.2.3	Thu Nov  9 16:23:40 2006
+++ xoops2jp/html/modules/legacy/admin/actions/ActSearchAction.class.php	Tue Jan 23 22:02:41 2007
@@ -94,7 +94,7 @@
 
 	function prepare(&$controller, &$xoopsUser)
 	{
-		parent::prepare(&$controller, &$xoopsUser);
+		parent::prepare($controller, &$xoopsUser);
 
 		$db=&$controller->getDB();
 

From nobunobu ＠ users.sourceforge.jp  Tue Jan 23 22:19:52 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 23 Jan 2007 22:19:52 +0900
Subject: [xoops-cvslog 6135] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20070123131952.4ED9B2AC09A@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2.2.1 xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2.2.1.2.1
--- xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2.2.1	Wed Jan 17 15:00:21 2007
+++ xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php	Tue Jan 23 22:19:52 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: DeleteOneAction.class.php,v 1.1.2.2.2.1 2007/01/17 06:00:21 minahito Exp $
+ * @version $Id: DeleteOneAction.class.php,v 1.1.2.2.2.1.2.1 2007/01/23 13:19:52 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -63,7 +63,7 @@
 	function executeViewCancel(&$controller, &$xoopsUser, &$render)
 	{
 		if (is_object($this->mObject)) {
-			$controller->executeForward(XOOPS_URL . "/viewpmsg.php?msg_id=" . $this->mObject->get('msg_id'));
+			$controller->executeForward(XOOPS_URL . "/readpmsg.php?msg_id=" . $this->mObject->get('msg_id'));
 		}
 		else {
 			$controller->executeForward(XOOPS_URL . "/viewpmsg.php");

From nobunobu ＠ users.sourceforge.jp  Tue Jan 23 22:24:14 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 23 Jan 2007 22:24:14 +0900
Subject: [xoops-cvslog 6136] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070123132414.96EB12AC09A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.1
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1	Sun Oct 15 15:09:47 2006
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Tue Jan 23 22:24:14 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1 2006/10/15 06:09:47 minahito Exp $
+ * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.1 2007/01/23 13:24:14 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -94,7 +94,7 @@
 			$lostUser =& $lostUserArr[0];
 		}
 		else {
-			return USER_FRAME_VIEW_SUCCESS;
+			return USER_FRAME_VIEW_ERROR;
 		}
 
 		$builder =& new User_LostPass1MailBuilder();

From nobunobu ＠ users.sourceforge.jp  Tue Jan 23 22:37:43 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 23 Jan 2007 22:37:43 +0900
Subject: [xoops-cvslog 6137] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070123133743.E60DF2AC23F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.1 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.2
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.1	Tue Jan 23 22:24:14 2007
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Tue Jan 23 22:37:43 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.1 2007/01/23 13:24:14 nobunobu Exp $
+ * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.2 2007/01/23 13:37:43 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -21,9 +21,12 @@
 	 * @var User_LostPassEditForm
 	 */
 	var $mActionForm = null;
+	var $mConfig;
 	
 	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
+		$this->mConfig = $moduleConfig;
+
 		$this->mActionForm =& new User_LostPassEditForm();
 		$this->mActionForm->prepare();
 	}

From nobunobu ＠ users.sourceforge.jp  Thu Jan 25 22:38:44 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 25 Jan 2007 22:38:44 +0900
Subject: [xoops-cvslog 6138] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070125133844.80E412AC178@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserInfoAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.2 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.2.2.1
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.9.2.2	Wed Nov 15 19:43:02 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php	Thu Jan 25 22:38:44 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.2 2006/11/15 10:43:02 minahito Exp $
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.9.2.2.2.1 2007/01/25 13:38:44 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -104,8 +104,7 @@
 		
 		$render->setAttribute('pmliteUrl', $this->mPmliteURL);
 
-		$myts =& MyTextSanitizer::getInstance();
-		$userSignature = $myts->makeTareaData4Show($this->mObject->get('user_sig'), 0, 1, 1);
+		$userSignature = $this->mObject->getShow('user_sig');
 		
 		$render->setAttribute('user_signature', $userSignature);
 

From nobunobu ＠ users.sourceforge.jp  Fri Jan 26 17:20:14 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 26 Jan 2007 17:20:14 +0900
Subject: [xoops-cvslog 6139] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070126082014.5AD802AC0A6@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.2 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.3
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.2	Tue Jan 23 22:37:43 2007
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Fri Jan 26 17:20:14 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.2 2007/01/23 13:37:43 nobunobu Exp $
+ * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.3 2007/01/26 08:20:14 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -21,12 +21,9 @@
 	 * @var User_LostPassEditForm
 	 */
 	var $mActionForm = null;
-	var $mConfig;
 	
 	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mConfig = $moduleConfig;
-
 		$this->mActionForm =& new User_LostPassEditForm();
 		$this->mActionForm->prepare();
 	}
@@ -68,7 +65,7 @@
 		$newpass = xoops_makepass();
 		$extraVars['newpass'] = $newpass;
 		$builder =& new User_LostPass2MailBuilder();
-		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mConfig, $extraVars);
+		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mRoot->mContext->getXoopsConfig(), $extraVars);
 		$director->contruct();
 		$xoopsMailer =& $builder->getResult();
 		if (!$xoopsMailer->send()) {
@@ -101,7 +98,7 @@
 		}
 
 		$builder =& new User_LostPass1MailBuilder();
-		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mConfig);
+		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mRoot->mContext->getXoopsConfig());
 		$director->contruct();
 		$xoopsMailer =& $builder->getResult();
 

From nobunobu ＠ users.sourceforge.jp  Fri Jan 26 17:39:36 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 26 Jan 2007 17:39:36 +0900
Subject: [xoops-cvslog 6140] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070126083936.A8D502AC0A6@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.3 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.4
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.8.2.1.2.3	Fri Jan 26 17:20:14 2007
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Fri Jan 26 17:39:36 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.3 2007/01/26 08:20:14 nobunobu Exp $
+ * @version $Id: LostPassAction.class.php,v 1.1.2.8.2.1.2.4 2007/01/26 08:39:36 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -59,7 +59,7 @@
 			$lostUser =& $lostUserArr[0];
 		}
 		else {
-			return USER_FRAME_VIEW_SUCCESS;
+			return USER_FRAME_VIEW_ERROR;
 		}
 
 		$newpass = xoops_makepass();

From nobunobu ＠ users.sourceforge.jp  Fri Jan 26 17:40:38 2007
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 26 Jan 2007 17:40:38 +0900
Subject: [xoops-cvslog 6141] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20070126084038.CEEED2AC0A6@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.3 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.3.2.1
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.16.2.3	Fri Nov 10 20:30:01 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Fri Jan 26 17:40:38 2007
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.3 2006/11/10 11:30:01 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.16.2.3.2.1 2007/01/26 08:40:38 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -78,7 +78,7 @@
 	 */
 	function _getRegistForm(&$controller)
 	{
-		$this->mRegistForm =& unserialize($_SESSION['user_register_actionform']);
+		$this->mRegistForm = unserialize($_SESSION['user_register_actionform']);
 		if (!is_object($this->mRegistForm)) {
 			$controller->executeForward('./register.php?action=UserRegister');
 		}

From tom_g3x ＠ users.sourceforge.jp  Sun Jan 28 23:33:53 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 28 Jan 2007 23:33:53 +0900
Subject: [xoops-cvslog 6142] CVS update:
	xoops2jp/html/modules/legacy/admin/theme/stylesheets
Message-ID: <20070128143353.AE7412AC21B@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.5 xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.5.2.1
--- xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.5	Sun Dec  3 16:44:54 2006
+++ xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css	Sun Jan 28 23:33:53 2007
@@ -287,7 +287,7 @@
 	margin:10px 30px;
 }
 
-/* ===== option MenuNavi =====
+/* ===== MenuNavi for noscript ===== */
 #menunavi {
 	margin:8px;
 	border:1px solid #333366;
@@ -313,17 +313,15 @@
 	padding:3px;
 	line-height:2em;
 	background-color:#f8f8ff;
-	white-space: nowrap;
-	_white-space:none;
-	
 }
 ul.submenunavi li a {
 	color:#000060;
+	white-space: nowrap;
+	_white-space:none;
 }
 ul.submenunavi li a:visited {
 	color:#000060;
 }
- */
 
 /* ===== Admin Navi ===== */
 .adminnavi {

From tom_g3x ＠ users.sourceforge.jp  Sun Jan 28 23:33:53 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun, 28 Jan 2007 23:33:53 +0900
Subject: [xoops-cvslog 6143] CVS update:
	xoops2jp/html/modules/legacy/admin/theme
Message-ID: <20070128143353.D47662AC21C@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.9 xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9.2.1
--- xoops2jp/html/modules/legacy/admin/theme/admin_theme.html:1.1.2.9	Sun Dec  3 00:50:21 2006
+++ xoops2jp/html/modules/legacy/admin/theme/admin_theme.html	Sun Jan 28 23:33:53 2007
@@ -67,7 +67,7 @@
 </td>
 <td id="centercolumn">
 
-<{* option
+<noscript>
   <div id="menunavi">
   <h2><{$currentModule->mXoopsModule->getShow('name')}></h2>
   <{if $currentModule->getAdminMenu()}>
@@ -78,7 +78,7 @@
     </ul>
   <{/if}>
   </div>
- /option *}>
+</noscript>
 
   <div id="contentBody"><{$xoops_contents}></div>
   <div class="return_top"><a href="#container"><{$smarty.const._RETURN_TOP}></a></div>

From tom_g3x ＠ users.sourceforge.jp  Mon Jan 29 02:12:32 2007
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Mon, 29 Jan 2007 02:12:32 +0900
Subject: [xoops-cvslog 6144] CVS update:
	xoops2jp/html/modules/legacy/admin/theme/stylesheets
Message-ID: <20070128171232.593062AC22D@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.5.2.1 xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.5.2.2
--- xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css:1.1.2.5.2.1	Sun Jan 28 23:33:53 2007
+++ xoops2jp/html/modules/legacy/admin/theme/stylesheets/style.css	Mon Jan 29 02:12:32 2007
@@ -317,7 +317,6 @@
 ul.submenunavi li a {
 	color:#000060;
 	white-space: nowrap;
-	_white-space:none;
 }
 ul.submenunavi li a:visited {
 	color:#000060;