From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:17:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:17:28 +0900
Subject: [xoops-cvslog 3392] CVS update: xoops2jp/html/kernel
Message-ID: <20060701041728.C46F72AC048@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.7 xoops2jp/html/kernel/block.php:1.2.8.8
--- xoops2jp/html/kernel/block.php:1.2.8.7	Sun Apr 16 11:35:38 2006
+++ xoops2jp/html/kernel/block.php	Sat Jul  1 13:17:28 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.7 2006/04/16 02:35:38 minahito Exp $
+// $Id: block.php,v 1.2.8.8 2006/07/01 04:17:28 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -104,6 +104,10 @@
     /**
      * return the content of the block for output
      *
+     * [ToDo]
+     * Why does this function return reference? Perhaps, it isn't needed even
+     * if it's at compatibility also.
+     *
      * @param string $format
      * @param string $c_type type of content<br>
      * Legal value for the type of content<br>
@@ -115,36 +119,41 @@
      **/
     function &getContent($format = 'S', $c_type = 'T')
     {
+		$ret = null;
+
         switch ( $format ) {
         case 'S':
+		
             // check the type of content
             // H : custom HTML block
             // P : custom PHP block
             // S : use text sanitizater (smilies enabled)
             // T : use text sanitizater (smilies disabled)
             if ( $c_type == 'H' ) {
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'N'));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'N'));
             } elseif ( $c_type == 'P' ) {
                 ob_start();
                 echo eval($this->getVar('content', 'N'));
                 $content = ob_get_contents();
                 ob_end_clean();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
             } elseif ( $c_type == 'S' ) {
                 $myts =& MyTextSanitizer::getInstance();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 1));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 1));
             } else {
                 $myts =& MyTextSanitizer::getInstance();
-                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 0));
+                $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 0));
             }
             break;
         case 'E':
-            return $this->getVar('content', 'E');
+            $ret = $this->getVar('content', 'E');
             break;
         default:
-            return $this->getVar('content', 'N');
+            $ret = $this->getVar('content', 'N');
             break;
         }
+		
+		return $ret;
     }
 
     function &buildBlock()

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:18:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:18:10 +0900
Subject: [xoops-cvslog 3393] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20060701041810.CF0C12AC048@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php
diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.1 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.2
--- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.1	Wed Oct 19 02:18:33 2005
+++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php	Sat Jul  1 13:18:10 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formdhtmltextarea.php,v 1.2.8.1 2005/10/18 17:18:33 minahito Exp $
+// $Id: formdhtmltextarea.php,v 1.2.8.2 2006/07/01 04:18:10 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -85,24 +85,24 @@
      */
     function render()
     {
-        $ret = "<a name='moresmiley'></a><img onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/url.gif' alt='url' onclick='xoopsCodeUrl(\"".$this->getName()."\", \"".htmlspecialchars(_ENTERURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES)."\");' />&nbsp;<img onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/email.gif' alt='email' onclick='javascript:xoopsCodeEmail(\"".$this->getName()."\", \"".htmlspecialchars(_ENTEREMAIL, ENT_QUOTES)."\");' />&nbsp;<img onclick='javascript:xoopsCodeImg(\"".$this->getName()."\", \"".htmlspecialchars(_ENTERIMGURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES)."\", \"".htmlspecialchars(_IMGPOSRORL, ENT_QUOTES)."\", \"".htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/imgsrc.gif' alt='imgsrc' />&nbsp;<img onmouseover='style.cursor=\"hand\"' onclick='javascript:openWithSelfMain(\"".XOOPS_URL."/imagemanager.php?target=".$this->getName()."\",\"imgmanager\",400,430);' src='".XOOPS_URL."/images/image.gif' alt='image' />&nbsp;<img src='".XOOPS_URL."/images/code.gif' onmouseover='style.cursor=\"hand\"' alt='code' onclick='javascript:xoopsCodeCode(\"".$this->getName()."\", \"".htmlspecialchars(_ENTERCODE, ENT_QUOTES)."\");' />&nbsp;<img onclick='javascript:xoopsCodeQuote(\"".$this->getName()."\", \"".htmlspecialchars(_ENTERQUOTE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/quote.gif' alt='quote' /><br />\n";
+        $ret = "<a name='moresmiley'></a><img onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/url.gif' alt='url' onclick='xoopsCodeUrl(\"".$this->getId()."\", \"".htmlspecialchars(_ENTERURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES)."\");' />&nbsp;<img onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/email.gif' alt='email' onclick='javascript:xoopsCodeEmail(\"".$this->getId()."\", \"".htmlspecialchars(_ENTEREMAIL, ENT_QUOTES)."\");' />&nbsp;<img onclick='javascript:xoopsCodeImg(\"".$this->getId()."\", \"".htmlspecialchars(_ENTERIMGURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES)."\", \"".htmlspecialchars(_IMGPOSRORL, ENT_QUOTES)."\", \"".htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/imgsrc.gif' alt='imgsrc' />&nbsp;<img onmouseover='style.cursor=\"hand\"' onclick='javascript:openWithSelfMain(\"".XOOPS_URL."/imagemanager.php?target=".$this->getId()."\",\"imgmanager\",400,430);' src='".XOOPS_URL."/images/image.gif' alt='image' />&nbsp;<img src='".XOOPS_URL."/images/code.gif' onmouseover='style.cursor=\"hand\"' alt='code' onclick='javascript:xoopsCodeCode(\"".$this->getId()."\", \"".htmlspecialchars(_ENTERCODE, ENT_QUOTES)."\");' />&nbsp;<img onclick='javascript:xoopsCodeQuote(\"".$this->getId()."\", \"".htmlspecialchars(_ENTERQUOTE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/quote.gif' alt='quote' /><br />\n";
 
         $sizearray = array("xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large");
-        $ret .= "<select id='".$this->getName()."Size' onchange='setVisible(\"".$this->_hiddenText."\");setElementSize(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
+        $ret .= "<select id='".$this->getId()."Size' onchange='setVisible(\"".$this->_hiddenText."\");setElementSize(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
         $ret .= "<option value='SIZE'>"._SIZE."</option>\n";
         foreach ( $sizearray as $size ) {
             $ret .=  "<option value='$size'>$size</option>\n";
         }
         $ret .= "</select>\n";
         $fontarray = array("Arial", "Courier", "Georgia", "Helvetica", "Impact", "Verdana");
-        $ret .= "<select id='".$this->getName()."Font' onchange='setVisible(\"".$this->_hiddenText."\");setElementFont(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
+        $ret .= "<select id='".$this->getId()."Font' onchange='setVisible(\"".$this->_hiddenText."\");setElementFont(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
         $ret .= "<option value='FONT'>"._FONT."</option>\n";
         foreach ( $fontarray as $font ) {
             $ret .= "<option value='$font'>$font</option>\n";
         }
         $ret .= "</select>\n";
         $colorarray = array("00", "33", "66", "99", "CC", "FF");
-        $ret .= "<select id='".$this->getName()."Color' onchange='setVisible(\"".$this->_hiddenText."\");setElementColor(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
+        $ret .= "<select id='".$this->getId()."Color' onchange='setVisible(\"".$this->_hiddenText."\");setElementColor(\"".$this->_hiddenText."\",this.options[this.selectedIndex].value);'>\n";
         $ret .= "<option value='COLOR'>"._COLOR."</option>\n";
         foreach ( $colorarray as $color1 ) {
             foreach ( $colorarray as $color2 ) {
@@ -113,7 +113,7 @@
         }
         $ret .= "</select><span id='".$this->_hiddenText."'>"._EXAMPLE."</span>\n";
         $ret .= "<br />\n";
-        $ret .= "<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeBold(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/bold.gif' alt='bold' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeItalic(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/italic.gif' alt='italic' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeUnderline(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/underline.gif' alt='underline' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeLineThrough(\"".$this->_hiddenText."\");' src='".XOOPS_URL."/images/linethrough.gif' alt='linethrough' onmouseover='style.cursor=\"hand\"' />&nbsp;&nbsp;<input type='text' id='".$this->getName()."Addtext' size='20' />&nbsp;<input type='button' onclick='xoopsCodeText(\"".$this->getName()."\", \"".$this->_hiddenText."\", \"".htmlspecialchars(_ENTERTEXTBOX, ENT_QUOTES)."\")' class='formButton' value='"._ADD."' /><br /><br /><textarea id='".$this->getName()."' name='".$this->getName()."' onselect=\"xoopsSavePosition('".$this->getName()."');\" onclick=\"xoopsSavePosition('".$this->getName()."');\" onkeyup=\"xoopsSavePosition('".$this->getName()."');\" cols='".$this->getCols()."' rows='".$this->getRows()."'".$this->getExtra().">".$this->getValue()."</textarea><br />\n";
+        $ret .= "<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeBold(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/bold.gif' alt='bold' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeItalic(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/italic.gif' alt='italic' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeUnderline(\"".$this->_hiddenText."\");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_URL."/images/underline.gif' alt='underline' />&nbsp;<img onclick='javascript:setVisible(\"".$this->_hiddenText."\");makeLineThrough(\"".$this->_hiddenText."\");' src='".XOOPS_URL."/images/linethrough.gif' alt='linethrough' onmouseover='style.cursor=\"hand\"' />&nbsp;&nbsp;<input type='text' id='".$this->getId()."Addtext' size='20' />&nbsp;<input type='button' onclick='xoopsCodeText(\"".$this->getId()."\", \"".$this->_hiddenText."\", \"".htmlspecialchars(_ENTERTEXTBOX, ENT_QUOTES)."\")' class='formButton' value='"._ADD."' /><br /><br /><textarea id='".$this->getId()."' name='".$this->getName()."' onselect=\"xoopsSavePosition('".$this->getId()."');\" onclick=\"xoopsSavePosition('".$this->getId()."');\" onkeyup=\"xoopsSavePosition('".$this->getId()."');\" cols='".$this->getCols()."' rows='".$this->getRows()."'".$this->getExtra().">".$this->getValue()."</textarea><br />\n";
         $ret .= $this->_renderSmileys();
         return $ret;
     }
@@ -132,18 +132,18 @@
             $db =& Database::getInstance();
             if ($result = $db->query('SELECT * FROM '.$db->prefix('smiles').' WHERE display=1')) {
                 while ($smiles = $db->fetchArray($result)) {
-                    $ret .= "<img onclick='xoopsCodeSmilie(\"".$this->getName()."\", \" ".$smiles['code']." \");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_UPLOAD_URL."/".htmlspecialchars($smiles['smile_url'], ENT_QUOTES)."' alt='' />";
+                    $ret .= "<img onclick='xoopsCodeSmilie(\"".$this->getId()."\", \" ".$smiles['code']." \");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_UPLOAD_URL."/".htmlspecialchars($smiles['smile_url'], ENT_QUOTES)."' alt='' />";
                 }
             }
         } else {
             $count = count($smiles);
             for ($i = 0; $i < $count; $i++) {
                 if ($smiles[$i]['display'] == 1) {
-                    $ret .= "<img onclick='xoopsCodeSmilie(\"".$this->getName()."\", \" ".$smiles[$i]['code']." \");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_UPLOAD_URL."/".$myts->oopsHtmlSpecialChars($smiles[$i]['smile_url'])."' border='0' alt='' />";
+                    $ret .= "<img onclick='xoopsCodeSmilie(\"".$this->getId()."\", \" ".$smiles[$i]['code']." \");' onmouseover='style.cursor=\"hand\"' src='".XOOPS_UPLOAD_URL."/".$myts->oopsHtmlSpecialChars($smiles[$i]['smile_url'])."' border='0' alt='' />";
                 }
             }
         }
-        $ret .= "&nbsp;[<a href='#moresmiley' onclick='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target=".$this->getName()."\",\"smilies\",300,475);'>"._MORE."</a>]";
+        $ret .= "&nbsp;[<a href='#moresmiley' onclick='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target=".$this->getId()."\",\"smilies\",300,475);'>"._MORE."</a>]";
         return $ret;
     }
 }

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:18:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:18:46 +0900
Subject: [xoops-cvslog 3394] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20060701041846.7E0042AC048@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formelement.php
diff -u xoops2jp/html/class/xoopsform/formelement.php:1.2.8.1 xoops2jp/html/class/xoopsform/formelement.php:1.2.8.2
--- xoops2jp/html/class/xoopsform/formelement.php:1.2.8.1	Wed Oct 19 02:18:33 2005
+++ xoops2jp/html/class/xoopsform/formelement.php	Sat Jul  1 13:18:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formelement.php,v 1.2.8.1 2005/10/18 17:18:33 minahito Exp $
+// $Id: formelement.php,v 1.2.8.2 2006/07/01 04:18:46 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -100,6 +100,12 @@
 	 * @var	string
 	 */
 	var $_description = "";
+	
+	/**
+	 * specified id for the form.
+	 * @var string
+	 */
+	var $_id = null;
 	/**#@-*/
 
 
@@ -144,6 +150,21 @@
 	}
 
 	/**
+	 * Set $id to member property.
+	 * @param string $id
+	 */
+	function setId($id) {
+		$this->_id = $id;
+	}
+	
+	/**
+	 * get the "id" attribute for the element. If ID is empty, return getName().
+	 */
+	function getId() {
+		return $this->_id != null ? $this->_id : $this->getName();
+	}
+
+	/**
 	 * set the "accesskey" attribute for the element
 	 *
 	 * @param	string  $key   "accesskey" attribute for the element

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:20:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:20:24 +0900
Subject: [xoops-cvslog 3395] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20060701042024.DDCB42AC048@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.2 xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.3
--- xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.2	Fri Nov 25 00:28:43 2005
+++ xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php	Sat Jul  1 13:20:24 2006
@@ -1,4 +1,17 @@
 <?php
+/**
+ * [ToDo]
+ * 1) We may have to move this file to other module with following namespace or
+ *    package.
+ * 2) Some users and developers want free elements at $params. For example,
+ *    $params['script']... This function have not impletented that yet. At
+ *    implementing, we will have to define the rule about sanitizing.
+ * 3) Users can't set class element to this function, because XoopsForm is
+ *    used. For format xoops_xxxx functions, we may change XoopsForm class
+ *    group.
+ * 
+ * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.3 2006/07/01 04:20:24 minahito Exp $
+ */
 
 /*
  * Smarty plugin
@@ -9,27 +22,47 @@
  * Date:     Jun 6, 2004
  * Author:   minahito
  * Purpose:  cycle through given values
- * Input:    name = name of form 'name'
- *           values = preset value
- *           cols = default 50
- *           rows = default 5
+ * Input:    name = form 'name'.
+ *           value = preset value. Set raw value without htmlspecialchars().
+ *           id = form 'id'. If it's empty, ID is defined automatically by prefix & name.
+ *           cols = amount of cols. (default 50)
+ *           rows = amount of rows. (default 5)
  * 
  * Examples: {xoopsdhtmltarea name=message cols=40 rows=6 value=$message}
  * -------------------------------------------------------------
  */
+
+define ("XOOPS_DHTMLTAREA_DEFID_PREFIX", "legacy_xoopsform_");
+define ("XOOPS_DHTMLTAREA_DEFAULT_COLS", "50");
+define ("XOOPS_DHTMLTAREA_DEFAULT_ROWS", "5");
+
 function smarty_function_xoops_dhtmltarea($params, &$smarty)
 {
 	if (!class_exists('xoopsformelement')) {
-		require_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+		require_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
 	}
-	$form=null;
+	$form = null;
 
-	if(isset($params['name'])) {
+	if (isset($params['name'])) {
+		//
+		// Fetch major elements from $params.
+		//
 		$name = trim($params['name']);
-		$rows = isset($params['rows']) ? intval($params['rows']) : 5;
-		$cols = isset($params['cols']) ? intval($params['cols']) : 50;
-		$value = isset($params['value']) ? trim($params['value']) : "";
-		$form= new XoopsFormDhtmlTextArea($name,$name,htmlspecialchars($value),$rows,$cols);
+		$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_DHTMLTAREA_DEFAULT_ROWS;
+		$value = isset($params['value']) ? trim($params['value']) : null;
+		$id = isset($params['id']) ? trim($params['id']) : XOOPS_DHTMLTAREA_DEFID_PREFIX . $name;
+
+		//
+		// Build the object for output.
+		//
+		$form =& new XoopsFormDhtmlTextArea($name, $name, htmlspecialchars($value), $rows, $cols);
+		$form->setId($id);
+		if ($class != null) {
+			$form->setClass($class);
+		}
+		
 		print $form->render();
 	}
 }
Index: xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.3 xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.4
--- xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php:1.1.2.3	Fri Nov 25 00:28:21 2005
+++ xoops2jp/html/class/smarty/plugins/function.xoops_textarea.php	Sat Jul  1 13:20:24 2006
@@ -1,4 +1,14 @@
 <?php
+/**
+ * [ToDo]
+ * 1) We may have to move this file to other module with following namespace or
+ *    package.
+ * 2) Some users and developers want free elements at $params. For example,
+ *    $params['script']... This function have not impletented that yet. At
+ *    implementing, we will have to define the rule about sanitizing.
+ * 
+ * @version $Id: function.xoops_textarea.php,v 1.1.2.4 2006/07/01 04:20:24 minahito Exp $
+ */
 
 /*
  * Smarty plugin
@@ -9,41 +19,56 @@
  * Date:     Nov 2, 2005
  * Author:   minahito
  * Purpose:  textarea tag with sanitize.
- * Input:    name = name of form 'name'
- *           value = preset value
- *           class = 
- *           cols = 
- *           rows =
+ * Input:    name = form 'name'.
+ *           value = preset value. Set raw value without htmlspecialchars().
+ *           class = form 'class'.
+ *           id = form 'id'. If it's empty, ID is defined automatically by prefix & name.
+ *           cols = amount of cols. (default 50)
+ *           rows = amount of rows. (default 5)
+ *           readonly = if it's true, textarea becomes readonly.
  * 
  * Examples: {xoopsdhtmltarea name=message cols=40 rows=6 value=$message}
  * -------------------------------------------------------------
  */
+
+define ("XOOPS_TEXTAREA_DEFID_PREFIX", "legacy_xoopsform_");
+define ("XOOPS_TEXTAREA_DEFAULT_COLS", "50");
+define ("XOOPS_TEXTAREA_DEFAULT_ROWS", "5");
+
 function smarty_function_xoops_textarea($params, &$smarty)
 {
-	if(isset($params['name'])) {
+	if (isset($params['name'])) {
+		//
+		// Fetch major elements from $params.
+		//
 		$name = trim($params['name']);
 		$class = isset($params['class']) ? trim($params['class']) : null;
-		$cols = isset($params['cols']) ? intval($params['cols']) : null;
-		$rows = isset($params['rows']) ? intval($params['rows']) : null;
-		$value = isset($params['value']) ? htmlspecialchars($params['value'],ENT_QUOTES) : null;
-		$id = isset($params['id']) ? trim($params['id']) : null;
+		$cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_TEXTAREA_DEFAULT_COLS;
+		$rows = isset($params['rows']) ? intval($params['rows']) : XOOPS_TEXTAREA_DEFAULT_ROWS;
+		$value = isset($params['value']) ? htmlspecialchars($params['value'], ENT_QUOTES) : null;
+		$id = isset($params['id']) ? trim($params['id']) : XOOPS_TEXTAREA_DEFID_PREFIX . $name;
 		$readonly = isset($params['readonly']) ? trim($params['readonly']) : null;
 
-		$string="<textarea name=\"$name\"";
-		if($class)
-			$string.=" class=\"$class\"";
-		if($cols)
-			$string.=" cols=\"$cols\"";
-		if($rows)
-			$string.=" rows=\"$rows\"";
-		if($id)
-			$string.=" id=\"$id\"";
-		if($readonly==1) {
-			$string.=" readonly=\"readonly\"";
+		//
+		// Build string.
+		//
+		$string = "<textarea name=\"${name}\" cols=\"${cols}\" rows=\"${rows}\"";
+		
+		if ($class) {
+			$string .= " class=\"${class}\"";
+		}
+
+		$string .= " id=\"$id\"";
+		
+		if($readonly == 1) {
+			$string .= " readonly=\"readonly\"";
 		}
 
-		$string.=" />".$value."</textarea>";
+		$string .= " />" . $value . "</textarea>";
 
+		//
+		// Output.
+		//
 		print $string;
 	}
 }
Index: xoops2jp/html/class/smarty/plugins/function.xoops_input.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.7 xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.8
--- xoops2jp/html/class/smarty/plugins/function.xoops_input.php:1.1.2.7	Wed Mar 29 18:43:47 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_input.php	Sat Jul  1 13:20:24 2006
@@ -1,4 +1,15 @@
 <?php
+/**
+ * [ToDo]
+ * 1) We may have to move this file to other module with following namespace or
+ *    package.
+ * 2) This function accepts all of <input> pattern. We may have to divide it.
+ * 3) Some users and developers want free elements at $params. For example,
+ *    $params['script']... This function have not impletented that yet. At
+ *    implementing, we will have to define the rule about sanitizing.
+ *
+ * @version $Id: function.xoops_input.php,v 1.1.2.8 2006/07/01 04:20:24 minahito Exp $
+ */
 
 /*
  * Smarty plugin
@@ -13,55 +24,73 @@
  *           key = key of the name. If this parameter is array, set it.
  *           type = "text" or other
  *           value = preset value
- *           class = html class
- *           size =
- *           maxlength =
- *           default ~ 
+ *           class = form 'class'.
+ *           id = form 'id'. If it's empty, ID is defined automatically by prefix & name.
+ *           size = size element.
+ *           maxlength = maxlength element.
+ *           default = If it equals 'value', add "checked" element in the case of "select" or "radio".
+ *           disabled = disabled element.
  * 
  * Examples: {xoops_input name=text value=$message}
  *           {xoops_input name=checkbox value=1 default=$value }
  * -------------------------------------------------------------
  */
+
+define ("XOOPS_INPUT_DEFID_PREFIX", "legacy_xoopsform_");
+
 function smarty_function_xoops_input($params, &$smarty)
 {
-	if(isset($params['name'])) {
+	if (isset($params['name'])) {
+		//
+		// Fetch major elements from $params.
+		//
 		$name = trim($params['name']);
 		$key = isset($params['key']) ? trim($params['key']) : null;
 		$type = isset($params['type']) ? strtolower(trim($params['type'])) : "text";
+		$value = isset($params['value']) ? htmlspecialchars($params['value'], ENT_QUOTES) : null;
 		$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;
 		$maxlength = isset($params['maxlength']) ? intval($params['maxlength']) : null;
-		$value = isset($params['value']) ? htmlspecialchars($params['value'],ENT_QUOTES) : null;
-		$id = isset($params['id']) ? trim($params['id']) : null;
 		$default = isset($params['default']) ? trim($params['default']) : null;
 		
 		$disabled = (isset($params['disabled']) && $params['disabled'] != false) ? true : false;
 
-		if ($key != null)
-		{
-			$string="<input name=\"${name}[${key}]\"";
-		}
-		else
-		{
-			$string="<input name=\"${name}\"";
-		}
-		
-		if($class)
-			$string.=" class=\"${class}\"";
-		if($type)
-			$string.=" type=\"${type}\"";
-		if($size)
-			$string.=" size=\"${size}\"";
-		if($maxlength)
-			$string.=" maxlength=\"${maxlength}\"";
-		if($value!==null)
-			$string.=" value=\"${value}\"";
-		if($id)
-			$string.=" id=\"${id}\"";
-			
+		//
+		// Build string.
+		//
+		if ($key != null) {
+			$string = "<input name=\"${name}[${key}]\"";
+		}
+		else {
+			$string = "<input name=\"${name}\"";
+		}
+		
+		if ($class) {
+			$string .= " class=\"${class}\"";
+		}
+
+		$string .= " id=\"{$id}\"";
+		
+		if ($type) {
+			$string .= " type=\"${type}\"";
+		}
+
+		if ($size) {
+			$string .= " size=\"${size}\"";
+		}
+		
+		if($maxlength) {
+			$string .= " maxlength=\"${maxlength}\"";
+		}
+		
+		if($value !== null) {
+			$string .= " value=\"${value}\"";
+		}
+		
 		if (isset($params['default'])) {
 			$default = trim($params['default']);
-			if ($value==$default) {
+			if ($value == $default) {
 				if ($type = "checkbox" || $type == "radio") {
 					$string .= " checked";
 				}
@@ -69,11 +98,14 @@
 		}
 		
 		if ($disabled) {
-			$string .=" disabled";
+			$string .= " disabled";
 		}
 
-		$string.=" />";
+		$string .= " />";
 
+		//
+		// Output.
+		//
 		print $string;
 	}
 }

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:21:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:21:10 +0900
Subject: [xoops-cvslog 3396] CVS update: xoops2jp/html/class/xoopsform
Message-ID: <20060701042110.63F1C2AC048@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsform/formtextdateselect.php
diff -u xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.1 xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.2
--- xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.1	Wed Oct 19 02:18:33 2005
+++ xoops2jp/html/class/xoopsform/formtextdateselect.php	Sat Jul  1 13:21:10 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: formtextdateselect.php,v 1.2.8.1 2005/10/18 17:18:33 minahito Exp $
+// $Id: formtextdateselect.php,v 1.2.8.2 2006/07/01 04:21:10 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -59,7 +59,7 @@
     {
         $jstime = formatTimestamp($this->getValue(), '"F j, Y H:i:s"');
         include_once XOOPS_ROOT_PATH.'/include/calendarjs.php';
-        return "<input type='text' name='".$this->getName()."' id='".$this->getName()."' size='".$this->getSize()."' maxlength='".$this->getMaxlength()."' value='".date("Y-m-d", $this->getValue())."'".$this->getExtra()." /><input type='reset' value=' ... ' onclick='return showCalendar(\"".$this->getName()."\");'>";
+        return "<input type='text' name='".$this->getName()."' id='".$this->getId()."' size='".$this->getSize()."' maxlength='".$this->getMaxlength()."' value='".date("Y-m-d", $this->getValue())."'".$this->getExtra()." /><input type='reset' value=' ... ' onclick='return showCalendar(\"".$this->getName()."\");'>";
     }
 }
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:22:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:22:31 +0900
Subject: [xoops-cvslog 3397] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060701042231.A4E352AC048@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.2	Tue Mar 28 22:31:45 2006
+++ xoops2jp/html/modules/user/admin/actions/UserListAction.class.php	Sat Jul  1 13:22:31 2006
@@ -22,7 +22,7 @@
 
 	function _getBaseUrl()
 	{
-		return "./index.php?action=UsersList";
+		return "./index.php?action=UserList";
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Sat Jul  1 13:23:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 13:23:04 +0900
Subject: [xoops-cvslog 3398] CVS update: xoops2jp/html
Message-ID: <20060701042304.5C59F2AC048@users.sourceforge.jp>

Index: xoops2jp/html/pda.php
diff -u xoops2jp/html/pda.php:1.2.8.1 xoops2jp/html/pda.php:1.4
--- xoops2jp/html/pda.php:1.2.8.1	Wed Oct 19 02:13:32 2005
+++ xoops2jp/html/pda.php	Wed Aug  3 21:39:11 2005
@@ -1,56 +1,56 @@
-<?php
-// $Id: pda.php,v 1.2.8.1 2005/10/18 17:13:32 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-include "mainfile.php";
-header("Content-Type: text/html");
-
-echo "<html><head><title>". htmlspecialchars($xoopsConfig['sitename'])."</title>
-      <meta name='HandheldFriendly' content='True' />
-      <meta name='PalmComputingPlatform' content='True' />
-      </head>
-      <body>";
-
-$sql = "SELECT storyid, title FROM ".$xoopsDB->prefix("stories")." WHERE published>0 AND published<".time()." ORDER BY published DESC";
-
-$result = $xoopsDB->query($sql,10,0);
-
-if (!$result) {
-    echo "An error occured";
-} else {
-    echo "<img src='images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' border='0' /><br />";
-    echo "<h2>".htmlspecialchars($xoopsConfig['slogan'])."</h2>";
-    echo "<div>";
-    while (list($storyid, $title) = $xoopsDB->fetchRow($result)) {
-        echo "<a href='".XOOPS_URL."/modules/news/print.php?storyid=$storyid'>".htmlspecialchars($title)."</a><br />";
-
-    }
-    echo "</div>";
-}
-
-echo "</body></html>";
-
+<?php
+// $Id: pda.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  This program is free software; you can redistribute it and/or modify     //
+//  it under the terms of the GNU General Public License as published by     //
+//  the Free Software Foundation; either version 2 of the License, or        //
+//  (at your option) any later version.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  You should have received a copy of the GNU General Public License        //
+//  along with this program; if not, write to the Free Software              //
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+
+include "mainfile.php";
+header("Content-Type: text/html");
+
+echo "<html><head><title>". htmlspecialchars($xoopsConfig['sitename'])."</title>
+      <meta name='HandheldFriendly' content='True' />
+      <meta name='PalmComputingPlatform' content='True' />
+      </head>
+      <body>";
+
+$sql = "SELECT storyid, title FROM ".$xoopsDB->prefix("stories")." WHERE published>0 AND published<".time()." ORDER BY published DESC";
+
+$result = $xoopsDB->query($sql,10,0);
+
+if (!$result) {
+    echo "An error occured";
+} else {
+    echo "<img src='images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' border='0' /><br />";
+    echo "<h2>".htmlspecialchars($xoopsConfig['slogan'])."</h2>";
+    echo "<div>";
+    while (list($storyid, $title) = $xoopsDB->fetchRow($result)) {
+        echo "<a href='".XOOPS_URL."/modules/news/print.php?storyid=$storyid'>".htmlspecialchars($title)."</a><br />";
+
+    }
+    echo "</div>";
+}
+
+echo "</body></html>";
+
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:24:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:24:17 +0900
Subject: [xoops-cvslog 3399] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060701072417.89D5C2AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.6	Tue Mar 28 22:28:56 2006
+++ xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php	Sat Jul  1 16:24:17 2006
@@ -32,40 +32,58 @@
 	function Legacy_AbstractModuleInstaller($dirname)
 	{
 		$this->mDirname = $dirname;
-		$this->mLog = new Legacy_ModuleUtilsSimpleLog();
+		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
 	}
 	
 	/**
+	 * Start callback to required member functions with module install
+	 * framework.
+	 * 
 	 * @return bool
 	 */
 	function execute()
 	{
 		$this->mModule =& $this->loadModuleObject($this->mDirname);
-		if (!is_object($this->mModule))
+		
+		if (!is_object($this->mModule)) {
+			$this->_processReport();
 			return false;
+		}
 
 		$this->_installTable();
-		if (!$this->mForceMode && $this->mLog->hasError())
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
 			return false;
+		}
 
 		$this->_installModule();
-		if (!$this->mForceMode && $this->mLog->hasError())
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
 			return false;
+		}
 
 		$this->_installTemplate();
-		if (!$this->mForceMode && $this->mLog->hasError())
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
 			return false;
+		}
 
 		$this->_installBlock();
-		if (!$this->mForceMode && $this->mLog->hasError())
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
 			return false;
+		}
 
 		$this->_installPreference();
-		if (!$this->mForceMode && $this->mLog->hasError())
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
 			return false;
+		}
 		
 		$this->_processScript();
-
+		
+		$this->_processReport();
+		
 		return true;
 	}
 
@@ -130,6 +148,14 @@
 	{
 		$this->mForceMode = $flag;
 	}
+
+	/**
+	 * This member function is called back at the last part of execute().
+	 * Report the conclusion to the log.
+	 */	
+	function _processReport()
+	{
+	}
 	
 	/**
 	 * Return log instance.

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:24:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:24:42 +0900
Subject: [xoops-cvslog 3400] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060701072442.6AD902AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.12 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.13
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.12	Thu May 18 23:04:04 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Sat Jul  1 16:24:42 2006
@@ -61,7 +61,7 @@
                 $adminPerm->setVar('gperm_name', 'module_admin');
 
                 if (!$gpermHandler->insert($adminPerm)) {
-                    $log->addError("Could not set admin permission " . $this->mModule->getVar('mid'));
+                    $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION);
                 }
             }
 
@@ -80,7 +80,7 @@
                             $adminPerm->setVar('gperm_itemid', $modversion['category']);
                             $adminPerm->setVar('gperm_name', 'system_admin');
                             if (!$gpermHandler->insert($adminPerm)) {
-                                $log->addError("Could not set system admin permission " . $this->mModule->getVar('mid'));
+                                $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION);
                             }
                             unset($sysAdminPerm);
                         }
@@ -102,7 +102,7 @@
                         $readPerm->setVar('gperm_name', 'module_read');
 
                         if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
+                            $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION);
                         }
                     }
                 } else {
@@ -116,7 +116,7 @@
                         $readPerm->setVar('gperm_name', 'module_read');
 
                         if (!$gpermHandler->insert($readPerm)) {
-                            $log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
+                            $log->addError(_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION);
                         }
                     }
                 }
@@ -189,11 +189,26 @@
             $funcName = 'xoops_module_install_' . $this->mModule->getVar('dirname');
             if (function_exists($funcName)) {
                 if (!call_user_func($funcName, $this->mModule)) {
-                    $this->mLog->addError("Failed to execute " . $funcName);
+                    $this->mLog->addError(XCUbe_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
                 }
             }
         }
     }
+	
+	function _processReport()
+	{
+		if (!$this->mLog->hasError()) {
+			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+		}
+		else {
+			if (is_object($this->mModule)) {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+			}
+			else {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mDirname));
+			}
+		}
+	}
 
     function hasAgree()
     {

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:24:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:24:56 +0900
Subject: [xoops-cvslog 3401] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060701072456.A0BDD2AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.9
--- xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php:1.1.2.8	Tue Mar 28 22:28:56 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUninstaller.class.php	Sat Jul  1 16:24:56 2006
@@ -21,12 +21,12 @@
 		$module =& $moduleHandler->getByDirname($dirname);
 
 		if (!is_object($module)) {
-			$this->mLog->addError("*Module not found*");
+			$this->mLog->addError(_AD_BASE_ERROR_MODULE_NOT_FOUND);
 			return $error;
 		}
 		
 		if ($module->getVar('isactive') != 0) {
-			$this->mLog->addError("*For uninstall, turn off the active-status of the module.*");
+			$this->mLog->addError(_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE);
 			return $error;
 		}
 
@@ -40,10 +40,10 @@
 	{
 		$moduleHandler =& xoops_gethandler('module');
 		if (!$moduleHandler->delete($this->mModule)) {
-			$this->mLog->addError("*Could not delete module information from XOOPS database.*");
+			$this->mLog->addError(_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB);
 		}
 		else {
-			$this->mLog->addReport("*Delete module information from XOOPS database.*");
+			$this->mLog->addReport(_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB);
 		}
 	}
 
@@ -63,10 +63,10 @@
 
 				$sql = "DROP TABLE " . $db->prefix($table);
 				if ($db->query($sql)) {
-					$this->mLog->addReport("Drop table " . $db->prefix($table));
+					$this->mLog->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_DROP_TABLE, $db->prefix($table)));
 				}
 				else {
-					$this->mLog->addError("Could not drop table " . $db->prefix($table));
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_DROP_TABLE, $db->prefix($table)));
 				}
 			}
 		}
@@ -81,8 +81,10 @@
 
 		$deleteTemplates =& $tplHandler->find(null, 'module', $this->mModule->getVar('mid'));
 		
-		foreach($deleteTemplates as $template) {
-			$tplHandler->delete($template);
+		foreach($deleteTemplates as $tpl) {
+			if (!$tplHandler->delete($tpl)) {
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
+			}
 		}
 	}
 
@@ -99,7 +101,7 @@
 		$gpermHandler =& xoops_gethandler('groupperm');
 		foreach ($blocks as $block) {
 			$blockHandler->delete($block);
-			$this->mLog->addReport("Uninstall block '".$block->getVar('name'));
+			$this->mLog->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED, $block->get('name')));
 
 			//
 			// delete permission
@@ -114,7 +116,7 @@
 		$tplHandler =& xoops_gethandler('tplfile');
 		$criteria =& new Criteria('tpl_module', $this->mModule->getVar('dirname'));
 		if(!$tplHandler->deleteAll($criteria)) {
-			$this->mLog->addError("Could not delete block templates : " . $tplHandler->db->error());
+			$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES, $tplHandler->db->error()));
 		}
 	}
 
@@ -131,11 +133,26 @@
 			$funcName = 'xoops_module_uninstall_' . $this->mModule->getVar('dirname');
 			if (function_exists($funcName)) {
 				if (!call_user_func($funcName, $this->mModule)) {
-					$this->mLog->addError("Failed to execute " . $funcName);
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK, $funcName));
 				}
 			}
 		}
 	}
+	
+	function _processReport()
+	{
+		if (!$this->mLog->hasError()) {
+			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+		}
+		else {
+			if (is_object($this->mModule)) {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+			}
+			else {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE, $this->mDirname));
+			}
+		}
+	}
 }
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php:1.1.2.7	Mon May 22 15:28:50 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUpdater.class.php	Sat Jul  1 16:24:56 2006
@@ -13,7 +13,7 @@
 	 */
 	function execute()
 	{
-		$this->mLog->addReport("Update started");
+		$this->mLog->addReport(_AD_BASE_MESSAGE_UPDATE_STARTED);
 		
 		parent::execute();
 	}
@@ -63,7 +63,7 @@
 			
 			foreach ($delTemplates as $tpl) {
 				if (!$tplHandler->delete($tpl)) {
-					$this->mLog->addError(@sprintf(_MD_A_BASE_ERROR_DELETE_TEMPLATE, $tpl->getVar('tpl_file')));
+					$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_TEMPLATE_UNINSTALLED, $tpl->getVar('tpl_file')));
 				}
 			}
 		}
@@ -181,6 +181,21 @@
 			}
 		}
 	}
+	
+	function _processReport()
+	{
+		if (!$this->mLog->hasError()) {
+			$this->mLog->add(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL, $this->mModule->get('name')));
+		}
+		else {
+			if (is_object($this->mModule)) {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mModule->get('name')));
+			}
+			else {
+				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_UPDATING_MODULE_FAILURE, $this->mDirname));
+			}
+		}
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:25:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:25:13 +0900
Subject: [xoops-cvslog 3402] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060701072513.042652AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.17 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.18
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.17	Mon May 22 15:28:50 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Sat Jul  1 16:25:12 2006
@@ -4,6 +4,10 @@
 
 require_once XOOPS_ROOT_PATH."/class/template.php";
 
+define("MODINSTALL_LOGTYPE_REPORT", "report");
+define("MODINSTALL_LOGTYPE_WARNING", "warning");
+define("MODINSTALL_LOGTYPE_ERROR", "error");
+
 /**
  * A temporary log class.
  */
@@ -14,7 +18,7 @@
 
 	function add($msg)
 	{
-		$this->mMessages[] = array('type' => 'report', 'message' => $msg);
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_REPORT, 'message' => $msg);
 	}
 
 	function addReport($msg)
@@ -24,12 +28,12 @@
 	
 	function addWarning($msg)
 	{
-		$this->mMessages[] = array('type' => 'warning', 'message' => $msg);
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_WARNING, 'message' => $msg);
 	}
 
 	function addError($msg)
 	{
-		$this->mMessages[] = array('type' => 'error', 'message' => $msg);
+		$this->mMessages[] = array('type' => MODINSTALL_LOGTYPE_ERROR, 'message' => $msg);
 		$this->mFetalErrorFlag = true;
 	}
 	
@@ -58,7 +62,7 @@
 		
 		$sqlfile = $sqlfileInfo[XOOPS_DB_TYPE];
 		if (!file_exists(XOOPS_MODULE_PATH . "/" . $dirname . "/" . $sqlfile)) {
-			$log->addError("SQL file not found at $sqlfile");
+			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_SQL_FILE_NOT_FOUND, $sqlfile));
 			return false;
 		}
 
@@ -80,7 +84,7 @@
 			}
 		}
 		
-		$log->addReport("*Database table setup finished.*");
+		$log->addReport(_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED);
 	}
 
 	/**
@@ -127,10 +131,10 @@
 		$tplfile->setVar('tpl_desc', $description, true);
 		
 		if ($tplHandler->insert($tplfile)) {
-			$log->addReport(@sprintf("Template '${fileName}' has been installed."));
+			$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_TEMPLATE_INSTALLED, $fileName));
 		}
 		else {
-			$log->addError(@sprintf(_MD_A_BASE_ERROR_INSERT_TEMPLATE, $fileName));
+			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE, $fileName));
 			return false;
 		}
 
@@ -261,17 +265,17 @@
             $autolink = true;
         }
 		if (!$blockHandler->insert($blockObj, $autolink)) {
-			$log->addError("ERROR : Could not install block whose name is " . $blockObj->getVar('name'));
+			$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK, $blockObj->getVar('name')));
 
 			return false;
 		}
 		else {
-			$log->addReport("block " . $blockObj->getVar('name') . " has been installed");
+			$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_BLOCK_INSTALLED, $blockObj->getVar('name')));
 
 			$tplHandler =& xoops_gethandler('tplfile');
 
 			if (!Legacy_ModuleUtils::installBlockTemplate($module, $blockObj)) {
-				$log->addError("Could not install block template " . $blockObj->getVar('name'));
+				$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL, $blockObj->getVar('name')));
 			}
 			
 			//
@@ -281,7 +285,7 @@
                 if (!empty($block['show_all_module'])) {
         			$link_sql = "INSERT INTO " . $blockHandler->db->prefix('block_module_link') . " (block_id, module_id) VALUES (".$blockObj->getVar('bid').", 0)";
 		        	if (!$blockHandler->db->query($link_sql)) {
-       					$log->addWarn("Could not set link with all module " . $blockObj->getVar('name'));
+       					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_LINK, $blockObj->getVar('name')));
 		        	}
     			}
    				$gpermHandler =& xoops_gethandler('groupperm');
@@ -297,7 +301,7 @@
         				$bperm->setVar('gperm_groupid', $group->getVar('groupid'));
         				$bperm->setNew();
         				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn("Could not set block permission " . $blockObj->getVar('name'));
+        					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
         				}
         			}
 				} else {
@@ -307,7 +311,7 @@
         				$bperm->setVar('gperm_groupid', $mygroup);
         				$bperm->setNew();
         				if (!$gpermHandler->insert($bperm)) {
-        					$log->addWarn("Could not set block permission " . $blockObj->getVar('name'));
+        					$log->addWarn(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION, $blockObj->getVar('name')));
     				    }
     				}
 				}
@@ -435,7 +439,7 @@
 				}
 				
 				if (!$configHandler->insertConfig($config)) {
-					$log->addError("ERROR: Could not insert config " . $configInfo['name']);
+					$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
 				}
 				
 				unset($config);

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:25:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:25:19 +0900
Subject: [xoops-cvslog 3403] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060701072519.E16572AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.11
--- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.10	Mon Jun 26 22:30:46 2006
+++ xoops2jp/html/modules/base/admin/templates/preference_edit.html	Sat Jul  1 16:25:19 2006
@@ -40,7 +40,7 @@
       <th colspan="2">
         <{$smarty.const._MI_BASE_MENU_PREFERENCE}>
         <{if $category != null}>
-           - <{$category->getVar('confcat_name')}>
+           - <{$category->getName()|escape}>
         <{/if}>
       </th>
     </tr>
@@ -69,11 +69,13 @@
 
           <{elseif $config->get('conf_formtype') == 'select_multi'}>
             <select name='<{$config->getVar('conf_name')}>[]' id='<{$config->getVar('conf_name')}>' size='5' multiple>
-              <{assign var=flag value=0}>
-              <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
-                <{if $option->getOptionKey() == $selected}><{assign var=flag value=1}><{/if}>
+              <{foreach item=option from=$config->getOptionItems()}>
+                <{assign var=flag value=0}>
+                <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
+                  <{if $option->getOptionKey() == $selected}><{assign var=flag value=1}><{/if}>
+                <{/foreach}>
+                <option value="<{$option->getOptionKey()|escape}>" <{if $flag}>selected<{/if}>><{$option->getOptionLabel()|escape}></option>
               <{/foreach}>
-              <option value="<{$option->getOptionKey()|escape}>" <{if $flag}>selected<{/if}>><{$option->getOptionLabel()|escape}></option>
             </select>
 
 

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:26:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:26:04 +0900
Subject: [xoops-cvslog 3404] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060701072604.4DFE42AC07E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.43 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.44
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.43	Wed Jun 28 14:46:18 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Sat Jul  1 16:26:04 2006
@@ -271,9 +271,21 @@
 
 	function _processModuleController()
 	{
-		if(parent::_processModuleController()) {
-			$GLOBALS['xoopsModule']=&$this->mModuleController->mModuleObject;			// TODO
-			$GLOBALS['xoopsModuleConfig']=$this->mModuleController->getConfig();
+		$this->mModuleController->prepare();
+
+		if ($this->mModuleController->isModuleProcess()) {
+			if (!$this->mModuleController->isActive()) {
+				die('NOT ACTIVE');	///< @todo
+			}
+
+   			if (!$this->mModuleController->hasPermission()) {
+				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);	// TODO Depens on const message catalog.
+   			}
+
+			$this->mModuleController->setupLanguage();
+			
+			$GLOBALS['xoopsModule'] =& $this->mModuleController->mModuleObject;			// TODO
+			$GLOBALS['xoopsModuleConfig'] = $this->mModuleController->getConfig();
 		}
 	}
 
@@ -799,7 +811,6 @@
 	{
 		require_once XOOPS_BASE_PATH . "/kernel/Legacy_ModuleController.class.php";
 		$controller->mModuleController =& new Legacy_ModuleController($controller);
-		$controller->mModuleController->prepare();
 	}
 
 	function setupRenderSystem(&$controller)
@@ -861,7 +872,6 @@
 	{
 		require_once XOOPS_BASE_PATH . "/class/Legacy_AdminModuleController.class.php";
 		$controller->mModuleController =& new Legacy_AdminModuleController($controller);
-		$controller->mModuleController->prepare();
 	}
 
 	function setupRenderSystem(&$controller)

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:26:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:26:24 +0900
Subject: [xoops-cvslog 3405] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060701072624.560F82AC073@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.39 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.40
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.39	Tue May 30 17:17:26 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Sat Jul  1 16:26:24 2006
@@ -1,18 +1,38 @@
 <?php
 
+define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "ブロックテンプレート '{0}' のインストールに失敗しました");
 define('_AD_BASE_ERROR_BMODULE', "表示先のモジュールを１つ以上指定してください");
+define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "アクティブなモジュールをアンインストールすることはできません。アンインストーするには、モジュールのアクティブ・ステータスをオフにしてください。");
+define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "ブロックテンプレートを削除することができませんでした : {0}");
+define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "コンフィグ {0} をインサートできませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK', "ブロック {0} をインストールできませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE', "Could not install template");
+define('_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION', "管理権限を設定できませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION', "{0}ブロックのアクセス権限を設定できませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "{0}ブロックにおいて、モジュールとのリンクを設定できませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "アクセス権限を設定できませんでした");
+define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "システム管理権限を設定できませんでした");
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
+define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除できませんでした");
+define('_AD_BASE_ERROR_DROP_TABLE', "テーブル {0} をドロップできませんでした");
 define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
+define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "コールバック '{0}' を実行することができませんでした");
 define('_AD_BASE_ERROR_GROUPID', "最低１グループ以上にアクセス権限を与えてください");
 define('_AD_BASE_ERROR_IMG_FILESIZE', "画像の最大ファイルサイズは{0}バイトです");
 define('_AD_BASE_ERROR_IMG_SIZE', "画像の最大サイズは {0} x {1} です");
+define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "{0} モジュールのインストールに失敗しました");
 define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "指定されたモジュールが見つかりませんでした");
 define('_AD_BASE_ERROR_OBJECTEXIST', "{0}の値が不正です");
 define('_AD_BASE_ERROR_OPTIONS', "オプションの値が不正です");
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい");
+define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "sql file not found");
+define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled");
+define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "{0} モジュールのアンインストールに失敗しました");
+define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "{0} モジュールのアップデートに失敗しました");
 define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加");
 define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール");
 define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス");
@@ -129,8 +149,18 @@
 define('_AD_BASE_LANG_TOPPAGE', "トップページ");
 define('_AD_BASE_LANG_VISIBLE', "可視");
 define('_AD_BASE_LANG_WEIGHT', "並び順");
+define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "ブロック {0} をアンインストールしました");
+define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "ブロック {0} をインストールしました");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
+define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "データベーステーブルのセットアップを終了しました");
+define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除しました");
+define('_AD_BASE_MESSAGE_DROP_TABLE', "テーブル {0} をドロップしました");
+define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのインストールに成功しました");
+define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "テンプレート {0} をインストールしました");
+define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのアンインストールに成功しました");
+define('_AD_BASE_MESSAGE_UPDATE_STARTED', "アップデートを開始します");
+define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "{0} モジュールのアップデートに成功しました");
 define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "<a href=\"index.php?action=BlockInstallList\">新しいブロックをインストール</a>して、サイトをカスタマイズしましょう。<br/>モジュール付属のブロック以外にも、<a href=\"index.php?action=CustomBlockEdit\">カスタムブロックを追加</a>して、自由なメッセージをブロックカラムに追加できます。");
 define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Ｑ：ブロックをアンインストールすると？<br/>Ａ：<strong>すべての設定を記録したまま</strong>、表示やリストから消えます。設定を記録してますので、簡単に再インストールすることができます。");
 define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Ｑ：カスタムブロックをアンインストールすると？<br/>Ａ：<strong>削除されずに</strong>、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。");

From minahito ＠ users.sourceforge.jp  Sat Jul  1 16:26:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat,  1 Jul 2006 16:26:24 +0900
Subject: [xoops-cvslog 3406] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060701072624.7A10B2AC07E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.32 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.33
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.32	Tue May 30 17:17:26 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sat Jul  1 16:26:24 2006
@@ -1,18 +1,38 @@
 <?php
 
+define('_AD_BASE_ERROR_BLOCK_TEMPLATE_INSTALL', "Could not install block template '{0}'");
 define('_AD_BASE_ERROR_BMODULE', "bmodule");
+define('_AD_BASE_ERROR_CASE_OF_ACTIVE_MODULE', "Can't uninstall active module. For uninstall, turn off the active-status of the module.");
+define('_AD_BASE_ERROR_COULD_NOT_DELETE_BLOCK_TEMPLATES', "Could not delete block templates　: {0}");
+define('_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG', "Could not insert config '{0}'");
+define('_AD_BASE_ERROR_COULD_NOT_INSTALL_BLOCK', "Could not install '{0}' block");
+define('_AD_BASE_ERROR_COULD_NOT_INSTALL_TEMPLATE', "Could not install '{0}' template");
+define('_AD_BASE_ERROR_COULD_NOT_SET_ADMIN_PERMISSION', "Could not set admin permission");
+define('_AD_BASE_ERROR_COULD_NOT_SET_BLOCK_PERMISSION', "Could not set block permission of '{0}'");
+define('_AD_BASE_ERROR_COULD_NOT_SET_LINK', "Could not set link with all module at '{0}' block");
+define('_AD_BASE_ERROR_COULD_NOT_SET_READ_PERMISSION', "Could not set read permission");
+define('_AD_BASE_ERROR_COULD_NOT_SET_SYSTEM_PERMISSION', "Could not set system admin permission");
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed.");
+define('_AD_BASE_ERROR_DELETE_MODULEINFO_FROM_DB', "Could not delete module information from XOOPS database.");
+define('_AD_BASE_ERROR_DROP_TABLE', "Could not drop table {0}");
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
+define('_AD_BASE_ERROR_FAILED_TO_EXECUTE_CALLBACK', "Failed to execute '{0}' callback");
 define('_AD_BASE_ERROR_GROUPID', "Group Id");
 define('_AD_BASE_ERROR_IMG_FILESIZE', "Img filesize");
 define('_AD_BASE_ERROR_IMG_SIZE', "Img size");
+define('_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE', "Installation of '{1}' module has been failure");
 define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_AD_BASE_ERROR_MODULE_NOT_FOUND', "The specified module is not found");
 define('_AD_BASE_ERROR_OBJECTEXIST', "{0} is wrong.");
 define('_AD_BASE_ERROR_OPTIONS', "Options");
 define('_AD_BASE_ERROR_PLEASE_AGREE', "Please agree the following licence.");
 define('_AD_BASE_ERROR_REQUIRED', "{0} is required.");
 define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "Upload the image file of smilies.");
+define('_AD_BASE_ERROR_SQL_FILE_NOT_FOUND', "SQL file not found at {1}");
+define('_AD_BASE_ERROR_TEMPLATE_UNINSTALLED', "template uninstalled");
+define('_AD_BASE_ERROR_UNINSTALLATION_MODULE_FAILURE', "Uninstallation of '{1}' module has been failure");
+define('_AD_BASE_ERROR_UPDATING_MODULE_FAILURE', "Updating '{1}' module has been failure");
 define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "Add custom block");
 define('_AD_BASE_LANG_ALL_MODULES', "All modules");
 define('_AD_BASE_LANG_ALL_STATUS', "All status");
@@ -129,8 +149,18 @@
 define('_AD_BASE_LANG_TOPPAGE', "Toppage");
 define('_AD_BASE_LANG_VISIBLE', "Visible");
 define('_AD_BASE_LANG_WEIGHT', "Weight");
+define('_AD_BASE_MESSAGE_BLOCK_HAS_BEEN_UNINSTALLED', "Block {0} has been uninstalled");
+define('_AD_BASE_MESSAGE_BLOCK_INSTALLED', "Block {0} has been installed");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Do you really delete it?");
+define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished.");
+define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database.");
+define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}");
+define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful");
+define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{1}' has been installed.");
+define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{1}' module has been successful");
+define('_AD_BASE_MESSAGE_UPDATE_STARTED', "Update started");
+define('_AD_BASE_MESSAGE_UPDATING_MODULE_SUCCESSFUL', "Updating '{1}' module has been successful");
 define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "<a href=\"index.php?action=BlockInstallList\">Install new blocks</a>, and set your site!<br/>If you want to get a free block except modules' blocks, <a href=\"index.php?action=CustomBlockEdit\">create cutom block</a> and write your message to it.");
 define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Even if you uninstall the block, the configuration of the block isn't deleted. The block is removed only from display of your site. Therefore you can re-install the block easily because the installer recovers last configure.");
 define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Even if you uninstall the custom block, the configuration of the block isn't deleted. The block is removed only from display of your site. You can re-install or delete it from database at <a href=\"index.php?action=BlockInstallList\">'install block' page</a>.");

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:45:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:45:43 +0900
Subject: [xoops-cvslog 3407] CVS update: xoops2jp/html/modules/pm/.xml
Message-ID: <20060704094543.761A72AC056@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:45:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:45:45 +0900
Subject: [xoops-cvslog 3408] CVS update: xoops2jp/html/modules/pm/.xml
Message-ID: <20060704094545.867C72AC056@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/.xml/pmlite_edit.xml
diff -u /dev/null xoops2jp/html/modules/pm/.xml/pmlite_edit.xml:1.1.2.1
--- /dev/null	Tue Jul  4 18:45:45 2006
+++ xoops2jp/html/modules/pm/.xml/pmlite_edit.xml	Tue Jul  4 18:45:45 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="PmliteEditForm" type="XCube_ActionForm">
+		<form-property name="id" type="Int" />
+		<form-property name="create_unixtime" type="Int" />
+		<form-property name="update_unixtime" type="Int" />
+		<form-property name="subject" type="String" />
+		<form-property name="message" type="Text" />
+	</form-bean>
+	<form-validation>
+		<field property="subject" depends="required,maxlength">
+			<arg0 key="const._PM_SUBJECT" />
+			<msg name="required" key="const._MD_PM_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._MD_PM_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="message" depends="required">
+			<arg0 key="const._MD_PM_LANG_MESSAGE" />
+			<msg name="required" key="const._MD_PM_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/pm/.xml/pm_delete.xml
diff -u /dev/null xoops2jp/html/modules/pm/.xml/pm_delete.xml:1.1.2.1
--- /dev/null	Tue Jul  4 18:45:45 2006
+++ xoops2jp/html/modules/pm/.xml/pm_delete.xml	Tue Jul  4 18:45:45 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="PmDeleteForm" type="XCube_ActionForm">
+		<form-property name="msg_id" type="Int[]" />
+	</form-bean>
+	<form-validation>
+		<field property="msg_id" depends="required,objectExist">
+			<arg0 key="const._MD_PM_LANG_MSG_ID" />
+			<msg name="required" key="const._MD_PM_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._MD_PM_ERROR_OBJECTEXIST" />
+			<var name="handler" value="privmessage" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:46:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:46:44 +0900
Subject: [xoops-cvslog 3409] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094644.DF6482AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DefaultAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/actions/DefaultAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:46:44 2006
+++ xoops2jp/html/modules/pm/actions/DefaultAction.class.php	Tue Jul  4 18:46:44 2006
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: DefaultAction.class.php,v 1.1.2.1 2006/07/04 09:46:44 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/pm/forms/PmDeleteForm.class.php";
+
+/**
+ * [Notice]
+ * This class has been checked in Alpha4. But, this class doesn't go along the
+ * latest cubson style. And some problems (using core handler, naming rule and
+ * etc) are there. Pm module is one of the most old code in Legacy.
+ * 
+ * [ToDo]
+ * This class should use Action_FilterForm as well as other latest modules.
+ */
+class Pm_DefaultAction extends Pm_AbstractAction
+{
+	var $mActionForm = null;
+	
+	var $mPmObjects = array();
+	
+	var $mPageNavi = null;
+	
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->mActionForm =& new Pm_PmDeleteForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$pmHandler =& xoops_gethandler('privmessage');
+		$total = $pmHandler->getCountByFromUid($xoopsUser->uid());
+
+		$this->mPageNavi =& new XCube_PageNavigator("./index.php", $total, XCUBE_PAGENAVI_START);
+		$this->mPageNavi->fetch();
+
+		$this->mPmObjects =& $pmHandler->getObjectsByFromUid($xoopsUser->uid(), $this->mPageNavi->getStart());
+
+		return PM_FRAME_VIEW_INDEX;
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("viewpmsg.html");
+		$render->setAttribute("pmObjects", $this->mPmObjects);
+		$render->setAttribute("total_messages", count($this->mPmObjects));
+		$render->setAttribute("currentUser", $xoopsUser);
+		$render->setAttribute("anonymous", $controller->getConfig('anonymous'));
+		$render->setAttribute("pageNavi", $this->mPageNavi);
+		$render->setAttribute("actionForm", $this->mActionForm);
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:46:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:46:50 +0900
Subject: [xoops-cvslog 3410] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094650.B04C12AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/PmDefaultAction.class.php
diff -u xoops2jp/html/modules/pm/actions/PmDefaultAction.class.php:1.1.2.5 xoops2jp/html/modules/pm/actions/PmDefaultAction.class.php:removed
--- xoops2jp/html/modules/pm/actions/PmDefaultAction.class.php:1.1.2.5	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/actions/PmDefaultAction.class.php	Tue Jul  4 18:46:50 2006
@@ -1,45 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_PageNavigator.class.php";
-require_once XOOPS_MODULE_PATH."/pm/forms/DeletePmsgForm.class.php";
-
-class PmDefaultAction extends PmAction
-{
-	var $mActionForm=null;
-	
-	var $mPmObjects=array();
-	
-	var $mPageNavi=null;
-	
-	function isSecure()
-	{
-		return true;
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$pmHandler=&xoops_gethandler('privmessage');
-		$total = $pmHandler->getCountByFromUid($xoopsUser->uid());
-
-		$this->mPageNavi=new XCube_PageNavigator("./index.php",$total,XCUBE_PAGENAVI_START);
-		$this->mPageNavi->fetch();
-
-		$this->mPmObjects =& $pmHandler->getObjectsByFromUid($xoopsUser->uid(),$this->mPageNavi->getStart());
-
-		return PM_FRAME_VIEW_INDEX;
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("viewpmsg.html");
-		$renderSystem->setAttribute("pmObjects",$this->mPmObjects);
-		$renderSystem->setAttribute("total_messages",count($this->mPmObjects));
-		$renderSystem->setAttribute("currentUser",$xoopsUser);
-		$renderSystem->setAttribute("anonymous",$controller->getConfig('anonymous'));
-		$renderSystem->setAttribute("pageNavi",$this->mPageNavi);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:47:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:47:23 +0900
Subject: [xoops-cvslog 3411] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094723.DB36D2AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:47:23 2006
+++ xoops2jp/html/modules/pm/actions/DeleteAction.class.php	Tue Jul  4 18:47:23 2006
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: DeleteAction.class.php,v 1.1.2.1 2006/07/04 09:47:23 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/pm/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/pm/forms/PmDeleteForm.class.php";
+
+class Pm_DeleteAction extends Pm_AbstractAction
+{
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->mActionForm =& new Pm_PmDeleteForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function execute(&$controller, &$xoopsUser)
+	{
+		//
+		// Fetch request and validate.
+		//
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+
+		//
+		// If error, go to re-input.
+		//
+		if($this->mActionForm->hasError()) {
+			return PM_FRAME_VIEW_ERROR;
+		}
+
+		//
+		// Delete PM
+		//
+		$handler =& xoops_gethandler('privmessage');
+		foreach ($this->mActionForm->getVar('msg_id') as $msg_id) {
+			$pm =& $handler->get($msg_id);
+			if (is_object($pm) && ($pm->get('to_userid') == $xoopsUser->get('uid'))) {
+				$handler->delete($pm);
+			}
+			unset($pm);
+		}
+
+		return PM_FRAME_VIEW_SUCCESS;
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		XCube_Utils::redirectHeader("./index.php", 1, _PM_DELETED);
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		XCube_Utils::redirectHeader("./index.php", 1, _MD_PM_ERROR_ACCESS);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:47:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:47:30 +0900
Subject: [xoops-cvslog 3412] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094730.D9F552AC056@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/PmDeleteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/PmDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/pm/actions/PmDeleteAction.class.php:removed
--- xoops2jp/html/modules/pm/actions/PmDeleteAction.class.php:1.1.2.3	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/actions/PmDeleteAction.class.php	Tue Jul  4 18:47:30 2006
@@ -1,71 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH."/pm/forms/DeletePmsgForm.class.php";
-
-class PmDeleteAction extends PmAction
-{
-	var $mActionForm=null;
-	
-	function isSecure()
-	{
-		return true;
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return PM_FRAME_VIEW_ERROR;
-	}
-
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-
-		//
-		// Fetch request and validate.
-		//
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-
-		//
-		// If error, go to re-input.
-		//
-		if($this->mActionForm->hasError())
-			return PM_FRAME_VIEW_ERROR;
-
-		//
-		// Delete PM
-		//
-		$pmHandler=&xoops_gethandler('privmessage');
-		foreach($this->mActionForm->getVar('msg_id') as $msg_id) {
-			$pm=&$pmHandler->get($msg_id);
-			if(is_object($pm)&&($pm->getVar('to_userid')==$xoopsUser->getVar('uid')))
-				$pmHandler->delete($pm);
-			unset($pm);
-		}
-
-		return PM_FRAME_VIEW_SUCCESS;
-	}
-
-	function _processActionForm()
-	{
-		//
-		// Create action form object by reply mode? or not?
-		//
-		$this->mActionForm=new DeletePmsgForm();
-		$this->mActionForm->prepare();
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader("./index.php",1,_PM_DELETED);
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader("./index.php",1,_MD_PM_ERROR_ACCESS);
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:47:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:47:51 +0900
Subject: [xoops-cvslog 3413] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094751.78D132AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/PmliteAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/actions/PmliteAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:47:51 2006
+++ xoops2jp/html/modules/pm/actions/PmliteAction.class.php	Tue Jul  4 18:47:51 2006
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: PmliteAction.class.php,v 1.1.2.1 2006/07/04 09:47:51 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/pm/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/pm/forms/PmliteEditForm.class.php";
+
+class Pm_PmliteAction extends Pm_AbstractEditAction
+{
+	var $_mSendType = 0;
+	
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->_mSendType = $moduleConfig['send_type'];
+		parent::prepare($controller, $xoopsUser, $moduleConfig);
+		
+		if (is_object($xoopsUser)) {
+			$this->mObject->set('from_userid', $xoopsUser->get('uid'));
+		}
+	}
+	
+	function _getId()
+	{
+		return 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_gethandler('privmessage');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		//
+		// Create action form object by reply mode? or not?
+		//
+		$this->mActionForm = $this->_mSendType == 0 ? new Pm_PmliteComboEditForm() : new Pm_PmliteDirectEditForm();
+		if (isset($_GET['reply']) && $_GET['reply'] == 1) {
+			$this->mActionForm->changeStateReply();
+		}
+
+		$this->mActionForm->prepare();
+	}
+
+	function _setupObject()
+	{
+		$this->mObjectHandler =& $this->_getHandler();
+		$this->mObject =& $this->mObjectHandler->create();
+	}
+
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		//
+		// Fetch request only (no validate).
+		//
+		$this->mActionForm->fetch();
+
+		return PM_FRAME_VIEW_INPUT;
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("pmlite.html");
+		$render->setAttribute("actionForm", $this->mActionForm);
+		$render->setAttribute("send_type", $this->_mSendType);
+
+		//
+		// If the request doesn't have uid, list up users to template.
+		//
+		if ($this->_mSendType == 0 && $this->mActionForm->getVar('to_userid') == 0) {
+			$handler =& xoops_gethandler('user');
+			$userObjectArr =& $handler->getObjectsByLevel(0);
+			$render->setAttribute("userList", $userObjectArr);
+		}
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("pm_pmlite_success.html");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		XCube_Utils::redirectHeader("pmlite.php", 3, _MD_PM_ERROR_MESSAGE_SEND);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:47:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:47:56 +0900
Subject: [xoops-cvslog 3414] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094756.C0DFF2AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/PmPmliteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/PmPmliteAction.class.php:1.1.2.6 xoops2jp/html/modules/pm/actions/PmPmliteAction.class.php:removed
--- xoops2jp/html/modules/pm/actions/PmPmliteAction.class.php:1.1.2.6	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/actions/PmPmliteAction.class.php	Tue Jul  4 18:47:56 2006
@@ -1,100 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH."/pm/forms/PmliteEditForm.class.php";
-require_once XOOPS_MODULE_PATH."/pm/kernel/PrivateMessage.class.php";	// Wmm..
-
-class PmPmliteAction extends PmAction
-{
-	var $mActionForm=null;
-
-	function isSecure()
-	{
-		return true;
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-
-		//
-		// Fetch request only (no validate).
-		//
-		$this->mActionForm->fetch();
-
-		return PM_FRAME_VIEW_INPUT;
-	}
-
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->_processActionForm();
-
-		//
-		// Fetch request and validate.
-		//
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-
-		//
-		// If error, go to re-input.
-		//
-		if($this->mActionForm->hasError())
-			return PM_FRAME_VIEW_INPUT;
-			
-		//
-		// Send PM
-		//
-		$pmManager=new PrivateMessageManager();	//< TODO
-		$pm=&$pmManager->create();
-
-		$this->mActionForm->update($pm);
-		$pm->setFromUsers($xoopsUser);
-		if($pm->send()) {
-			return PM_FRAME_VIEW_SUCCESS;
-		}
-		else {
-			return PM_FRAME_VIEW_ERROR;
-		}
-	}
-
-	function _processActionForm()
-	{
-		//
-		// Create action form object by reply mode? or not?
-		//
-		$this->mActionForm=($this->mConfig['send_type']==0) ? new PmliteComboEditForm() : new PmliteDirectEditForm();
-		if(isset($_GET['reply'])&&$_GET['reply']==1)
-			$this->mActionForm->changeStateReply();
-
-		$this->mActionForm->prepare();
-	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("pm_pmlite_success.html");
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader("pmlite.php",3,_MD_PM_ERROR_MESSAGE_SEND);
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("pmlite.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("send_type",$this->mConfig['send_type']);
-
-		//
-		// If the request doesn't have uid, list up users to template.
-		//
-		if($this->mConfig['send_type']==0 && $this->mActionForm->getVar('to_userid')==0) {
-			$userHandler=&xoops_gethandler('user');
-			$userObjects=&$userHandler->getObjectsByLevel(0);
-			$renderSystem->setAttribute("userList",$userObjects);
-		}
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:48:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:48:05 +0900
Subject: [xoops-cvslog 3415] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060704094805.976B22AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/PmReadAction.class.php
diff -u xoops2jp/html/modules/pm/actions/PmReadAction.class.php:1.1.2.4 xoops2jp/html/modules/pm/actions/PmReadAction.class.php:removed
--- xoops2jp/html/modules/pm/actions/PmReadAction.class.php:1.1.2.4	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/actions/PmReadAction.class.php	Tue Jul  4 18:48:05 2006
@@ -1,101 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH."/pm/forms/DeletePmsgForm.class.php";
-
-class PmReadAction extends PmAction
-{
-	var $mPrivMessage=null;
-	var $mSendUser=null;
-
-	var $mPreviousMessage=null;
-	var $mNextMessage=null;
-	
-	function isSecure()
-	{
-		return true;
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		//
-		// Request Check without ActionForm
-		//
-		$msg_id=intval($_REQUEST['msg_id']);
-
-
-		//
-		// Load private message object
-		//
-		$pmHandler=&xoops_gethandler('privmessage');
-		$this->mPrivMessage=&$pmHandler->get($msg_id);
-
-		if(!is_object($this->mPrivMessage))
-			return PM_FRAME_VIEW_ERROR;
-
-
-		//
-		// Check read permission and the sender.
-		//
-		if($this->mPrivMessage->getVar('to_userid')!=$xoopsUser->getVar('uid'))
-			return PM_FRAME_VIEW_ERROR;
-
-		$this->mSendUser=&$this->mPrivMessage->getFromUser();
-		if(!is_object($this->mSendUser))
-			return PM_FRAME_VIEW_ERROR;
-
-
-		//
-		// Get previous and next message
-		//
-		$criteria=new CriteriaCompo();
-		$criteria->add(new Criteria('msg_id',$this->mPrivMessage->getVar('msg_id'),"<"));
-		$criteria->setLimit(1);
-		$criteria->setSort('msg_time');
-		$criteria->setOrder('DESC');
-		$tm=&$pmHandler->getObjects($criteria);
-		if(count($tm)>0 && is_object($tm[0]))
-			$this->mPreviousMessage=&$tm[0];
-		unset($tm);
-		unset($criteria);
-
-		$criteria=new CriteriaCompo();
-		$criteria->add(new Criteria('msg_id',$this->mPrivMessage->getVar('msg_id'),">"));
-		$criteria->setLimit(1);
-		$criteria->setSort('msg_time');
-		$tm=&$pmHandler->getObjects($criteria);
-		if(count($tm)>0 && is_object($tm[0]))
-			$this->mNextMessage=&$tm[0];
-
-
-		//
-		// If this message is unread, Raise read flag.
-		//
-		if(!$this->mPrivMessage->isRead())
-			$pmHandler->setRead($this->mPrivMessage);
-
-
-		return PM_FRAME_VIEW_INDEX;
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader("./index.php",1,_MD_PM_ERROR_ACCESS);
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$renderSystem->setTemplateName("readpmsg.html");
-		$renderSystem->setAttribute("thisUser",$xoopsUser);
-		if($this->mSendUser->isActive()) {
-			$renderSystem->setAttribute("sendUser",$this->mSendUser);
-		}
-		$renderSystem->setAttribute("privMessage",$this->mPrivMessage);
-		$renderSystem->setAttribute("previousMessage",$this->mPreviousMessage);
-		$renderSystem->setAttribute("nextMessage",$this->mNextMessage);
-		$renderSystem->setAttribute("anonymous",$controller->getConfig('anonymous'));
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/pm/actions/ReadAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:48:05 2006
+++ xoops2jp/html/modules/pm/actions/ReadAction.class.php	Tue Jul  4 18:48:05 2006
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: ReadAction.class.php,v 1.1.2.1 2006/07/04 09:48:05 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * [Notice]
+ * This class has been checked in Alpha4. But, this class doesn't go along the
+ * latest cubson style. And some problems (using core handler, naming rule and
+ * etc) are there. Pm module is one of the most old code in Legacy.
+ */
+class Pm_ReadAction extends Pm_AbstractAction
+{
+	/**
+	 * A instance of the current private-message.
+	 * 
+	 * @var XoopsPrivmessage
+	 */
+	var $mPrivMessage = null;
+	
+	/**
+	 * A instance of the user that has sent the current private-message.
+	 * 
+	 * @var XoopsUser
+	 */
+	var $mSendUser = null;
+
+	/**
+	 * A instance of previous private-message form the current private-message.
+	 * 
+	 * @var XoopsPrivmessage
+	 */
+	var $mPreviousMessage = null;
+	
+	/**
+	 * A instance of next private-message form the current private-message.
+	 * 
+	 * @var XoopsPrivmessage
+	 */
+	var $mNextMessage = null;
+	
+	function getDefaultView(&$controller,&$xoopsUser)
+	{
+		//
+		// Request Check without ActionForm
+		//
+		$msg_id = intval(xoops_getrequest('msg_id'));
+
+		//
+		// Load private message object
+		//
+		$pmHandler =& xoops_gethandler('privmessage');
+		$this->mPrivMessage =& $pmHandler->get($msg_id);
+
+		if (!is_object($this->mPrivMessage)) {
+			return PM_FRAME_VIEW_ERROR;
+		}
+
+		//
+		// Check read permission and the sender.
+		//
+		if ($this->mPrivMessage->getVar('to_userid') != $xoopsUser->getVar('uid')) {
+			return PM_FRAME_VIEW_ERROR;
+		}
+
+		$this->mSendUser =& $this->mPrivMessage->getFromUser();
+		if (!is_object($this->mSendUser)) {
+			return PM_FRAME_VIEW_ERROR;
+		}
+
+		//
+		// Get previous and next message
+		//
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('msg_id', $this->mPrivMessage->getVar('msg_id'), "<"));
+		$criteria->setLimit(1);
+		$criteria->setSort('msg_time');
+		$criteria->setOrder('DESC');
+		$t_objArr =& $pmHandler->getObjects($criteria);
+		if (count($t_objArr) > 0 && is_object($t_objArr[0])) {
+			$this->mPreviousMessage =& $t_objArr[0];
+		}
+		unset($t_objArr);
+		unset($criteria);
+
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('msg_id', $this->mPrivMessage->getVar('msg_id'), ">"));
+		$criteria->setLimit(1);
+		$criteria->setSort('msg_time');
+		$t_objArr =& $pmHandler->getObjects($criteria);
+		if (count($t_objArr) > 0 && is_object($t_objArr[0])) {
+			$this->mNextMessage =& $t_objArr[0];
+		}
+
+		//
+		// If this message is unread, Raise read flag.
+		//
+		if (!$this->mPrivMessage->isRead()) {
+			$pmHandler->setRead($this->mPrivMessage);
+		}
+
+		return PM_FRAME_VIEW_INDEX;
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		XCube_Utils::redirectHeader("./index.php", 1, _MD_PM_ERROR_ACCESS);
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("readpmsg.html");
+		$render->setAttribute("thisUser", $xoopsUser);
+		if ($this->mSendUser->isActive()) {
+			$render->setAttribute("sendUser", $this->mSendUser);
+		}
+		$render->setAttribute("privMessage", $this->mPrivMessage);
+		$render->setAttribute("previousMessage", $this->mPreviousMessage);
+		$render->setAttribute("nextMessage", $this->mNextMessage);
+		$render->setAttribute("anonymous", $controller->getConfig('anonymous'));
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:48:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:48:35 +0900
Subject: [xoops-cvslog 3416] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20060704094835.0C0352AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/AbstractEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/class/AbstractEditAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:48:34 2006
+++ xoops2jp/html/modules/pm/class/AbstractEditAction.class.php	Tue Jul  4 18:48:34 2006
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: AbstractEditAction.class.php,v 1.1.2.1 2006/07/04 09:48:34 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class Pm_AbstractEditAction extends Pm_AbstractAction
+{
+	var $mObject = null;
+	var $mObjectHandler = null;
+	var $mActionForm = null;
+
+	function _getId()
+	{
+	}
+
+	function &_getHandler()
+	{
+	}
+
+	function _setupActionForm()
+	{
+	}
+
+	function _setupObject()
+	{
+		$id = $this->_getId();
+		
+		$this->mObjectHandler =& $this->_getHandler();
+		
+		$this->mObject =& $this->mObjectHandler->get($id);
+	
+		if ($this->mObject == null && $this->isEnableCreate()) {
+			$this->mObject =& $this->mObjectHandler->create();
+		}
+	}
+
+	function isEnableCreate()
+	{
+		return true;
+	}
+
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->_setupObject();
+		$this->_setupActionForm();
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if ($this->mObject == null) {
+			return PM_FRAME_VIEW_ERROR;
+		}
+	
+		$this->mActionForm->load($this->mObject);
+	
+		return PM_FRAME_VIEW_INPUT;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		if ($this->mObject == null) {
+			return PM2_FRAME_VIEW_ERROR;
+		}
+	
+		$this->mActionForm->load($this->mObject);
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+	
+		if($this->mActionForm->hasError()) {
+			return PM_FRAME_VIEW_INPUT;
+		}
+	
+		$this->mActionForm->update($this->mObject);
+		
+		return $this->_doExecute($this->mObject) ? PM_FRAME_VIEW_SUCCESS
+		                                         : PM_FRAME_VIEW_ERROR;
+	}
+
+	function _doExecute()
+	{
+		return $this->mObjectHandler->insert($this->mObject);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u /dev/null xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:48:34 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php	Tue Jul  4 18:48:34 2006
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: ActionFrame.class.php,v 1.1.2.1 2006/07/04 09:48:34 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionStrategy.class.php";
+
+define ("PM_FRAME_PERFORM_SUCCESS", 1);
+define ("PM_FRAME_PERFORM_FAIL", 2);
+define ("PM_FRAME_INIT_SUCCESS", 3);
+
+define ("PM_FRAME_VIEW_NONE", 1);
+define ("PM_FRAME_VIEW_SUCCESS", 2);
+define ("PM_FRAME_VIEW_ERROR", 3);
+define ("PM_FRAME_VIEW_INDEX", 4);
+define ("PM_FRAME_VIEW_INPUT", 5);
+
+class Pm_ActionFrame extends XCube_ActionStrategy
+{
+	var $mActionName = null;
+	var $mAction = null;
+	var $mAdminFlag = null;
+
+	function Pm_ActionFrame($admin)
+	{
+		$this->mAdminFlag = $admin;
+	}
+
+	function setActionName($name)
+	{
+		$this->mActionName = $name;
+	}
+
+	function &execute(&$controller)
+	{
+		if (!preg_match("/^\w+$/", $this->mActionName)) {
+			die();
+		}
+	
+		//
+		// Create action object by mActionName
+		//
+		$className = "Pm_" . ucfirst($this->mActionName) . "Action";
+		$fileName = ucfirst($this->mActionName) . "Action";
+		if ($this->mAdminFlag) {
+			$fileName = XOOPS_MODULE_PATH . "/pm/admin/actions/${fileName}.class.php";
+		}
+		else {
+			$fileName = XOOPS_MODULE_PATH . "/pm/actions/${fileName}.class.php";
+		}
+	
+		if (!file_exists($fileName)) {
+			die();
+		}
+	
+		require_once $fileName;
+	
+		if (class_exists($className)) {
+			$this->mAction =& new $className();
+		}
+	
+		if (!is_object($this->mAction)) {
+			$this->doActionNotFoundError($controller);
+			return;
+		}
+	
+		$handler =& xoops_gethandler('config');
+		$moduleConfig =& $handler->getConfigsByDirname('pm');
+	
+		$this->mAction->prepare($controller, $controller->getXoopsUser(), $moduleConfig);
+	
+		if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser(), $moduleConfig)) {
+			$this->doPermissionError();
+			return;
+		}
+	
+		if (xoops_getenv("REQUEST_METHOD") == "POST") {
+			$viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
+		}
+		else {
+			$viewStatus = $this->mAction->getDefaultView($controller, $controller->getXoopsUser());
+		}
+	
+		switch($viewStatus) {
+			case PM_FRAME_VIEW_SUCCESS:
+				$this->mAction->executeViewSuccess($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+		
+			case PM_FRAME_VIEW_ERROR:
+				$this->mAction->executeViewError($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+		
+			case PM_FRAME_VIEW_INDEX:
+				$this->mAction->executeViewIndex($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+		
+			case PM_FRAME_VIEW_INPUT:
+				$this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+		}
+	}
+
+	function doPermissionError()
+	{
+		$errorMessages = array(_PM_SORRY, _PM_PLZREG);
+		XCube_Utils::redirectHeader(XOOPS_URL, 2, $errorMessages);
+	}
+
+	function doActionNotFoundError($controller)
+	{
+		$controller->executeForward(XOOPS_URL);
+		return;
+	}
+
+	function checkPermission($name, $itemIds)
+	{
+	}
+}
+
+class Pm_AbstractAction
+{
+	function Pm_AbstractAction()
+	{
+	}
+
+	function prepare(&$controller, &$xoopsUser)
+	{
+	}
+
+	function hasPermission(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		return is_object($xoopsUser);
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		return PM_FRAME_VIEW_NONE;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		return PM_FRAME_VIEW_NONE;
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+	}
+}
+
+?>
Index: xoops2jp/html/modules/pm/class/AbstractDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/class/AbstractDeleteAction.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:48:34 2006
+++ xoops2jp/html/modules/pm/class/AbstractDeleteAction.class.php	Tue Jul  4 18:48:34 2006
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package Pm
+ * @version $Id: AbstractDeleteAction.class.php,v 1.1.2.1 2006/07/04 09:48:34 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/pm/class/AbstractEditAction.class.php";
+
+class Pm_AbstractDeleteAction extends Pm_AbstractEditAction
+{
+	function isEnableCreate()
+	{
+		return false;
+	}
+
+	function _doExecute()
+	{
+		return $this->mObjectHandler->delete($this->mObject);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:49:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:49:00 +0900
Subject: [xoops-cvslog 3417] CVS update: xoops2jp/html/modules/pm
Message-ID: <20060704094900.E28E12AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/pmlite.php
diff -u xoops2jp/html/modules/pm/pmlite.php:1.1.2.3 xoops2jp/html/modules/pm/pmlite.php:1.1.2.4
--- xoops2jp/html/modules/pm/pmlite.php:1.1.2.3	Mon Dec 26 21:25:51 2005
+++ xoops2jp/html/modules/pm/pmlite.php	Tue Jul  4 18:49:00 2006
@@ -1,54 +1,24 @@
 <?php
-// $Id: pmlite.php,v 1.1.2.3 2005/12/26 12:25:51 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @package Pm
+ * @version $Id: pmlite.php,v 1.1.2.4 2006/07/04 09:49:00 minahito Exp $
+ */
 
 require_once "../../mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
+require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
 
 $root =& XCube_Root::getSingleton();
-$renderSystem =& $root->mController->getRenderSystem();
 
-require_once "./class/PmActionFrame.class.php";
-
-$moduleRunner =& new PmActionFrame();
+$moduleRunner =& new Pm_ActionFrame(false);
 $moduleRunner->setActionName("pmlite");
 
 $root->mController->setDialogMode(true);
 
-//
-// Regist the module level easy framework to virtual controller.
-//
 $root->mController->setActionStrategy($moduleRunner);
 
-//
-// Execute framework.
-//
 $root->mController->executeAction();
 
+require_once XOOPS_ROOT_PATH . "/footer.php";
 
-require_once XOOPS_ROOT_PATH."/footer.php";
-
-?>
\ No newline at end of file
+?>
Index: xoops2jp/html/modules/pm/index.php
diff -u xoops2jp/html/modules/pm/index.php:1.1.2.2 xoops2jp/html/modules/pm/index.php:1.1.2.3
--- xoops2jp/html/modules/pm/index.php:1.1.2.2	Sun Nov 13 13:34:12 2005
+++ xoops2jp/html/modules/pm/index.php	Tue Jul  4 18:49:00 2006
@@ -1,56 +1,24 @@
 <?php
-// $Id: index.php,v 1.1.2.2 2005/11/13 04:34:12 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @package Pm
+ * @version $Id: index.php,v 1.1.2.3 2006/07/04 09:49:00 minahito Exp $
+ */
 
 require_once "../../mainfile.php";
-require_once XOOPS_ROOT_PATH."/header.php";
+require_once XOOPS_ROOT_PATH . "/header.php";
+require_once XOOPS_MODULE_PATH . "/pm/class/ActionFrame.class.php";
 
-$root=&XCube_Root::getSingleton();
-$renderSystem=&$root->mController->getRenderSystem();
+$root =& XCube_Root::getSingleton();
 
-require_once "./class/PmActionFrame.class.php";
+$actionName = isset($_GET['action']) ? trim($_GET['action']) : "default";
 
-$actionName=strtolower(isset($_GET['action']) ? trim($_GET['action']) : "default");
-if($actionName=="pmlite")
-	$actionName="default";
-
-$moduleRunner=new PmActionFrame();
+$moduleRunner =& new Pm_ActionFrame(false);
 $moduleRunner->setActionName($actionName);
 
-//
-// Regist the module level easy framework to virtual controller.
-//
 $root->mController->setActionStrategy($moduleRunner);
 
-//
-// Execute framework.
-//
 $root->mController->executeAction();
 
+require_once XOOPS_ROOT_PATH . "/footer.php";
 
-require_once XOOPS_ROOT_PATH."/footer.php";
-
-?>
\ No newline at end of file
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:49:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:49:32 +0900
Subject: [xoops-cvslog 3418] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060704094932.2054A2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/PmDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/pm/forms/PmDeleteForm.class.php:1.1.2.1
--- /dev/null	Tue Jul  4 18:49:32 2006
+++ xoops2jp/html/modules/pm/forms/PmDeleteForm.class.php	Tue Jul  4 18:49:31 2006
@@ -0,0 +1,33 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+
+class Pm_PmDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.pm.PmDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['msg_id'] =& new XCube_IntArrayProperty('msg_id');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['msg_id'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['msg_id']->setDependsByArray(array('required','objectExist'));
+		$this->mFieldProperties['msg_id']->addMessage('required', _MD_PM_ERROR_REQUIRED, _MD_PM_LANG_MSG_ID);
+		$this->mFieldProperties['msg_id']->addMessage('objectExist', _MD_PM_ERROR_OBJECTEXIST, _MD_PM_LANG_MSG_ID);
+		$this->mFieldProperties['msg_id']->addVar('handler', 'privmessage');
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:49:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:49:44 +0900
Subject: [xoops-cvslog 3419] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060704094944.167452AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php
diff -u xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.6 xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.7
--- xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.6	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php	Tue Jul  4 18:49:43 2006
@@ -12,61 +12,61 @@
  * @auchor makeActionForm
  * @abstract
  */
-class PmliteEditForm extends XCube_ActionForm 
+class Pm_PmliteEditForm extends XCube_ActionForm 
 {
-	var $mState=null;
+	var $mState = null;
 	
 	function getTokenName()
 	{
-		return "module.user.PmliteEditForm.TOKEN";
+		return "module.pm.PmliteEditForm.TOKEN";
 	}
 
 	function prepare()
 	{
-		$this->mFormProperties['subject']=new XCube_StringProperty('subject');
-		$this->mFormProperties['message']=new XCube_TextProperty('message');
+		$this->mFormProperties['subject'] = new XCube_StringProperty('subject');
+		$this->mFormProperties['message'] = new XCube_TextProperty('message');
 
 		// set fields
-		$this->mFieldProperties['subject']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['subject']->setDependsByArray(array('required'));
-		$this->mFieldProperties['subject']->addMessage("required",_MD_PM_ERROR_REQUIRED,_PM_SUBJECT);
+		$this->mFieldProperties['subject'] = new XCube_FieldProperty($this);
+		$this->mFieldProperties['subject']->setDependsByArray(array('required', 'maxlength'));
+		$this->mFieldProperties['subject']->addMessage("required", _MD_PM_ERROR_REQUIRED, _PM_SUBJECT);
+		$this->mFieldProperties['subject']->addMessage('maxlength', _MD_PM_ERROR_MAXLENGTH, _PM_SUBJECT, '255');
+		$this->mFieldProperties['subject']->addVar('maxlength', '255');
 
-		$this->mFieldProperties['message']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['message'] = new XCube_FieldProperty($this);
 		$this->mFieldProperties['message']->setDependsByArray(array('required'));
-		$this->mFieldProperties['message']->addMessage("required",_MD_PM_ERROR_REQUIRED,_MD_PM_LANG_MESSAGE);
+		$this->mFieldProperties['message']->addMessage("required", _MD_PM_ERROR_REQUIRED, _MD_PM_LANG_MESSAGE);
 
-		if(is_object($this->mState))
+		if (is_object($this->mState)) {
 			$this->mState->prepare($this);
+		}
 	}
 	
 	function fetch()
 	{
 		parent::fetch();
 
-		if(is_object($this->mState))
+		if (is_object($this->mState)) {
 			$this->mState->fetch($this);
+		}
 	}
 
 	function changeStateReply()
 	{
-		$this->mState=new PmliteEditFormReplyState();
-	}
-
-	function setToUser(&$user)
-	{
+		$this->mState =& new Pm_PmliteEditFormReplyState();
 	}
-
+	
 	function resetToUser()
 	{
 	}
 }
 
-class PmliteComboEditForm extends PmliteEditForm
+class Pm_PmliteComboEditForm extends PmliteEditForm
 {
 	function prepare()
 	{
 		parent::prepare();
-		$this->mFormProperties['to_userid']=new XCube_IntProperty('to_userid');
+		$this->mFormProperties['to_userid'] = new XCube_IntProperty('to_userid');
 	}
 
 	/**
@@ -74,48 +74,38 @@
 	 */
 	function validateTo_userid()
 	{
-		if($this->get('to_userid')) {
-			$userHandler=&xoops_gethandler('user');
-			$user=&$userHandler->get($this->get('to_userid'));
+		if ($this->get('to_userid')) {
+			$handler =& xoops_gethandler('user');
+			$user =& $handler->get($this->get('to_userid'));
 
-			if(!(is_object($user)&&$user->isActive())) {
-				$this->set('to_userid',0);
+			if (!(is_object($user) && $user->isActive())) {
+				$this->set('to_userid', 0);
 				$this->addErrorMessage(_PM_USERNOEXIST);
 			}
 		}
 	}
 
-	/**
-	 * @param $pm PrivateMessage
-	 */
-	function update(&$pm)
-	{
-		$userHandler=&xoops_gethandler('user');
-		$toUser=&$userHandler->get($this->get('to_userid'));
-		$pm->setToUsers($toUser);
-		$pm->setSubject($this->get("subject"));
-		$pm->setMessage($this->get("message"));
-	}
-
-	function setToUser(&$user)
+	function update(&$obj)
 	{
-		$this->set('to_userid',$user->get('uid'));
+		$obj->setVar('to_userid', $this->get('to_userid'));
+		$obj->setVar('subject', $this->get('subject'));
+		$obj->setVar('msg_text', $this->get('message'));
 	}
 	
 	function resetToUser()
 	{
-		$this->set('to_userid',0);
+		$this->set('to_userid', 0);
 	}
 }
 
-class PmliteDirectEditForm extends PmliteEditForm
+class Pm_PmliteDirectEditForm extends PmliteEditForm
 {
-	var $mToUser;
+	var $_mUid;
 
 	function prepare()
 	{
 		parent::prepare();
-		$this->mFormProperties['to_uname']=new XCube_StringProperty('to_uname');
+		$this->mFormProperties['to_uname'] = new XCube_StringProperty('to_uname');
 	}
 
 	/**
@@ -123,51 +113,43 @@
 	 */
 	function validateTo_uname()
 	{
-		if($this->get('to_uname')) {
-			$userHandler=&xoops_gethandler('user');
-			$criteria=new Criteria("uname",$this->get("to_uname"));
-			$users=&$userHandler->getObjects($criteria);
+		if ($this->get('to_uname')) {
+			$handler =& xoops_gethandler('user');
+			$criteria =& new Criteria("uname", $this->get("to_uname"));
+			$userArr =& $userHandler->getObjects($criteria);
 
-			if(!(count($users)>0 && is_object($users[0]) && $users[0]->isActive())) {
+			if (!(count($userArr) > 0 && is_object($userArr[0]) && $userArr[0]->isActive())) {
 				$this->addErrorMessage(_PM_USERNOEXIST);
 			}
 			
-			$this->mToUser=&$users[0];
+			$this->_mId = $userArr[0]->get('uid');
 		}
 	}
 
-	/**
-	 * @param $pm PrivateMessage
-	 */
-	function update(&$pm)
-	{
-		$pm->setToUsers($this->mToUser);
-		$pm->setSubject($this->get("subject"));
-		$pm->setMessage($this->get("message"));
-	}
-
-	function setToUser(&$user)
+	function update(&$obj)
 	{
-		$this->set('to_uname',$user->get('uname'));
+		$obj->setVar('to_userid', $this->_mUid);
+		$obj->setVar('subject', $this->get('subject'));
+		$obj->setVar('msg_text', $this->get('message'));
 	}
-
+	
 	function resetToUser()
 	{
-		$this->set('to_uname',"");
+		$this->_mUid = 0;
 	}
 }
 
 /**
  * This shows reply-mode for ActionForm of pmlite.
  */
-class PmliteEditFormReplyState
+class Pm_PmliteEditFormReplyState
 {
 	/**
 	 * @param $form PmliteEditForm
 	 */
 	function prepare(&$form)
 	{
-		$form->mFormProperties['msg_id']=new XCube_IntProperty('msg_id');
+		$form->mFormProperties['msg_id'] = new XCube_IntProperty('msg_id');
 	}
 
 	/**
@@ -175,27 +157,34 @@
 	 */
 	function fetch(&$form)
 	{
-		if($form->get('msg_id')) {
-			$pmHandler=&xoops_gethandler('privmessage');
-			$pm=&$pmHandler->get($form->get('msg_id'));
-			if(is_object($pm)) {
-				$root=XCube_Root::getSingleton();
-				$currentUser=&$root->mController->getXoopsUser();
-				if($pm->get('to_userid')==$currentUser->get('uid')) {
-					if(!preg_match("/^Re:/",$pm->get('subject')))
-						$form->set('subject',"Re: ".$pm->get('subject'));
+		if ($form->get('msg_id')) {
+			$handler =& xoops_gethandler('privmessage');
+			$pm =& $handler->get($form->get('msg_id'));
+			if (is_object($pm)) {
+				$root =& XCube_Root::getSingleton();
+				$currentUser =& $root->mController->getXoopsUser();
+				if ($pm->get('to_userid') == $currentUser->get('uid')) {
+					//
+					// Create subject
+					//
+					if (!preg_match("/^Re:/", $pm->get('subject'))) {
+						$form->set('subject', "Re: " . $pm->get('subject'));
+					}
 
 					// TODO Use Active Check
-					$userHandler=&xoops_gethandler('user');
-					$user=&$userHandler->get($pm->get('from_userid'));
-
-					$form->setToUser($user);
-					$message="[quote]\n";
-					$message.=sprintf(_PM_USERWROTE,$user->get('uname')) . "\n";
-					$message.=$pm->getProperty("msg_text") . "\n";
-					$message.="[/quote]\n";
-					$form->set("message",$message);
+					$handler =& xoops_gethandler('user');
+					$user =& $handler->get($pm->get('from_userid'));
 					
+					if (!(is_object($user) && $user->isActive())) {
+						$this->addErrorMessage(_PM_USERNOEXIST);
+					}
+					else {
+						$message = "[quote]\n";
+						$message .= sprintf(_PM_USERWROTE, $user->get('uname')) . "\n";
+						$message .= $pm->get("msg_text") . "\n";
+						$message .= "[/quote]\n";
+						$form->set('message', $message);
+					}
 					return;
 				}
 			}
@@ -204,7 +193,7 @@
 		//
 		// Reset
 		//
-		$form->set('msg_id',0);
+		$form->set('msg_id', 0);
 		$form->resetToUser();
 	}
 }

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:49:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:49:53 +0900
Subject: [xoops-cvslog 3420] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060704094953.A55882AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/main.php
diff -u xoops2jp/html/modules/pm/language/english/main.php:1.1.2.3 xoops2jp/html/modules/pm/language/english/main.php:1.1.2.4
--- xoops2jp/html/modules/pm/language/english/main.php:1.1.2.3	Sat Feb  4 12:38:04 2006
+++ xoops2jp/html/modules/pm/language/english/main.php	Tue Jul  4 18:49:53 2006
@@ -1,10 +1,13 @@
 <?php
 
 define('_MD_PM_ERROR_ACCESS', "Access error");
+define('_MD_PM_ERROR_MAXLENGTH', "maxlength");
 define('_MD_PM_ERROR_MESSAGE_SEND', "Sending message has been failed.");
+define('_MD_PM_ERROR_OBJECTEXIST', "objectexist");
 define('_MD_PM_ERROR_REQUIRED', "{0} is required");
 define('_MD_PM_LANG_MESSAGE', "Message");
 define('_MD_PM_LANG_MESSAGE_DETAIL', "Details of message");
+define('_MD_PM_LANG_MSG_ID', "msg id");
 define('_MD_PM_LANG_SUBJECTC', "Subject： ");
 define('_PM_CANCELSEND', "Cancel sending");
 define('_PM_CLEAR', "Clear");

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:49:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:49:53 +0900
Subject: [xoops-cvslog 3421] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060704094953.D48622AC035@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/main.php
diff -u xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.7 xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.8
--- xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.7	Sat Feb  4 12:38:11 2006
+++ xoops2jp/html/modules/pm/language/japanese/main.php	Tue Jul  4 18:49:53 2006
@@ -1,10 +1,13 @@
 <?php
 
 define('_MD_PM_ERROR_ACCESS', "アクセスエラーです");
+define('_MD_PM_ERROR_MAXLENGTH', "maxlength");
 define('_MD_PM_ERROR_MESSAGE_SEND', "メッセージの送信に失敗しました");
+define('_MD_PM_ERROR_OBJECTEXIST', "objectexist");
 define('_MD_PM_ERROR_REQUIRED', "{0}は必ず入力してください");
 define('_MD_PM_LANG_MESSAGE', "メッセージ");
 define('_MD_PM_LANG_MESSAGE_DETAIL', "メッセージの詳細");
+define('_MD_PM_LANG_MSG_ID', "msg id");
 define('_MD_PM_LANG_SUBJECTC', "件名： ");
 define('_PM_CANCELSEND', "キャンセル");
 define('_PM_CLEAR', "クリア");

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:50:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:50:07 +0900
Subject: [xoops-cvslog 3422] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060704095007.476782AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.9 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.10
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.9	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Tue Jul  4 18:50:07 2006
@@ -5,6 +5,7 @@
 <span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._PM_INBOX}><br /><br />
 
 <form name="prvmsg" method="post" action="./index.php?action=delete">
+<{xoops_token form=$actionForm}>
 <table border="0" cellspacing="1" cellpadding="4" width="100%" class="outer">
   <tr style="text-align:center;" valign="middle">
     <th>

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:51:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:51:18 +0900
Subject: [xoops-cvslog 3423] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20060704095118.1139E2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/PmActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/PmActionFrame.class.php:1.1.2.4 xoops2jp/html/modules/pm/class/PmActionFrame.class.php:removed
--- xoops2jp/html/modules/pm/class/PmActionFrame.class.php:1.1.2.4	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/class/PmActionFrame.class.php	Tue Jul  4 18:51:18 2006
@@ -1,174 +0,0 @@
-<?php
-// $Id$
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionStrategy.class.php";
-
-define ("PM_FRAME_PERFORM_SUCCESS",1);
-define ("PM_FRAME_PERFORM_FAIL",2);
-define ("PM_FRAME_INIT_SUCCESS",3);
-
-define ("PM_FRAME_VIEW_NONE",0);
-define ("PM_FRAME_VIEW_SUCCESS",1);
-define ("PM_FRAME_VIEW_ERROR",2);
-define ("PM_FRAME_VIEW_INDEX",3);
-define ("PM_FRAME_VIEW_INPUT",4);
-
-/**
- * This is simple frame work for misc page controller.
- * @package pm
- */
-class PmActionFrame extends XCube_ActionStrategy
-{
-	var $mActionName="";
-	var $mAction=null;
-	
-	function PmActionFrame()
-	{
-	}
-	
-	function setActionName($actionName)
-	{
-		$this->mActionName=$actionName;
-	}
-	
-	function execute(&$controller)
-	{
-		if($this->mActionName==null)
-			$this->mActionName=isset($_REQUEST['action']) ? trim($_REQUEST['action']) : null;
-
-		if(!preg_match("/^\w+$/",$this->mActionName))
-			die();
-
-
-		//
-		// Create action object by mActionName
-		//
-		$className="Pm".ucfirst($this->mActionName)."Action";
-		$fileName=XOOPS_MODULE_PATH."/pm/actions/${className}.class.php";
-		if(!file_exists($fileName))
-			die();	// TODO
-		
-		require_once $fileName;
-		if(class_exists($className))
-				$this->mAction=new $className($controller,$controller->getXoopsUser());
-		
-		if(!is_object($this->mAction))
-			die();	// TODO
-
-		//
-		// Simple Permission check
-		//
-		if($this->mAction->isSecure()&&!is_object($controller->getXoopsUser())) {
-			$errorMessages= array(_PM_SORRY,_PM_PLZREG);
-			XCube_Utils::redirectHeader(XOOPS_URL,2,$errorMessages);
-		}
-		
-		//
-		// Simple execute action switch.
-		//
-		if(xoops_getenv("REQUEST_METHOD")=="POST") {
-			$viewStatus=$this->mAction->execute($controller,$controller->getXoopsUser());
-		}
-		else {
-			$viewStatus=$this->mAction->getDefaultView($controller,$controller->getXoopsUser());
-		}
-
-
-		//
-		// Call the view stab method of action by $viewStatus
-		//
-		switch($viewStatus) {
-			case PM_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case PM_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case PM_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-
-			case PM_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-		}
-	}
-}
-
-class PmAction
-{
-	var $mConfig;
-	
-	function PmAction(&$controller,&$xoopsUser)
-	{
-		$this->mConfig=$controller->mModuleController->getConfig();
-	}
-	
-	/**
-	 * @return bool
-	 */
-	function isSecure()
-	{
-		return false;
-	}
-	
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return PM_FRAME_VIEW_NONE;
-	}
-	
-	function execute()
-	{
-		return PM_FRAME_VIEW_NONE;
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul  4 18:51:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue,  4 Jul 2006 18:51:24 +0900
Subject: [xoops-cvslog 3424] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060704095124.72E7B2AC02B@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/DeletePmsgForm.class.php
diff -u xoops2jp/html/modules/pm/forms/DeletePmsgForm.class.php:1.1.2.2 xoops2jp/html/modules/pm/forms/DeletePmsgForm.class.php:removed
--- xoops2jp/html/modules/pm/forms/DeletePmsgForm.class.php:1.1.2.2	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/pm/forms/DeletePmsgForm.class.php	Tue Jul  4 18:51:24 2006
@@ -1,25 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class DeletePmsgForm extends XCube_ActionForm 
-{
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['msg_id']=new XCube_IntArrayProperty('msg_id');
-
-		// set fields
-		$this->mFieldProperties['msg_id']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['msg_id']->setDependsByArray(array('required'));
-
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Wed Jul  5 11:36:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Jul 2006 11:36:23 +0900
Subject: [xoops-cvslog 3425] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060705023623.6C03E2AC033@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php
diff -u xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.7 xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.8
--- xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php:1.1.2.7	Tue Jul  4 18:49:43 2006
+++ xoops2jp/html/modules/pm/forms/PmliteEditForm.class.php	Wed Jul  5 11:36:23 2006
@@ -61,7 +61,7 @@
 	}
 }
 
-class Pm_PmliteComboEditForm extends PmliteEditForm
+class Pm_PmliteComboEditForm extends Pm_PmliteEditForm
 {
 	function prepare()
 	{
@@ -98,7 +98,7 @@
 	}
 }
 
-class Pm_PmliteDirectEditForm extends PmliteEditForm
+class Pm_PmliteDirectEditForm extends Pm_PmliteEditForm
 {
 	var $_mUid;
 

From minahito ＠ users.sourceforge.jp  Wed Jul  5 11:37:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Jul 2006 11:37:06 +0900
Subject: [xoops-cvslog 3426] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060705023706.C7F3A2AC074@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.10 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.11
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.10	Tue Jul  4 18:50:07 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Wed Jul  5 11:37:06 2006
@@ -45,7 +45,7 @@
         <{$pm->get("from_userid")|xoops_user:"uname"}>
       </td>
       <td valign="middle">
-        <a href="./index.php?action=read&amp;msg_id=<{$pm->get('msg_id')}>"><{$pm->getVar("subject")}></a>
+        <a href="./index.php?action=read&amp;msg_id=<{$pm->get('msg_id')}>"><{$pm->getShow('subject')}></a>
       </td>
       </td>
       <td valign="middle">
Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.13 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.14
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.13	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Wed Jul  5 11:37:06 2006
@@ -1,8 +1,8 @@
 <h4><{$xoops_pagetitle}></h4>
 <{if $feature.user.profile}>
-  <a href="<{$xoops_url}>/userinfo.php?uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._PM_PROFILE}></a> &raquo;&raquo; 
+  <a href="<{$xoops_url}>/userinfo.php?uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._PM_PROFILE}></a> &raquo;&raquo; 
 <{/if}>
-<a href="index.php"><{$smarty.const._PM_INBOX}></a> &raquo;&raquo; <{$privMessage->getVar('subject')}>
+<a href="index.php"><{$smarty.const._PM_INBOX}></a> &raquo;&raquo; <{$privMessage->getShow('subject')}>
 <table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%">
   <tr>
     <th <{if $sendUser->hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}></th>
@@ -10,44 +10,44 @@
   <tr class="even">
     <{if $sendUser->hasAvatar()}>
       <td valign="top" style="text-align:center;" rowspan="3">
-        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getVar('uid')}>"><img src="<{$sendUser->getAvatarUrl()}>" alt="<{$sendUser->getVar('uname')}>" title="<{$sendUser->getVar('uname')}>" /></a>
-        <{if $sendUser->getVar('user_from')}>
-          <br /> <{$sendUser->getVar('user_from')}>
+        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><img src="<{$sendUser->getAvatarUrl()}>" alt="<{$sendUser->getShow('uname')}>" title="<{$sendUser->getShow('uname')}>" /></a>
+        <{if $sendUser->getShow('user_from')}>
+          <br /> <{$sendUser->getShow('user_from')}>
         <{/if}>
       </td>
     <{/if}>
-    <td><{$smarty.const._PM_FROMC}><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getVar('uid')}>"><{$sendUser->getVar('uname')}></a>
+    <td><{$smarty.const._PM_FROMC}><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><{$sendUser->getShow('uname')}></a>
         <!--- TODO Online Information --->
     </td>
   </tr>
   <tr class="even">
-    <td><{$smarty.const._PM_SENTC}><{$privMessage->getVar("msg_time")|xoops_formattimestamp}></td>
+    <td><{$smarty.const._PM_SENTC}><{$privMessage->get("msg_time")|xoops_formattimestamp}></td>
   </tr>
   <tr class="even">
-    <td><{$smarty.const._MD_PM_LANG_SUBJECTC}><img src="<{$xoops_url}>/images/subject/<{$privMessage->getVar('msg_image')}>" alt='' title='' />&nbsp;<b><{$privMessage->getVar('subject')}></b></td>
+    <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">
     <td colspan="2">
-      <{$privMessage->getVar('msg_text')}><br /><br />
+      <{$privMessage->getShow('msg_text')}><br /><br />
     </td>
   </tr>
   <tr class="foot">
     <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:left;">
       <!--- TODO check postr. See original readpmsg --->
-      <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getVar("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._PM_REPLY}>" title="<{$smarty.const._PM_REPLY}>" /></a>
+      <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._PM_REPLY}>" title="<{$smarty.const._PM_REPLY}>" /></a>
       <input type="hidden" name="delete" value="1" />  <!--- << check --->
-      <input type="hidden" name="msg_id" value="<{$privMessage->getVar('msg_id')}>" />
-      <a href="#<{$privMessage->getVar('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getVar("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._PM_DELETE}>" title="<{$smarty.const._PM_DELETE}>" /></a>
+      <input type="hidden" name="msg_id" value="<{$privMessage->getShow('msg_id')}>" />
+      <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._PM_DELETE}>" title="<{$smarty.const._PM_DELETE}>" /></a>
     </td>
   </tr>
   <tr>
     <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
       <{if $previousMessage}>
-        <a href="index.php?action=read&amp;msg_id=<{$previousMessage->getVar('msg_id')}>"><{$smarty.const._PM_PREVIOUS}></a>
+        <a href="index.php?action=read&amp;msg_id=<{$previousMessage->getShow('msg_id')}>"><{$smarty.const._PM_PREVIOUS}></a>
       <{/if}>
       <{if $nextMessage}>
         <{if $previousMessage}> | <{/if}>
-        <a href="index.php?action=read&amp;msg_id=<{$nextMessage->getVar('msg_id')}>"><{$smarty.const._PM_NEXT}></a>
+        <a href="index.php?action=read&amp;msg_id=<{$nextMessage->getShow('msg_id')}>"><{$smarty.const._PM_NEXT}></a>
       <{/if}>
     </td>
   </tr>
Index: xoops2jp/html/modules/pm/templates/pmlite.html
diff -u xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.7 xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.8
--- xoops2jp/html/modules/pm/templates/pmlite.html:1.1.2.7	Wed Jun 14 01:12:54 2006
+++ xoops2jp/html/modules/pm/templates/pmlite.html	Wed Jul  5 11:37:06 2006
@@ -15,31 +15,29 @@
       <td class="head" width="25%"><{$smarty.const._PM_TO}></td>
       <td class="even">
         <{if $send_type==0}>
-          <{if $actionForm->getVar('to_userid')}>
-            <{$actionForm->getVar('to_userid')|xoops_user:"uname"}>
-            <input type="hidden" name="to_userid" value="<{$actionForm->getVar('to_userid')}>" />
+          <{if $actionForm->get('to_userid')}>
+            <{$actionForm->get('to_userid')|xoops_user:"uname"}>
+            <{xoops_input type=hidden name=to_userid value=$actionForm->get('to_userid')}>
           <{else}>
-            <select name="to_userid" ID="Select1">
-            <{foreach item=user from=$userList}>
-              <option value="<{$user->getVar('uid')}>"><{$user->getVar('uname')}></option>
-            <{/foreach}>
+            <select name="to_userid">
+              <{xoops_optionsArray value=uid label=uname from=$userList default=$actionForm->get('to_userid')}>
             </select>
           <{/if}>
         <{else}>
-          <{xoops_input name=to_uname value=$actionForm->getVar('to_uname')}>
+          <{xoops_input name=to_uname value=$actionForm->get('to_uname')}>
         <{/if}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._PM_SUBJECTC}></td>
       <td class="even">
-        <{xoops_input name=subject size=30 maxlength=100 id=Text1 value=$actionForm->getVar('subject')}>
+        <{xoops_input name=subject size=30 maxlength=100 id=Text1 value=$actionForm->get('subject')}>
       </td>
     </tr>
     <tr valign="top">
       <td class="head"><{$smarty.const._PM_MESSAGEC}></td>
       <td class="even">
-        <{xoops_dhtmltarea cols=37 rows=8 name=message value=$actionForm->getVar('message')}>
+        <{xoops_dhtmltarea cols=37 rows=8 name=message value=$actionForm->get('message')}>
       </td>
     </tr>
     <tr>

From minahito ＠ users.sourceforge.jp  Wed Jul  5 11:37:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Jul 2006 11:37:54 +0900
Subject: [xoops-cvslog 3427] CVS update: xoops2jp/html/kernel
Message-ID: <20060705023754.6F4702AC033@users.sourceforge.jp>

Index: xoops2jp/html/kernel/object.php
diff -u xoops2jp/html/kernel/object.php:1.2.8.10 xoops2jp/html/kernel/object.php:1.2.8.11
--- xoops2jp/html/kernel/object.php:1.2.8.10	Tue May 16 22:25:07 2006
+++ xoops2jp/html/kernel/object.php	Wed Jul  5 11:37:54 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: object.php,v 1.2.8.10 2006/05/16 13:25:07 nobunobu Exp $
+// $Id: object.php,v 1.2.8.11 2006/07/05 02:37:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -58,7 +58,7 @@
 /**
  * Interface for all objects in the Xoops kernel.
  */
-class XoopsObjectInterface
+class AbstractXoopsObject
 {
 	function setNew()
 	{
@@ -101,18 +101,10 @@
 	}
 	
 	/**
-	 * Alias for set().
-	 * @see set()
-	 */
-	function setVar($key, $value)
-	{
-	}
-	
-	/**
 	 * Return html string for template.
 	 * You can call get() method to get pure value.
 	 */
-	function getVar($key)
+	function getShow($key)
 	{
 	}
 }
@@ -125,7 +117,7 @@
  * @copyright copyright &copy; 2000 XOOPS.org
  * @package kernel
  **/
-class XoopsObject extends XoopsObjectInterface
+class XoopsObject extends AbstractXoopsObject
 {
 
     /**
@@ -461,6 +453,11 @@
         return $ret;
     }
 
+	function getShow($key)
+	{
+		return $this->getVar($key, 's');
+	}
+	
 	function set($key, $value)
 	{
 		$this->setVar($key, $value);

From minahito ＠ users.sourceforge.jp  Wed Jul  5 11:39:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Jul 2006 11:39:00 +0900
Subject: [xoops-cvslog 3428] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060705023900.036682AC071@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/object.php
diff -u xoops2jp/html/modules/base/kernel/object.php:1.1.2.5 xoops2jp/html/modules/base/kernel/object.php:1.1.2.6
--- xoops2jp/html/modules/base/kernel/object.php:1.1.2.5	Tue Jun 20 19:53:52 2006
+++ xoops2jp/html/modules/base/kernel/object.php	Wed Jul  5 11:38:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: object.php,v 1.1.2.5 2006/06/20 10:53:52 minahito Exp $
+// $Id: object.php,v 1.1.2.6 2006/07/05 02:38:59 minahito Exp $
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -17,7 +17,7 @@
  * the rule that you are forced.
  * 
  */
-class XoopsSimpleObject extends XoopsObjectInterface
+class XoopsSimpleObject extends AbstractXoopsObject
 {
 	var $mVars = array();
 	var $mIsNew = true;
@@ -126,12 +126,20 @@
 	{
 		$this->assignVars($values);
 	}
+
+	/**
+	 * @deprecated
+	 */	
+	function getVar($key)
+	{
+		return $this->getShow($key);
+	}
 	
 	/**
 	 * Return HTML string for displaying only by HTML.
 	 * The second parametor doesn't exist.
 	 */
-	function getVar($key)
+	function getShow($key)
 	{
 		$value = null;
 		

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:52:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:52:24 +0900
Subject: [xoops-cvslog 3429] CVS update: xoops2jp/html/kernel
Message-ID: <20060707025224.D00EB2AC046@users.sourceforge.jp>

Index: xoops2jp/html/kernel/privmessage.php
diff -u xoops2jp/html/kernel/privmessage.php:1.2.8.5 xoops2jp/html/kernel/privmessage.php:1.2.8.6
--- xoops2jp/html/kernel/privmessage.php:1.2.8.5	Tue May 16 22:25:07 2006
+++ xoops2jp/html/kernel/privmessage.php	Fri Jul  7 11:52:24 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: privmessage.php,v 1.2.8.5 2006/05/16 13:25:07 nobunobu Exp $
+// $Id: privmessage.php,v 1.2.8.6 2006/07/07 02:52:24 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -39,7 +39,7 @@
  * @author		Kazumi Ono	<onokazu ＠ xoops.org>
  * @copyright	copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org)
  *
- * @version		$Revision: 1.2.8.5 $ - $Date: 2006/05/16 13:25:07 $
+ * @version		$Revision: 1.2.8.6 $ - $Date: 2006/07/07 02:52:24 $
  */
 class XoopsPrivmessage extends XoopsObject
 {
@@ -84,7 +84,7 @@
  * @author		Kazumi Ono	<onokazu ＠ xoops.org>
  * @copyright	copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org)
  *
- * @version		$Revision: 1.2.8.5 $ - $Date: 2006/05/16 13:25:07 $
+ * @version		$Revision: 1.2.8.6 $ - $Date: 2006/07/07 02:52:24 $
  */
 class XoopsPrivmessageHandler extends XoopsObjectHandler
 {
@@ -237,7 +237,7 @@
 		return $this->getCount(new Criteria('to_userid',$uid));
 	}
 	
-	function getUnreadCountByFromUid($uid)
+	function getCountUnreadByFromUid($uid)
 	{
 		$criteria = new CriteriaCompo(new Criteria('read_msg', 0));
 		$criteria->add(new Criteria('to_userid', $uid));

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:54:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:54:05 +0900
Subject: [xoops-cvslog 3430] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060707025405.926732AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.44 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.45
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.44	Sat Jul  1 16:26:04 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Fri Jul  7 11:54:05 2006
@@ -36,6 +36,16 @@
 	 */
 	var $mSiteLogin = null;
 	
+	/**
+	 * @var XCube_Delegate
+	 */
+	var $mGetCountUnreadPM = null;
+	
+	/**
+	 * @var XCube_Delegate
+	 */
+	var $mGetPMInboxUrl = null;
+	
 	function Legacy_Controller()
 	{
 		//
@@ -43,6 +53,9 @@
 		//
 		$this->mSiteLogin =& new XCube_NewDelegate();
 		$this->mSiteLogin->register("Site.Login");
+		
+		$this->mGetCountUnreadPM =& new XCube_NewDelegate();
+		$this->mGetPMInboxUrl =& new XCube_NewDelegate();
 				
 		set_magic_quotes_runtime(0);	// ^^;
 		
@@ -760,6 +773,34 @@
 		$ret =& $this->_mControllerState->getVirtualCurrentModule($this);
 		return $ret;
 	}
+	
+	/**
+	 * Return URL of pm inbox. This is X2 fixed feature.
+	 * 
+	 * @param $uid int ID of the user
+	 * @return string if any functions don't return value, return null.
+	 */
+	function getPMInboxUrl($uid)
+	{
+		$url = null;
+		$this->mGetPMInboxUrl->call(new XCube_Ref($url), $uid);
+		
+		return $url;
+	}
+
+	/**
+	 * Return counts of unread pm. This is X2 fixed feature.
+	 * 
+	 * @param $uid int ID of the user
+	 * @return int
+	 */
+	function getCountUnreadPM($uid)
+	{
+		$count = 0;
+		$this->mGetCountUnreadPM->call(new XCube_Ref($count), $uid);
+		
+		return $count;
+	}
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:55:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:55:13 +0900
Subject: [xoops-cvslog 3431] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20060707025513.D2BC22AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/blocks/legacy_usermenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.2 xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.3
--- xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.2	Mon Apr  3 14:44:24 2006
+++ xoops2jp/html/modules/base/blocks/legacy_usermenu.php	Fri Jul  7 11:55:13 2006
@@ -1,25 +1,40 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id: legacy_usermenu.php,v 1.1.2.3 2006/07/07 02:55:13 minahito Exp $
+ */
+
+ /**
+  * This function is called back to display the user menu.
+  * 
+  * [Template Variables]
+  *  $block.uid ... Curent user id for the menu.
+  *  $block.flagShowInbox ... If there is the pm module, set true.
+  *  $block.inbox_url ... Return url to access inbox of pm.
+  *  $block.new_messages ... amount of unread messages.
+  */
 function b_legacy_usermenu_show()
 {
     $root =& XCube_Root::getSingleton();
     $xoopsUser =& $root->mController->mXoopsUser;
 
     if (is_object($xoopsUser)) {
-        $pm_handler =& xoops_gethandler('privmessage');
         $block = array();
         
         $block['uid'] = $xoopsUser->getVar('uid');
-		$block['flagShowInbox']=false;
+		$block['flagShowInbox'] = false;
 
+		//
 		// Check does this system have PrivateMessage feature.
-		$root=&XCube_Root::getSingleton();
-		$service=&$root->mServiceManager->searchXCubeService("PrivateMessage");
-		if($service) {
-			$client=new XCube_ServiceClient($service);
-			$parameters=array("uid"=>$xoopsUser->getVar('uid'));
-			$block['new_messages'] = $client->call("getCountUnread",$parameters);
+		//
+		$url = $root->mController->getPMInboxUrl($block['uid']);
+
+		if ($url != null) {
+			$block['inbox_url'] = $url;
+			$block['new_messages'] = $root->mController->getCountUnreadPM($block['uid']);
 			$block['flagShowInbox']=true;
 		}
+
         return $block;
     }
     return false;

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:55:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:55:44 +0900
Subject: [xoops-cvslog 3432] CVS update:
	xoops2jp/html/modules/base/templates/blocks
Message-ID: <20060707025544.96BD52AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_usermenu.html	Fri Jul  7 11:55:44 2006
@@ -5,16 +5,16 @@
       <a href="<{$xoops_url}>/edituser.php"><{$smarty.const._MB_BASE_EACNT}></a>
       <a href="<{$xoops_url}>/notifications.php"><{$smarty.const._MB_BASE_NOTIF}></a>
       <a href="<{$xoops_url}>/user.php?op=logout"><{$smarty.const._MB_BASE_LOUT}></a>
-<{if $block.flagShowInbox}>
-<{if $block.new_messages > 0}>
-      <a class="highlight" href="<{$xoops_url}>/viewpmsg.php"><{$smarty.const.lang_inbox}> (<span style="color:#ff0000; font-weight: bold;"><{$block.new_messages}></span>)</a>
-<{else}>
-      <a href="<{$xoops_url}>/viewpmsg.php"><{$smarty.const._MB_BASE_INBOX}></a>
-<{/if}>
-<{/if}>
-<{if $xoops_isadmin}>
-      <a href="<{$xoops_url}>/admin.php"><{$smarty.const._MB_BASE_ADMENU}></a>
-<{/if}>
+      <{if $block.flagShowInbox}>
+        <{if $block.new_messages > 0}>
+          <a class="highlight" href="<{$block.inbox_url}>"><{$smarty.const._MB_BASE_INBOX}> (<span style="color:#ff0000; font-weight: bold;"><{$block.new_messages}></span>)</a>
+        <{else}>
+          <a href="<{$block.inbox_url}>"><{$smarty.const._MB_BASE_INBOX}></a>
+        <{/if}>
+      <{/if}>
+      <{if $xoops_isadmin}>
+        <a href="<{$xoops_url}>/admin.php"><{$smarty.const._MB_BASE_ADMENU}></a>
+      <{/if}>
     </td>
   </tr>
 </table>

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:56:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:56:14 +0900
Subject: [xoops-cvslog 3433] CVS update:
	xoops2jp/html/modules/base/preload/Primary
Message-ID: <20060707025614.6334D2AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.3 xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.4
--- xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.3	Fri Jun 30 14:10:35 2006
+++ xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php	Fri Jul  7 11:56:14 2006
@@ -9,7 +9,7 @@
 	function preFilter()
 	{
 		require_once XOOPS_ROOT_PATH . "/modules/base/lib/nusoap/nusoap.php";
-		$this->mController->mRoot->mDelegateManager->add('XCube_ServiceManager.CreateClient', array('Legacy_NuSoapLoader', 'createClient'));
+		$this->mController->mRoot->mDelegateManager->add('XCube_ServiceManager.CreateClient', 'Legacy_NuSoapLoader::createClient');
 	}
 	
 	function createClient(&$client, $service)

From minahito ＠ users.sourceforge.jp  Fri Jul  7 11:57:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 11:57:08 +0900
Subject: [xoops-cvslog 3434] CVS update: xoops2jp/html/modules/pm/preload
Message-ID: <20060707025708.ECFA02AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/preload/Preload.class.php
diff -u xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.2 xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.3
--- xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.2	Wed Jun 28 14:47:32 2006
+++ xoops2jp/html/modules/pm/preload/Preload.class.php	Fri Jul  7 11:57:08 2006
@@ -2,18 +2,27 @@
 
 if (!defined('XOOPS_ROOT_PATH')) die();
 
-class Pm_Preload extends XCube_ActionFilter {
+class Pm_Preload extends XCube_ActionFilter
+{
 	function preBlockFilter()
 	{
-		require_once XOOPS_ROOT_PATH . "/modules/pm/kernel/PmEventProxyRegister.class.php";
-		$this->mController->mRoot->mEventManager->addProxyRegister(new PmEventProxyRegister());
-		
-		/*
-		require_once XOOPS_ROOT_PATH . "/modules/pm/service/LegacyPmService.class.php";
-		$service =& new LegacyPmService();
-		$this->mController->mRoot->mServiceManager->addXCubeService("PrivateMessage", $service);
-		unset($service);
-		*/
+		$this->mController->mGetPMInboxUrl->add("Pm_Preload::getPmInboxUrl");
+		$this->mController->mGetCountUnreadPM->add("Pm_Preload::getCountUnreadPM");
+	}
+	
+	function getPmInboxUrl(&$url, $uid)
+	{
+		if ($uid > 0) {
+			$url = XOOPS_MODULE_URL . "/pm/index.php";
+		}
+	}
+	
+	function getCountUnreadPM(&$count, $uid)
+	{
+		if ($uid > 0) {
+			$handler =& xoops_gethandler('privmessage');
+			$count = $handler->getCountUnreadByFromUid($uid);
+		}
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:17:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:17:57 +0900
Subject: [xoops-cvslog 3435] CVS update: xoops2jp/html/modules/pm/kernel
Message-ID: <20060707031757.DD90D2AC0B5@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/kernel/PmEventProxyRegister.class.php
diff -u xoops2jp/html/modules/pm/kernel/PmEventProxyRegister.class.php:1.1.2.5 xoops2jp/html/modules/pm/kernel/PmEventProxyRegister.class.php:removed
--- xoops2jp/html/modules/pm/kernel/PmEventProxyRegister.class.php:1.1.2.5	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/kernel/PmEventProxyRegister.class.php	Fri Jul  7 12:17:57 2006
@@ -1,31 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
-
-class PmEventProxyRegister extends XCube_EventProxyRegister
-{
-	var $_mList=array("Legacypage.Viewpmsg.Access","Legacypage.Pmlite.Access","Legacypage.Readpmsg.Access");
-	
-	function getEventNameList()
-	{
-		return $this->_mList;
-	}
-	
-	function &createLegacypage_Viewpmsg_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/pm/kernel/PmEventFunction.class.php";
-		$delegate=new XCube_Delegate("PmEventFunction","AccessToViewpmsg");
-		return $delegate;
-	}
-
-	function &createLegacypage_Pmlite_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/pm/kernel/PmEventFunction.class.php";
-		$delegate=new XCube_Delegate("PmEventFunction","AccessToPmlite");
-		return $delegate;
-	}
-}
-
-?>
Index: xoops2jp/html/modules/pm/kernel/PmEventFunction.class.php
diff -u xoops2jp/html/modules/pm/kernel/PmEventFunction.class.php:1.1.2.4 xoops2jp/html/modules/pm/kernel/PmEventFunction.class.php:removed
--- xoops2jp/html/modules/pm/kernel/PmEventFunction.class.php:1.1.2.4	Sun Nov 13 13:49:29 2005
+++ xoops2jp/html/modules/pm/kernel/PmEventFunction.class.php	Fri Jul  7 12:17:57 2006
@@ -1,34 +0,0 @@
-<?php
-
-/* TODO: Add code here */
-class PmEventFunction
-{
-	function AccessToViewpmsg(&$controller,$eventArgs)
-	{
-		$controller->executeForward(XOOPS_MODULE_URL."/pm/index.php");
-	}
-
-	function AccessToReadpmsg(&$controller,$eventArgs)
-	{
-		$msg_id=intval($_GET['msg_id']);
-		$controller->executeForward(XOOPS_MODULE_URL."/pm/index.php?action=read&msg_id=".$msg_id);
-	}
-
-	function AccessToPmlite(&$controller,$eventArgs)
-	{
-		//
-		// Does this access request reply mode?
-		//
-		$reply=isset($_GET['reply']) ? intval($_GET['reply']) : null;
-		$msg_id=isset($_GET['msg_id']) ? intval($_GET['msg_id']) : 0;
-
-		if($reply==null||$msg_id==0) {
-			$controller->executeForward(XOOPS_MODULE_URL."/pm/pmlite.php");
-		}
-		else {
-			$controller->executeForward(XOOPS_MODULE_URL."/pm/pmlite.php?reply=1&msg_id=".$msg_id);
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/pm/kernel/PrivateMessage.class.php
diff -u xoops2jp/html/modules/pm/kernel/PrivateMessage.class.php:1.1.2.2 xoops2jp/html/modules/pm/kernel/PrivateMessage.class.php:removed
--- xoops2jp/html/modules/pm/kernel/PrivateMessage.class.php:1.1.2.2	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/pm/kernel/PrivateMessage.class.php	Fri Jul  7 12:17:57 2006
@@ -1,85 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * To one user, From one user, No CC, No attach.
- */
-class PrivateMessage
-{
-	var $mToUsers=array();
-	var $mFromUsers=array();
-	var $mSubject=null;
-	var $mMessage=null;
-	
-	function PrivateMessage()
-	{
-	}
-	
-	function setToUsers(&$users)
-	{
-		if(is_array($users))
-			$user=&$users[0];
-		else $user=&$users;
-		
-		$this->_setToUser($user);
-	}
-	
-	function _setToUser(&$user)
-	{
-		$this->mToUsers[0]=&$user;
-	}
-	
-	function setFromUsers(&$users)
-	{
-		if(is_array($users))
-			$user=&$users[0];
-		else
-			$user=&$users;
-		
-		$this->_setFromUser($user);
-	}
-	
-	function _setFromUser(&$user)
-	{
-		$this->mFromUsers[0]=&$user;
-	}
-	
-	function setSubject($subject)
-	{
-		$this->mSubject=$subject;
-	}
-	
-	function setMessage($message)
-	{
-		$this->mMessage=$message;
-	}
-	
-	/**
-	 * @return bool
-	 */
-	function send()
-	{
-		$pmHandler=&xoops_gethandler('privmessage');
-		$pm=&$pmHandler->create();
-		$pm->setVar("to_userid",$this->mToUsers[0]->getVar('uid'));
-		$pm->setVar("from_userid",$this->mFromUsers[0]->getVar('uid'));
-		$pm->setVar("subject",$this->mSubject);
-		$pm->setVar("msg_text",$this->mMessage);
-
-		return $pmHandler->insert($pm);
-	}
-}
-
-// Wmm...
-class PrivateMessageManager
-{
-	function &create()
-	{
-		$instance=new PrivateMessage();
-		return $instance;
-	}
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:18:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:18:29 +0900
Subject: [xoops-cvslog 3436] CVS update: xoops2jp/html/modules/pm/preload
Message-ID: <20060707031829.548DC2AC0B5@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/preload/Preload.class.php
diff -u xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.3 xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.4
--- xoops2jp/html/modules/pm/preload/Preload.class.php:1.1.2.3	Fri Jul  7 11:57:08 2006
+++ xoops2jp/html/modules/pm/preload/Preload.class.php	Fri Jul  7 12:18:29 2006
@@ -6,6 +6,11 @@
 {
 	function preBlockFilter()
 	{
+		$root =& XCube_Root::getSingleton();
+		$root->mDelegateManager->add('Legacypage.Viewpmsg.Access', "Pm_Preload::accessToViewpmsg");
+		$root->mDelegateManager->add('Legacypage.Readpmsg.Access', "Pm_Preload::accessToReadpmsg");
+		$root->mDelegateManager->add('Legacypage.Pmlite.Access', "Pm_Preload::accessToPmlite");
+		
 		$this->mController->mGetPMInboxUrl->add("Pm_Preload::getPmInboxUrl");
 		$this->mController->mGetCountUnreadPM->add("Pm_Preload::getCountUnreadPM");
 	}
@@ -24,6 +29,37 @@
 			$count = $handler->getCountUnreadByFromUid($uid);
 		}
 	}
+	
+	function accessToReadpmsg()
+	{
+		$root =& XCube_Root::getSingleton();
+		$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/index.php?action=read&msg_id=" . intval(xoops_getrequest('msg_id')));
+	}
+
+	function accessToViewpmsg()
+	{
+		$root =& XCube_Root::getSingleton();
+		$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/index.php");
+	}
+	
+	function accessToPmlite()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		//
+		// Does this access request reply mode?
+		//
+		$reply = xoops_getrequest('reply');
+		$msg_id = intval(xoops_getrequest('msg_id'));
+
+		if ($reply == null ||$msg_id == 0) {
+			$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/pmlite.php");
+		}
+		else {
+			$root->mController->executeForward(XOOPS_MODULE_URL . "/pm/pmlite.php?reply=1&msg_id=" . $msg_id);
+		}
+	}
+
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:18:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:18:36 +0900
Subject: [xoops-cvslog 3437] CVS update: xoops2jp/html/modules/pm/service
Message-ID: <20060707031836.3FBEA2AC0B5@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/service/LegacyPmService.class.php
diff -u xoops2jp/html/modules/pm/service/LegacyPmService.class.php:1.1.2.3 xoops2jp/html/modules/pm/service/LegacyPmService.class.php:removed
--- xoops2jp/html/modules/pm/service/LegacyPmService.class.php:1.1.2.3	Wed May 24 18:42:25 2006
+++ xoops2jp/html/modules/pm/service/LegacyPmService.class.php	Fri Jul  7 12:18:36 2006
@@ -1,42 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_Service.class.php";
-
-/**
- * Sample class
- */
-class LegacyPmService extends XCube_Service
-{
-	function doGetList(&$parameters)
-	{
-		$uid=$parameters['uid'];
-		$pmHandler=&xoops_gethandler('privmessage');
-		$pmObjects =& $pmHandler->getObjectsByFromUid($uid);
-		return $pmObjects;
-	}
-	
-	function doGetCountUnread(&$parameters)
-	{
-		$uid=$parameters['uid'];
-		$pmHandler=&xoops_gethandler('privmessage');
-		return $pmHandler->getUnreadCountByFromUid($uid);
-	}
-	
-	function doSend(&$parameters)
-	{
-		$pmHandler=&xoops_gethandler('privmessage');
-		$pm=&$pmHandler->create();
-		$pm->setVar("to_userid",$parameters['to_uid']);
-		$pm->setVar("from_userid",$parameters['from_uid']);
-		$pm->setVar("subject",$parameters['subject']);
-		$pm->setVar("msg_text",$parameters['message']);
-		
-		if(!$pmHandler->insert($pm)) {
-			$this->setError("Sending error");
-		}
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:19:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:19:05 +0900
Subject: [xoops-cvslog 3438] CVS update: xoops2jp/html/modules/pm/service
Message-ID: <20060707031905.7F4682AC0B5@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/service/index.html
diff -u xoops2jp/html/modules/pm/service/index.html:1.1.2.1 xoops2jp/html/modules/pm/service/index.html:removed
--- xoops2jp/html/modules/pm/service/index.html:1.1.2.1	Mon Mar 27 11:41:56 2006
+++ xoops2jp/html/modules/pm/service/index.html	Fri Jul  7 12:19:05 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:19:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:19:05 +0900
Subject: [xoops-cvslog 3439] CVS update: xoops2jp/html/modules/pm/kernel
Message-ID: <20060707031905.AA9E72AC0BA@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/kernel/index.html
diff -u xoops2jp/html/modules/pm/kernel/index.html:1.1.2.1 xoops2jp/html/modules/pm/kernel/index.html:removed
--- xoops2jp/html/modules/pm/kernel/index.html:1.1.2.1	Mon Mar 27 11:41:50 2006
+++ xoops2jp/html/modules/pm/kernel/index.html	Fri Jul  7 12:19:05 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul  7 12:21:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Jul 2006 12:21:04 +0900
Subject: [xoops-cvslog 3440] CVS update: xoops2jp/html/modules/pm
Message-ID: <20060707032104.0E1552AC0B5@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.12 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.13
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.12	Sat Feb  4 03:07:19 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Fri Jul  7 12:21:03 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.12 2006/02/03 18:07:19 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.13 2006/07/07 03:21:03 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -64,14 +64,14 @@
 $modversion['templates'][4]['description'] = 'Display pm send message.';
 
 //Preference
-$modversion['config'][]=array (
-		"name"=>"send_type",
-		"title"=>"_MI_PM_CONF_SEND_TYPE",
-		"description"=>"_MI_PM_CONF_SEND_TYPE_DESC",
-		"formtype"=>"select",
-		"options"=>array(_MI_PM_CONF_SEND_TYPE_COMBO=>0,_MI_PM_CONF_SEND_TYPE_TEXT=>1),
-		"valuetype"=>"int",
-		"default"=>0
+$modversion['config'][] = array (
+		"name" => "send_type",
+		"title" => "_MI_PM_CONF_SEND_TYPE",
+		"description" => "_MI_PM_CONF_SEND_TYPE_DESC",
+		"formtype" => "select",
+		"options" => array(_MI_PM_CONF_SEND_TYPE_COMBO=>0, _MI_PM_CONF_SEND_TYPE_TEXT=>1),
+		"valuetype" => "int",
+		"default" => 0
 	);
 
 // Menu

From nobunobu ＠ users.sourceforge.jp  Fri Jul  7 13:52:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  7 Jul 2006 13:52:25 +0900
Subject: [xoops-cvslog 3441] CVS update: xoops2jp/html/kernel
Message-ID: <20060707045225.42BAD2AC0BE@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Delegate.class.php
diff -u xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.8 xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.9
--- xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.8	Fri Jun 30 15:06:08 2006
+++ xoops2jp/html/kernel/XCube_Delegate.class.php	Fri Jul  7 13:52:25 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: XCube_Delegate.class.php,v 1.1.2.8 2006/06/30 06:06:08 minahito Exp $
+ * @version $Id: XCube_Delegate.class.php,v 1.1.2.9 2006/07/07 04:52:25 nobunobu Exp $
  */
  
 
@@ -489,7 +489,7 @@
     {
         $args = func_get_args();
         $num = func_num_args();
-        if ($num > 2) {
+        if ($num > 1) {
             $delegateName = $args[0];
             $string = $args[1];
             if (!empty($strint) && is_string($string)) {

From nobunobu ＠ users.sourceforge.jp  Fri Jul  7 16:03:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri,  7 Jul 2006 16:03:22 +0900
Subject: [xoops-cvslog 3442] CVS update:
	xoops2jp/html/modules/legacyRender/preload
Message-ID: <20060707070322.4F6E92AC040@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sat Jul  8 11:20:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  8 Jul 2006 11:20:44 +0900
Subject: [xoops-cvslog 3443] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20060708022044.352932AC01C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Wating.class.php
diff -u /dev/null xoops2jp/html/modules/base/preload/Wating.class.php:1.1.2.1
--- /dev/null	Sat Jul  8 11:20:44 2006
+++ xoops2jp/html/modules/base/preload/Wating.class.php	Sat Jul  8 11:20:43 2006
@@ -0,0 +1,90 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class Base_Wating extends XCube_ActionFilter {
+    function preBlockFilter()
+    {
+        $this->mController->mRoot->mDelegateManager->add('Legacyblock.Wating.Show',array(&$this,"callbackWatingShow"));
+    }
+    
+    function callbackWatingShow(&$modules) {
+        $xoopsDB =& Database::getInstance();
+        // for News Module
+        $module_handler =& xoops_gethandler('module');
+        if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories")." WHERE published=0");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_SUBMS;
+                $modules = $blockVal;
+            }
+        }
+        // for MyLinks Module
+        if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_links")." WHERE status=0");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listNewLinks";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_WLNKS;
+                $modules[] = $blockVal;
+            }
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_broken"));
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listBrokenLinks";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_BLNK;
+                $modules[] = $blockVal;
+            }
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_mod"));
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listModReq";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_MLNKS;
+                $modules[] = $blockVal;
+            }
+        }
+        // for MyDownloads Modules
+        if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status=0");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listNewDownloads";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_WDLS;
+                $modules[] = $blockVal;
+            }
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_broken")."");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listBrokenDownloads";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_BFLS;
+                $modules[] = $blockVal;
+            }
+            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_mod")."");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listModReq";
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_MFLS;
+                $modules[] = $blockVal;
+            }
+        }
+        // for Comments
+        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
+        if ( $result ) {
+            $blockVal = array();
+            $blockVal['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&amp;status=1&amp;fct=comments";
+            list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
+            $blockVal['lang_linkname'] =_MB_BASE_COMPEND;
+            $modules[] = $blockVal;
+        }
+    }
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sat Jul  8 11:20:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  8 Jul 2006 11:20:44 +0900
Subject: [xoops-cvslog 3444] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060708022044.5838C2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/modulePreloadWating.class.php
diff -u xoops2jp/html/modules/base/class/modulePreloadWating.class.php:1.1.2.2 xoops2jp/html/modules/base/class/modulePreloadWating.class.php:removed
--- xoops2jp/html/modules/base/class/modulePreloadWating.class.php:1.1.2.2	Mon Apr  3 14:44:19 2006
+++ xoops2jp/html/modules/base/class/modulePreloadWating.class.php	Sat Jul  8 11:20:44 2006
@@ -1,90 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class baseModulePreloadWating extends XCube_ActionFilter {
-    function preBlockFilter()
-    {
-        $this->mController->mRoot->mEventManager->add('Legacyblock.Wating.Show',new XCube_InstanceDelegate($this,"callbackWatingShow"));
-    }
-    
-    function callbackWatingShow(&$controller,&$eventArgs) {
-        $xoopsDB =& Database::getInstance();
-        // for News Module
-        $module_handler =& xoops_gethandler('module');
-        if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories")." WHERE published=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_SUBMS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-        }
-        // for MyLinks Module
-        if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_links")." WHERE status=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listNewLinks";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_WLNKS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_broken"));
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listBrokenLinks";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_BLNK;
-                $eventArgs['modules'][] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_mod"));
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listModReq";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_MLNKS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-        }
-        // for MyDownloads Modules
-        if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status=0");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listNewDownloads";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_WDLS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_broken")."");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listBrokenDownloads";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_BFLS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-            $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_mod")."");
-            if ( $result ) {
-                $blockVal = array();
-                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listModReq";
-                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-                $blockVal['lang_linkname'] = _MB_BASE_MFLS;
-                $eventArgs['modules'][] = $blockVal;
-            }
-        }
-        // for Comments
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
-        if ( $result ) {
-            $blockVal = array();
-            $blockVal['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&amp;status=1&amp;fct=comments";
-            list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
-            $blockVal['lang_linkname'] =_MB_BASE_COMPEND;
-            $eventArgs['modules'][] = $blockVal;
-        }
-    }
-}
-?>

From nobunobu ＠ users.sourceforge.jp  Sat Jul  8 11:20:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  8 Jul 2006 11:20:44 +0900
Subject: [xoops-cvslog 3445] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060708022044.7C0402AC0C3@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/modulePreloadCacheclear.class.php
diff -u xoops2jp/html/modules/legacyRender/class/modulePreloadCacheclear.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/modulePreloadCacheclear.class.php:removed
--- xoops2jp/html/modules/legacyRender/class/modulePreloadCacheclear.class.php:1.1.2.1	Tue May 30 12:58:32 2006
+++ xoops2jp/html/modules/legacyRender/class/modulePreloadCacheclear.class.php	Sat Jul  8 11:20:44 2006
@@ -1,26 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class legacyRenderModulePreloadCacheclear extends XCube_ActionFilter {
-    function preBlockFilter()
-    {
-        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleInstall.Success', new XCube_Delegate("legacyRenderModulePreloadCacheclear", "callback"));
-        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleUpdate.Success', new XCube_Delegate("legacyRenderModulePreloadCacheclear", "callback"));
-    }
-    
-    function callback(&$action, &$module)
-	{
-		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
-		
-		$criteria =& new Criteria('tpl_module', $module->get('dirname'));
-		$tplfileArr = $handler->getObjects($criteria);
-		
-		$xoopsTpl =& new XoopsTpl();
-		foreach (array_keys($tplfileArr) as $key) {
-			$xoopsTpl->clear_cache('db:' . $tplfileArr[$key]->get('tpl_file'));
-			$xoopsTpl->clear_compiled_tpl('db:' . $tplfileArr[$key]->get('tpl_file'));
-		}
-    }
-}
-?>

From nobunobu ＠ users.sourceforge.jp  Sat Jul  8 11:20:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  8 Jul 2006 11:20:47 +0900
Subject: [xoops-cvslog 3446] CVS update:
	xoops2jp/html/modules/legacyRender/preload
Message-ID: <20060708022047.8DDC02AC01C@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php:1.1.2.1
--- /dev/null	Sat Jul  8 11:20:47 2006
+++ xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php	Sat Jul  8 11:20:47 2006
@@ -0,0 +1,25 @@
+<?php
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class legacyRender_Cacheclear extends XCube_ActionFilter {
+    function preBlockFilter()
+    {
+        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleInstall.Success', new XCube_Delegate("legacyRender_Cacheclear", "callback"));
+        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleUpdate.Success', new XCube_Delegate("legacyRender_Cacheclear", "callback"));
+    }
+    
+    function callback(&$action, &$module)
+	{
+		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
+		
+		$criteria =& new Criteria('tpl_module', $module->get('dirname'));
+		$tplfileArr = $handler->getObjects($criteria);
+		
+		$xoopsTpl =& new XoopsTpl();
+		foreach (array_keys($tplfileArr) as $key) {
+			$xoopsTpl->clear_cache('db:' . $tplfileArr[$key]->get('tpl_file'));
+			$xoopsTpl->clear_compiled_tpl('db:' . $tplfileArr[$key]->get('tpl_file'));
+		}
+    }
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sat Jul  8 11:22:22 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  8 Jul 2006 11:22:22 +0900
Subject: [xoops-cvslog 3447] CVS update: xoops2jp/html
Message-ID: <20060708022222.34B832AC01C@users.sourceforge.jp>

Index: xoops2jp/html/admin.php
diff -u xoops2jp/html/admin.php:1.2.8.4 xoops2jp/html/admin.php:1.2.8.5
--- xoops2jp/html/admin.php:1.2.8.4	Sat May 27 23:06:23 2006
+++ xoops2jp/html/admin.php	Sat Jul  8 11:22:22 2006
@@ -1,21 +1,6 @@
 <?php
-// $Id: admin.php,v 1.2.8.4 2006/05/27 14:06:23 nobunobu Exp $
+// $Id: admin.php,v 1.2.8.5 2006/07/08 02:22:22 nobunobu Exp $
 include "mainfile.php";
-require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
-class DefaultSystemCheckProxyRegister extends XCube_EventProxyRegister
-{
-	var $_mList=array("Legacypage.Admin.SystemCheck");
-	function getEventNameList()
-	{
-		return $this->_mList;
-	}
-	function &createLegacypage_Admin_SystemCheckDelegate()
-	{
-		$delegate=new XCube_Delegate("DefaultSystemCheckFunction","DefaultCheck");
-		return $delegate;
-	}
-
-}
 class DefaultSystemCheckFunction
 {
 	function DefaultCheck()
@@ -34,8 +19,7 @@
 
 require_once XOOPS_ROOT_PATH . "/header.php";
 $root=&XCube_Root::getSingleton();
-$root->mEventManager->addProxyRegister(new DefaultSystemCheckProxyRegister());
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Admin.SystemCheck",$root->mController,$eventArgs);
+$root->mDelegateManager->add("Legacypage.Admin.SystemCheck", "DefaultSystemCheckFunction::DefaultCheck");
+XCube_DelegateUtils::call("Legacypage.Admin.SystemCheck");
 require_once XOOPS_ROOT_PATH . "/footer.php";
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Jul  9 00:50:58 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  9 Jul 2006 00:50:58 +0900
Subject: [xoops-cvslog 3448] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20060708155058.D18C82AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/blocks/legacy_waiting.php
diff -u xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.2 xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.3
--- xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.2	Sun Apr  2 23:54:57 2006
+++ xoops2jp/html/modules/base/blocks/legacy_waiting.php	Sun Jul  9 00:50:58 2006
@@ -1,11 +1,8 @@
 <?php
 function b_legacy_waiting_show() {
-    global $xoopsUser;
-    $xoopsDB =& Database::getInstance();
-    $module_handler =& xoops_gethandler('module');
-
     $modules = array();
-    $block =& XCube_EventUtils::quickRaiseEvent('Legacyblock.Wating.Show', array('modules'=>&$modules));
+    XCube_DelegateUtils::call('Legacyblock.Wating.Show', new XCube_Ref(&$modules));
+    $block['modules'] = $modules;
     return $block;
 }
 ?>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 12:06:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 12:06:28 +0900
Subject: [xoops-cvslog 3449] CVS update: xoops2jp/html/kernel
Message-ID: <20060710030628.EE98E2AC04A@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Delegate.class.php
diff -u xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.9 xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.10
--- xoops2jp/html/kernel/XCube_Delegate.class.php:1.1.2.9	Fri Jul  7 13:52:25 2006
+++ xoops2jp/html/kernel/XCube_Delegate.class.php	Mon Jul 10 12:06:28 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: XCube_Delegate.class.php,v 1.1.2.9 2006/07/07 04:52:25 nobunobu Exp $
+ * @version $Id: XCube_Delegate.class.php,v 1.1.2.10 2006/07/10 03:06:28 minahito Exp $
  */
  
 
@@ -218,6 +218,7 @@
 			}
 		}
 		
+		$param = array();
 		for ($i=0 ; $i<$num ;$i++) {
 			if (is_a($args[$i], "XCube_Ref")) {
 				$args[$i] =& $args[$i]->getObject();

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:13:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:13:52 +0900
Subject: [xoops-cvslog 3450] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060710041352.277002AC04A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/preference_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.12
--- xoops2jp/html/modules/base/admin/templates/preference_edit.html:1.1.2.11	Sat Jul  1 16:25:19 2006
+++ xoops2jp/html/modules/base/admin/templates/preference_edit.html	Mon Jul 10 13:13:52 2006
@@ -56,11 +56,11 @@
         </td>
         <td class="<{cycle values="odd,even"}>">
           <{if $config->get('conf_formtype') == 'textarea'}>
-            <{xoops_textarea name=$config->getVar('conf_name') id=$config->getVar('conf_name') rows=5 cols=50 value=$actionForm->get($config->get('conf_name'))}>
+            <{xoops_textarea name=$config->getVar('conf_name') rows=5 cols=50 value=$actionForm->get($config->get('conf_name'))}>
 
 
           <{elseif $config->get('conf_formtype') == 'select'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach item=option from=$config->getOptionItems()}>
                 <option value='<{$option->getOptionKey()|escape}>' <{if $actionForm->get($config->get('conf_name')) == $option->getOptionKey()}>selected<{/if}>><{$option->getOptionLabel()|escape}></option>
               <{/foreach}>
@@ -68,7 +68,7 @@
 
 
           <{elseif $config->get('conf_formtype') == 'select_multi'}>
-            <select name='<{$config->getVar('conf_name')}>[]' id='<{$config->getVar('conf_name')}>' size='5' multiple>
+            <select name='<{$config->getVar('conf_name')}>[]' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='5' multiple>
               <{foreach item=option from=$config->getOptionItems()}>
                 <{assign var=flag value=0}>
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
@@ -80,12 +80,13 @@
 
 
           <{elseif $config->get('conf_formtype') == 'yesno'}>
-            <{xoops_input type=radio name=$config->get('conf_name') id=$config->get('conf_name') value=1 default=$actionForm->get($config->get('conf_name'))}><{$smarty.const._YES}>
-            <{xoops_input type=radio name=$config->get('conf_name') id=$config->get('conf_name') value=0 default=$actionForm->get($config->get('conf_name'))}><{$smarty.const._NO}>
+            <{*TODO ID conflict*}>
+            <{xoops_input type=radio name=$config->get('conf_name') value=1 default=$actionForm->get($config->get('conf_name'))}><{$smarty.const._YES}>
+            <{xoops_input type=radio name=$config->get('conf_name') value=0 default=$actionForm->get($config->get('conf_name'))}><{$smarty.const._NO}>
 
 
           <{elseif $config->get('conf_formtype') == 'theme'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach item=theme from=$themeArr}>
                 <option value="<{$theme|escape}>" <{if $actionForm->get($config->get('conf_name')) == $theme}>selected<{/if}>><{$theme|escape}></option>
               <{/foreach}>
@@ -93,7 +94,7 @@
 
             
           <{elseif $config->get('conf_formtype') == 'theme_multi'}>
-            <select name='<{$config->getVar('conf_name')}>[]' id='<{$config->getVar('conf_name')}>' size='5' multiple>
+            <select name='<{$config->getVar('conf_name')}>[]' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='5' multiple>
               <{foreach item=theme from=$themeArr}>
                 <{assign var=flag value=0}>
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
@@ -105,19 +106,19 @@
             
             
           <{elseif $config->get('conf_formtype') == 'tplset'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{xoops_optionsArray value=tplset_name label=tplset_name from=$tplsetArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
             
             
           <{elseif $config->get('conf_formtype') == 'timezone'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{xoops_optionsArray value=offset label=zone_name from=$timezoneArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
 
 
           <{elseif $config->get('conf_formtype') == 'language'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach item=language from=$languageArr}>
                 <option value="<{$language|escape}>" <{if $actionForm->get($config->get('conf_name')) == $language}>selected<{/if}>><{$language|escape}></option>
               <{/foreach}>
@@ -125,20 +126,20 @@
 
 
           <{elseif $config->get('conf_formtype') == 'startpage'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <option value="--"><{$smary.const._MD_AM_NONE}></option>
               <{xoops_optionsArray value=mid label=name from=$moduleArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
             
             
           <{elseif $config->get('conf_formtype') == 'group'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{xoops_optionsArray value=groupid label=name from=$groupArr default=$actionForm->get($config->get('conf_name'))}>
             </select>
 
 
           <{elseif $config->get('conf_formtype') == 'group_multi'}>
-            <select name='<{$config->getVar('conf_name')}>[]' id='<{$config->getVar('conf_name')}>' size='3' multiple>
+            <select name='<{$config->getVar('conf_name')}>[]' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='3' multiple>
               <{foreach item=group from=$groupArr}>
                 <{assign var=flag value=0}>
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
@@ -150,7 +151,7 @@
 
 
           <{elseif $config->get('conf_formtype') == 'user'}>
-            <select name='<{$config->getVar('conf_name')}>' id='<{$config->getVar('conf_name')}>'>
+            <select name='<{$config->getVar('conf_name')}>' id='legacy_xoopsform_<{$config->getVar('conf_name')}>'>
               <{foreach key=value item=label from=$userArr}>
                 <option value="<{$value|escape}>" <{if $value == $actionForm->get($config->get('conf_name'))}>selected<{/if}>><{$label|escape}></option>
               <{/foreach}>
@@ -158,7 +159,7 @@
 
 
           <{elseif $config->get('conf_formtype') == 'user_multi'}>
-            <select name='<{$config->getVar('conf_name')}>[]' id='<{$config->getVar('conf_name')}>' size='3' multiple>
+            <select name='<{$config->getVar('conf_name')}>[]' id='legacy_xoopsform_<{$config->getVar('conf_name')}>' size='3' multiple>
               <{foreach key=value item=label from=$userArr}>
                 <{assign var=flag value=0}>
                 <{foreach item=selected from=$actionForm->get($config->get('conf_name'))}>
@@ -172,7 +173,7 @@
           <{elseif $config->get('conf_formtype') == 'module_cache'}>
             <{foreach item=module from=$moduleArr}>
               <{$module->getVar('name')}>
-                <select name="<{$config->getVar('conf_name')}>[<{$module->getVar('mid')}>]">
+                <select name="<{$config->getVar('conf_name')}>[<{$module->getVar('mid')}>]"> id='legacy_xoopsform_<{$config->getVar('conf_name')}>_<{$module->getVar('mid')}>'
                   <{foreach item=cachetime from=$cachetimeArr}>
                     <{if $actionForm->get($config->get('conf_name'), $module->get('mid')) == $cachetime->get('cachetime')}>
                       <option value="<{$cachetime->getVar('cachetime')}>" selected><{$cachetime->getVar('label')}></option>
@@ -186,14 +187,14 @@
             
             
           <{elseif $config->get('conf_formtype') == 'password'}>
-            <{xoops_input type=password name=$config->get('conf_name') id=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
+            <{xoops_input type=password name=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
 
 
           <{elseif $config->get('conf_formtype') == 'textbox'}>
-            <{xoops_input type=text name=$config->get('conf_name') id=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
+            <{xoops_input type=text name=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
 
           <{elseif $config->get('conf_formtype') == 'text'}> <{* deprecated *}>
-            <{xoops_input type=text name=$config->get('conf_name') id=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
+            <{xoops_input type=text name=$config->get('conf_name') size=50 maxlength=255 value=$actionForm->get($config->get('conf_name'))}>
 
           <{/if}>
         </td>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:49:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:49:05 +0900
Subject: [xoops-cvslog 3451] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060710044905.1A7A92AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.45 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.46
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.45	Fri Jul  7 11:54:05 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Mon Jul 10 13:49:04 2006
@@ -801,6 +801,95 @@
 		
 		return $count;
 	}
+
+	/**
+	 * This member function works to redirect as well as redirect_header().
+	 * But, this member function handles raw values which hasn't been converted
+	 * by htmlspecialchars(). Therefore, if user calls this function with the
+	 * 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.
+	 * 
+	 * @todo We'll change this function to delegate.
+	 */
+	function executeRedirect($url, $time = 1, $message = null)
+	{
+		global $xoopsConfig, $xoopsRequestUri;
+
+		//
+		// Check the following by way of caution.
+		//
+		if (preg_match("/(javascript|vbscript):/si", $url)) {
+			$url = XOOPS_URL;
+		}
+		
+		$displayMessage = "";
+		if (is_array($message)) {
+			foreach (array_keys($message) as $id) {
+				$message[$id] = htmlspecialchars($message, ENT_QUOTES);
+			}
+			$displayMessage = implode("<br/>", $message);
+		}
+		else {
+			$displayMessage = $message;
+		}
+		
+		$url = htmlspecialchars($url, ENT_QUOTES);
+		if (defined('SID') && (! isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
+			if (!strstr($url, '?')) {
+				$url .= '?' . SID;
+			}
+			else {
+				$url .= '&amp;' . SID;
+			}
+		}
+
+		if (!defined('XOOPS_CPFUNC_LOADED')) {
+			require_once XOOPS_ROOT_PATH.'/class/template.php';
+			$xoopsTpl = new XoopsTpl();
+			$xoopsTpl->assign('sitename', htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
+			$xoopsTpl->assign('langcode', _LANGCODE);
+			$xoopsTpl->assign('charset', _CHARSET);
+			$xoopsTpl->assign('time', $time);
+
+			$xoopsTpl->assign('url', $url);
+			$xoopsTpl->assign('message', $displayMessage);
+			$xoopsTpl->assign('lang_ifnotreload', sprintf(_IFNOTRELOAD, $url));
+			$GLOBALS['xoopsModuleUpdate'] = 1;
+			$xoopsTpl->display('db:system_redirect.html');
+		} else {
+			$url = preg_replace("/&amp;/i", '&', htmlspecialchars($url, ENT_QUOTES));
+			echo '
+			<html>
+			<head>
+			<title>'.htmlspecialchars($xoopsConfig['sitename']).'</title>
+			<meta http-equiv="Content-Type" content="text/html; charset='._CHARSET.'" />
+			<meta http-equiv="Refresh" content="'.$time.'; url='.$url.'" />
+			<style type="text/css">
+					body {background-color : #fcfcfc; font-size: 12px; font-family: Trebuchet MS,Verdana, Arial, Helvetica, sans-serif; margin: 0px;}
+					.redirect {width: 70%; margin: 110px; text-align: center; padding: 15px; border: #e0e0e0 1px solid; color: #666666; background-color: #f6f6f6;}
+					.redirect a:link {color: #666666; text-decoration: none; font-weight: bold;}
+					.redirect a:visited {color: #666666; text-decoration: none; font-weight: bold;}
+					.redirect a:hover {color: #999999; text-decoration: underline; font-weight: bold;}
+			</style>
+			</head>
+			<body>
+			<div align="center">
+			<div class="redirect">
+			<span style="font-size: 16px; font-weight: bold;">'.$displayMessage.'</span>
+			<hr style="height: 3px; border: 3px #E18A00 solid; width: 95%;" />
+			<p>'.sprintf(_IFNOTRELOAD, $url).'</p>
+			</div>
+			</div>
+			</body>
+			</html>';
+		}
+		
+		exit();
+	}
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:50:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:50:17 +0900
Subject: [xoops-cvslog 3452] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710045017.DABD62AC050@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php	Mon Jul 10 13:50:17 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientDeleteAction.class.php,v 1.1.2.2 2006/07/10 04:50:17 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['cid']) ? $_REQUEST['cid'] : 0;
+		return xoops_getrequest('cid');
 	}
 
 	function &_getHandler()
@@ -40,7 +44,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:50:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:50:45 +0900
Subject: [xoops-cvslog 3453] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710045045.3A7562AC050@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php:1.1.2.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php	Mon Jul 10 13:50:45 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientAdminDeleteForm.class.php,v 1.1.2.2 2006/07/10 04:50:45 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.BannerclientAdminDeleteForm.TOKEN";
+		return "module.legacyRender.BannerclientAdminDeleteForm.TOKEN" . $this->get('cid');
 	}
 
 	function prepare()
@@ -22,7 +26,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['cid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:51:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:51:59 +0900
Subject: [xoops-cvslog 3454] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710045159.364902AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.5	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html	Mon Jul 10 13:51:59 2006
@@ -20,23 +20,23 @@
         <{if $object->get('htmlbanner')}>
           <{$object->get('htmlcode')}>
         <{else}>
-          <a href="<{$object->getVar('clickurl')}>" target="_blank"><img src="<{$object->getVar('imageurl')}>" alt="Banner" /></a>
+          <a href="<{$object->getShow('clickurl')}>" target="_blank"><img src="<{$object->getShow('imageurl')}>" alt="Banner" /></a>
         <{/if}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_BID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('bid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CLIENT_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getVar('name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getShow('name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}></td>
       <td class="<{cycle values="odd,even"}>">
         <{if $object->get('imptotal') > 0}>
-          <{$object->getVar('imptotal')}>
+          <{$object->getShow('imptotal')}>
         <{else}>
           <{$smarty.const._AD_LEGACYRENDER_LANG_UN_LIMITED}>
         <{/if}>
@@ -44,19 +44,19 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('impmade')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('impmade')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clicks')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('clicks')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('imageurl')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('imageurl')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clickurl')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('clickurl')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}></td>
@@ -64,10 +64,11 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}></td>
-      <td class="<{cycle values="odd,even"}>"><{if $object->getVar('htmlbanner') ==1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}></td>    </tr>
+      <td class="<{cycle values="odd,even"}>"><{if $object->getShow('htmlbanner') ==1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}></td>
+    </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('htmlcode')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('htmlcode')}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2">

From minahito ＠ users.sourceforge.jp  Mon Jul 10 13:53:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 13:53:14 +0900
Subject: [xoops-cvslog 3455] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710045314.2452F2AC04D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.5	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html	Mon Jul 10 13:53:14 2006
@@ -18,31 +18,32 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('cid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CONTACT}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('contact')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('contact')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_EMAIL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('email')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('email')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('login')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('login')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('extrainfo')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('extrainfo')}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2">
         <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        <{* TODO The back button problem is there *}>
         <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:52:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:52:25 +0900
Subject: [xoops-cvslog 3456] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055225.CA8EE2AC039@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.2	Tue Jun 27 18:12:01 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Mon Jul 10 14:52:25 2006
@@ -13,6 +13,8 @@
 define ("LEGACYRENDER_FRAME_VIEW_ERROR", 3);
 define ("LEGACYRENDER_FRAME_VIEW_INDEX", 4);
 define ("LEGACYRENDER_FRAME_VIEW_INPUT", 5);
+define ("LEGACYRENDER_FRAME_VIEW_PREVIEW", 6);
+define ("LEGACYRENDER_FRAME_VIEW_CANCEL", 7);
 
 class LegacyRender_ActionFrame extends XCube_ActionStrategy
 {
@@ -20,7 +22,7 @@
 	var $mAction = null;
 	var $mAdminFlag = null;
 
-	function Legacy_ActionFrame($admin)
+	function LegacyRender_ActionFrame($admin)
 	{
 		$this->mAdminFlag = $admin;
 	}
@@ -42,10 +44,10 @@
 		$className = "LegacyRender_" . ucfirst($this->mActionName) . "Action";
 		$fileName = ucfirst($this->mActionName) . "Action";
 		if ($this->mAdminFlag) {
-			$fileName = XOOPS_MODULE_PATH . "/base/admin/actions/${fileName}.class.php";
+			$fileName = XOOPS_MODULE_PATH . "/legacyRender/admin/actions/${fileName}.class.php";
 		}
 		else {
-			$fileName = XOOPS_MODULE_PATH . "/base/actions/${fileName}.class.php";
+			$fileName = XOOPS_MODULE_PATH . "/legacyRender/actions/${fileName}.class.php";
 		}
 	
 		if (!file_exists($fileName)) {
@@ -96,6 +98,14 @@
 			case LEGACYRENDER_FRAME_VIEW_INPUT:
 				$this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
 				break;
+		
+			case LEGACYRENDER_FRAME_VIEW_PREVIEW:
+				$this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+		
+			case LEGACYRENDER_FRAME_VIEW_CANCEL:
+				$this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
 		}
 	}
 }
@@ -107,7 +117,7 @@
 	 */
 	var $_mAdminFlag = false;
 	
-	function Legacy_Action($adminFlag = false)
+	function LegacyRender_Action($adminFlag = false)
 	{
 		$this->_mAdminFlag = $adminFlag;
 	}
@@ -146,6 +156,14 @@
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 	}
+
+	function executeViewPreview(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:53:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:53:49 +0900
Subject: [xoops-cvslog 3457] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055349.A3C512AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php:1.1.2.1	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php	Mon Jul 10 14:53:49 2006
@@ -60,6 +60,10 @@
 		if ($this->mObject == null) {
 			return LEGACYRENDER_FRAME_VIEW_ERROR;
 		}
+		
+		if (xoops_getrequest('_form_control_cancel') != null) {
+			return LEGACYRENDER_FRAME_VIEW_CANCEL;
+		}
 	
 		$this->mActionForm->load($this->mObject);
 		

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:54:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:54:24 +0900
Subject: [xoops-cvslog 3458] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055424.625DE2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/banner.php
diff -u xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.2 xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.2	Tue Apr 25 12:55:49 2006
+++ xoops2jp/html/modules/legacyRender/class/banner.php	Mon Jul 10 14:54:24 2006
@@ -24,7 +24,7 @@
 	function loadBannerclient()
 	{
 		if ($this->_mClientLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('bannerclient');
+			$handler =& xoops_getmodulehandler('bannerclient', 'legacyRender');
 			$this->mClient =& $handler->get($this->get('cid'));
 			$this->_mClientLoadedFlag = true;
 		}

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:54:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:54:45 +0900
Subject: [xoops-cvslog 3459] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055445.C9FE22AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/bannerclient.php
diff -u xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.2 xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.2	Mon Apr 24 19:57:57 2006
+++ xoops2jp/html/modules/legacyRender/class/bannerclient.php	Mon Jul 10 14:54:45 2006
@@ -30,7 +30,7 @@
 	function loadBanner()
 	{
 		if ($this->_mBannersLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('banner');
+			$handler =& xoops_getmodulehandler('banner', 'legacyRender');
 			$this->mBanners =& $handler->getObjects(new Criteria('cid', $this->get('cid')));
 			$this->_mBannersLoadedFlag = true;
 		}
@@ -39,7 +39,7 @@
 	function loadBannerCount()
 	{
 		if ($this->_mBannerCountLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('banner');
+			$handler =& xoops_getmodulehandler('banner', 'legacyRender');
 			$this->mBannerCount = $handler->getCount(new Criteria('cid', $this->get('cid')));
 			$this->_mBannerCountLoadedFlag = true;
 		}
@@ -47,7 +47,7 @@
 
 	function &createBanner()
 	{
-		$handler =& xoops_getmodulehandler('banner');
+		$handler =& xoops_getmodulehandler('banner', 'legacyRender');
 		$obj =& $handler->create();
 		$obj->set('cid', $this->get('cid'));
 		return $obj;
@@ -56,7 +56,7 @@
 	function loadBannerfinish()
 	{
 		if ($this->_mBannerfinishCountFlag == false) {
-			$handler =& xoops_getmodulehandler('bannerfinish');
+			$handler =& xoops_getmodulehandler('bannerfinish', 'legacyRender');
 			$this->mFinishBanners =& $handler->getObjects(new Criteria('cid', $this->get('cid')));
 			$this->_mBannerfinishCountLoadedFlag = true;
 		}
@@ -65,7 +65,7 @@
 	function loadFinishBannerCount()
 	{
 		if ($this->_mFinishBannerCountLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('bannerfinish');
+			$handler =& xoops_getmodulehandler('bannerfinish', 'legacyRender');
 			$this->mFinishBannerCount = $handler->getCount(new Criteria('cid', $this->get('cid')));
 			$this->_mFinishBannerCountLoadedFlag = true;
 		}
@@ -73,7 +73,7 @@
 
 	function &createBannerfinish()
 	{
-		$handler =& xoops_getmodulehandler('bannerfinish');
+		$handler =& xoops_getmodulehandler('bannerfinish', 'legacyRender');
 		$obj =& $handler->create();
 		$obj->set('cid', $this->get('cid'));
 		return $obj;
@@ -88,11 +88,11 @@
 
 	function delete(&$obj)
 	{
-		$handler =& xoops_getmodulehandler('banner');
+		$handler =& xoops_getmodulehandler('banner', 'legacyRender');
 		$handler->deleteAll(new Criteria('cid', $obj->get('cid')));
 		unset($handler);
 	
-		$handler =& xoops_getmodulehandler('bannerfinish');
+		$handler =& xoops_getmodulehandler('bannerfinish', 'legacyRender');
 		$handler->deleteAll(new Criteria('cid', $obj->get('cid')));
 		unset($handler);
 	

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:54:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:54:59 +0900
Subject: [xoops-cvslog 3460] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055459.722792AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/bannerfinish.php
diff -u xoops2jp/html/modules/legacyRender/class/bannerfinish.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/bannerfinish.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/class/bannerfinish.php:1.1.2.1	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/bannerfinish.php	Mon Jul 10 14:54:59 2006
@@ -20,7 +20,7 @@
 	function loadBannerclient()
 	{
 		if ($this->_mClientLoadedFlag == false) {
-			$handler =& xoops_getmodulehandler('bannerclient');
+			$handler =& xoops_getmodulehandler('bannerclient', 'legacyRender');
 			$this->mClient =& $handler->get($this->get('cid'));
 			$this->_mClientLoadedFlag = true;
 		}

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:55:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:55:23 +0900
Subject: [xoops-cvslog 3461] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055523.BFBE02AC03D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/tplfile.php
diff -u xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.11 xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.12
--- xoops2jp/html/modules/legacyRender/class/tplfile.php:1.1.2.11	Thu May 25 14:20:55 2006
+++ xoops2jp/html/modules/legacyRender/class/tplfile.php	Mon Jul 10 14:55:23 2006
@@ -27,7 +27,7 @@
 	function loadSource()
 	{
 		if (!is_object($this->Source)) {
-			$handler =& xoops_getmodulehandler('tplsource');
+			$handler =& xoops_getmodulehandler('tplsource', 'legacyRender');
 			$this->Source =& $handler->get($this->get('tpl_id'));
 			if (!is_object($this->Source)) {
 				$this->Source =& $handler->create();
@@ -58,7 +58,7 @@
 		$obj->set('tpl_lastimported', $this->get('tpl_lastimported'));
 		$obj->set('tpl_type', $this->get('tpl_type'));
 		
-		$handler =& xoops_getmodulehandler('tplsource');
+		$handler =& xoops_getmodulehandler('tplsource', 'legacyRender');
 		$obj->Source =& $handler->create();
 		
 		$obj->Source->set('tpl_source', $this->Source->get('tpl_source'));
@@ -107,7 +107,7 @@
 			return true;
 		}
 		else {
-			$handler =& xoops_getmodulehandler('tplsource');
+			$handler =& xoops_getmodulehandler('tplsource', 'legacyRender');
 
 			if ($obj->Source->isNew()) {
 				$obj->Source->set('tpl_id', $obj->get('tpl_id'));
@@ -154,7 +154,7 @@
 		$obj->loadSource();
 		
 		if (is_object($obj->Source)) {
-			$handler =& xoops_getmodulehandler('tplsource');
+			$handler =& xoops_getmodulehandler('tplsource', 'legacyRender');
 			if (!$handler->delete($obj->Source, $force)) {
 				return false;
 			}

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:55:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:55:36 +0900
Subject: [xoops-cvslog 3462] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710055536.68D0F2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/tplset.php
diff -u xoops2jp/html/modules/legacyRender/class/tplset.php:1.1.2.8 xoops2jp/html/modules/legacyRender/class/tplset.php:1.1.2.9
--- xoops2jp/html/modules/legacyRender/class/tplset.php:1.1.2.8	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/class/tplset.php	Mon Jul 10 14:55:36 2006
@@ -34,7 +34,7 @@
 		$moduleHandler =& xoops_gethandler('module');
 		$modules =& $moduleHandler->getObjects();
 		
-		$tplfileHandler =& xoops_getmodulehandler('tplfile');
+		$tplfileHandler =& xoops_getmodulehandler('tplfile', 'legacyRender');
 		
 		foreach ($modules as $module) {
 			$modtpl =& new LegacyRenderModuletplObject();
@@ -71,7 +71,7 @@
 		//
 		// fetch all tplfile object and do cloning.
 		//
-		$handler =& xoops_getmodulehandler('tplfile');
+		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
 		
 		$files =& $handler->getObjects(new Criteria('tpl_tplset', $original->get('tplset_name')));
 		foreach ($files as $file) {
@@ -84,7 +84,7 @@
 
 	function delete(&$obj, $force)
 	{
-		$handler =& xoops_getmodulehandler('tplfile');
+		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
 		$handler->deleteAll(new Criteria('tpl_tplset', $obj->get('tplset_name')));
 
 		return parent::delete($obj, $force);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:55:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:55:58 +0900
Subject: [xoops-cvslog 3463] CVS update:
	xoops2jp/html/modules/legacyRender/admin
Message-ID: <20060710055558.C71C22AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/index.php
diff -u xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/index.php:1.1.2.1	Fri Nov 25 19:28:16 2005
+++ xoops2jp/html/modules/legacyRender/admin/index.php	Mon Jul 10 14:55:58 2006
@@ -1,25 +1,24 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: index.php,v 1.1.2.2 2006/07/10 05:55:58 minahito Exp $
+ */
 
 require_once "../../../mainfile.php";
-require_once XOOPS_ROOT_PATH."/header.php";
+require_once XOOPS_ROOT_PATH . "/header.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/ActionFrame.class.php";
 
-$root=&XCube_Root::getSingleton();
-$renderSystem=&$root->mController->getRenderSystem();
+$root =& XCube_Root::getSingleton();
 
-require_once "./class/LegacyRenderActionFrame.class.php";
+$actionName = isset($_GET['action']) ? trim($_GET['action']) : "ThemeList";
 
-$moduleRunner=new LegacyRenderActionFrame();
+$moduleRunner =& new LegacyRender_ActionFrame(true);
+$moduleRunner->setActionName($actionName);
 
-//
-// Regist the module level easy framework to virtual controller.
-//
 $root->mController->setActionStrategy($moduleRunner);
 
-//
-// Execute framework.
-//
 $root->mController->executeAction();
 
-require_once XOOPS_ROOT_PATH."/footer.php";
+require_once XOOPS_ROOT_PATH . "/footer.php";
 
-?>
\ No newline at end of file
+?>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:56:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:56:35 +0900
Subject: [xoops-cvslog 3464] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710055635.1950B2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.2	Mon Jul 10 13:50:17 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php	Mon Jul 10 14:56:34 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: BannerclientDeleteAction.class.php,v 1.1.2.2 2006/07/10 04:50:17 minahito Exp $
+ * @version $Id: BannerclientDeleteAction.class.php,v 1.1.2.3 2006/07/10 05:56:34 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -46,6 +46,11 @@
 	{
 		$controller->executeRedirect("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerclientList");
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:56:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:56:52 +0900
Subject: [xoops-cvslog 3465] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710055652.56B5C2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php:1.1.2.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php	Mon Jul 10 14:56:52 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientEditAction.class.php,v 1.1.2.2 2006/07/10 05:56:52 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['cid']) ? $_REQUEST['cid'] : 0;
+		return xoops_getrequest('cid');
 	}
 
 	function &_getHandler()
@@ -40,7 +44,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerclientList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:57:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:57:22 +0900
Subject: [xoops-cvslog 3466] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710055722.081732AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php:1.1.2.2	Tue Apr 25 14:17:19 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php	Mon Jul 10 14:57:21 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientAdminEditForm.class.php,v 1.1.2.3 2006/07/10 05:57:21 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.BannerclientAdminEditForm.TOKEN";
+		return "module.legacyRender.BannerclientAdminEditForm.TOKEN" . $this->get('cid');
 	}
 
 	function prepare()
@@ -28,7 +32,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['cid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 14:58:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 14:58:38 +0900
Subject: [xoops-cvslog 3467] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710055838.229632AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.6	Mon Jul 10 13:53:14 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html	Mon Jul 10 14:58:37 2006
@@ -42,9 +42,8 @@
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <{* TODO The back button problem is there *}>
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 15:08:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 15:08:31 +0900
Subject: [xoops-cvslog 3468] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710060831.DF6822AC03D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.1	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php	Mon Jul 10 15:08:31 2006
@@ -22,7 +22,7 @@
 	function getSort()
 	{
 		$sortkey = abs($this->mSort);
-		return isset($this->_mSortKeys[$sortkey]) ? $this->_mSortKeys[$sortkey] : null;
+		return isset($this->mSortKeys[$sortkey]) ? $this->mSortKeys[$sortkey] : null;
 	}
 
 	function getOrder()

From minahito ＠ users.sourceforge.jp  Mon Jul 10 15:08:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 15:08:41 +0900
Subject: [xoops-cvslog 3469] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710060841.A5D962AC03D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.3	Mon Jul 10 14:52:25 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Mon Jul 10 15:08:41 2006
@@ -133,12 +133,12 @@
 
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		return LEGACY_FRAME_VIEW_NONE;
+		return LEGACYRENDER_FRAME_VIEW_NONE;
 	}
 
 	function execute(&$controller, &$xoopsUser)
 	{
-		return LEGACY_FRAME_VIEW_NONE;
+		return LEGACYRENDER_FRAME_VIEW_NONE;
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Mon Jul 10 15:15:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 15:15:53 +0900
Subject: [xoops-cvslog 3470] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710061553.006572AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.4	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html	Mon Jul 10 15:15:53 2006
@@ -27,7 +27,7 @@
 
 <form action="index.php?action=BannerclientEdit" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=cid value=$actionForm->getVar('cid')}>
+  <{xoops_input type=hidden name=cid value=$actionForm->get('cid')}>
   <table class="outer">
     <tr>
       <th colspan="2">
@@ -41,43 +41,43 @@
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_NAME}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=50 maxlength=60}>
+        <{xoops_input type=text name=name value=$actionForm->get('name') size=50 maxlength=60}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CONTACT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=contact value=$actionForm->getVar('contact') size=50 maxlength=60}>
+        <{xoops_input type=text name=contact value=$actionForm->get('contact') size=50 maxlength=60}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_EMAIL}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=email value=$actionForm->getVar('email') size=50 maxlength=60}>
+        <{xoops_input type=text name=email value=$actionForm->get('email') size=50 maxlength=60}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=login value=$actionForm->getVar('login') size=15 maxlength=10}>
+        <{xoops_input type=text name=login value=$actionForm->get('login') size=15 maxlength=10}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=passwd value=$actionForm->getVar('passwd') size=15 maxlength=10}>
+        <{xoops_input type=text name=passwd value=$actionForm->get('passwd') size=15 maxlength=10}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=extrainfo value=$actionForm->getVar('extrainfo')}>
+        <{xoops_dhtmltarea type=text name=extrainfo value=$actionForm->get('extrainfo') rows=5 cols=50}>
       </td>
     </tr>
     <tr class="foot">
       <td colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:04:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:04:37 +0900
Subject: [xoops-cvslog 3471] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710070437.13A8A2AC03E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.4	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html	Mon Jul 10 16:04:36 2006
@@ -36,18 +36,18 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><{$obj->getVar('cid')}></td>
-      <td><{$obj->getVar('name')}></td>
-      <td><{$obj->getVar('contact')}></td>
-      <td><{$obj->getVar('email')}></td>
-      <td><{$obj->getVar('login')}></td>
-      <td><{$obj->getVar('extrainfo')}></td>
+      <td><{$obj->getShow('cid')}></td>
+      <td><{$obj->getShow('name')}></td>
+      <td><{$obj->getShow('contact')}></td>
+      <td><{$obj->getShow('email')}></td>
+      <td><{$obj->getShow('login')}></td>
+      <td><{$obj->getShow('extrainfo')}></td>
       <td>
         <{assign var=count value=count($obj->mBanners)}>
-        <a href="./index.php?action=BannerList&amp;cid=<{$obj->getVar('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>(<{$obj->mBannerCount|escape}>)</a><br />
-        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->getVar('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|escape}>)</a><br />
-        <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->getVar('cid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <a href="./index.php?action=BannerclientDelete&amp;cid=<{$obj->getVar('cid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=BannerList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>(<{$obj->mBannerCount|escape}>)</a><br />
+        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->getShow('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|escape}>)</a><br />
+        <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->getShow('cid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=BannerclientDelete&amp;cid=<{$obj->getShow('cid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
   <{/foreach}>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:23:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:23:21 +0900
Subject: [xoops-cvslog 3472] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710072321.D66EF2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php	Mon Jul 10 16:23:21 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerDeleteAction.class.php,v 1.1.2.2 2006/07/10 07:23:21 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -39,7 +43,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:23:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:23:37 +0900
Subject: [xoops-cvslog 3473] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710072337.736992AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.2	Thu May 11 18:09:55 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php	Mon Jul 10 16:23:37 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerEditAction.class.php,v 1.1.2.3 2006/07/10 07:23:37 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -54,7 +58,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:24:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:24:03 +0900
Subject: [xoops-cvslog 3474] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710072403.F3CF72AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php:1.1.2.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php	Mon Jul 10 16:24:03 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerAdminDeleteForm.class.php,v 1.1.2.2 2006/07/10 07:24:03 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.BannerAdminDeleteForm.TOKEN";
+		return "module.legacyRender.BannerAdminDeleteForm.TOKEN" . $this->get('bid');
 	}
 
 	function prepare()
@@ -22,7 +26,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['bid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_BID);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:24:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:24:22 +0900
Subject: [xoops-cvslog 3475] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710072422.E26B92AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php:1.1.2.2	Tue Apr 25 12:58:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php	Mon Jul 10 16:24:22 2006
@@ -1,15 +1,23 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerAdminEditForm.class.php,v 1.1.2.3 2006/07/10 07:24:22 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
 require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
 
+/**
+ * [ToDo]
+ * This form doesn't validate the format of URL. Isn't OK?
+ */
 class LegacyRender_BannerAdminEditForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.BannerAdminEditForm.TOKEN";
+		return "module.legacyRender.BannerAdminEditForm.TOKEN" . $this->get('bid');
 	}
 
 	function prepare()
@@ -28,7 +36,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['bid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_BID);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:24:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:24:39 +0900
Subject: [xoops-cvslog 3476] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710072439.14BF02AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.2	Tue Apr 25 14:24:16 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php	Mon Jul 10 16:24:38 2006
@@ -18,7 +18,7 @@
 class LegacyRender_BannerclientFilterForm extends LegacyRender_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		BANNERCLIENT_SORT_KEY_CID => 'cid',
 		BANNERCLIENT_SORT_KEY_NAME => 'name',
 		BANNERCLIENT_SORT_KEY_CONTACT => 'contact',
@@ -33,20 +33,20 @@
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNERCLIENT_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > BANNERCLIENT_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = BANNERCLIENT_SORT_KEY_DEFAULT;
 		}
 	
 		if (isset($_REQUEST['name'])) {
 			$this->_mNavi->addExtra('name', xoops_getrequest('name'));
 			// TODO Changet to 'LIKE' (?)
-			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+			$this->_mCriteria->add(new Criteria('name', xoops_getrequest('name')));
 		}
 	
 		if (isset($_REQUEST['contact'])) {
 			$this->_mNavi->addExtra('contact', xoops_getrequest('contact'));
 			// TODO Changet to 'LIKE' (?)
-			$this->_mCriteria->add(new Criteria('contact', array(XOBJ_DTYPE_STRING, xoops_getrequest('contact'))));
+			$this->_mCriteria->add(new Criteria('contact', xoops_getrequest('contact')));
 		}
 		
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:24:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:24:55 +0900
Subject: [xoops-cvslog 3477] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710072455.9221B2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.3	Tue Apr 25 14:24:16 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php	Mon Jul 10 16:24:55 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerFilterForm.class.php,v 1.1.2.4 2006/07/10 07:24:55 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -21,7 +25,7 @@
 class LegacyRender_BannerFilterForm extends LegacyRender_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		BANNER_SORT_KEY_BID => 'bid',
 		BANNER_SORT_KEY_CID => 'cid',
 		BANNER_SORT_KEY_IMPTOTAL => 'imptotal',
@@ -39,18 +43,18 @@
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNER_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > BANNER_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = BANNER_SORT_KEY_DEFAULT;
 		}
 	
 		if (isset($_REQUEST['cid'])) {
 			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
-			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
+			$this->_mCriteria->add(new Criteria('cid', xoops_getrequest('cid')));
 		}
 	
 		if (isset($_REQUEST['htmlbanner'])) {
 			$this->_mNavi->addExtra('htmlbanner', xoops_getrequest('htmlbanner'));
-			$this->_mCriteria->add(new Criteria('htmlbanner', array(XOBJ_DTYPE_BOOL, xoops_getrequest('htmlbanner'))));
+			$this->_mCriteria->add(new Criteria('htmlbanner', xoops_getrequest('htmlbanner')));
 		}
 		
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:25:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:25:10 +0900
Subject: [xoops-cvslog 3478] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710072510.ED4DC2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.6	Mon Jul 10 13:51:59 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html	Mon Jul 10 16:25:10 2006
@@ -72,8 +72,8 @@
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:25:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:25:23 +0900
Subject: [xoops-cvslog 3479] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710072523.961092AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.5	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html	Mon Jul 10 16:25:23 2006
@@ -5,7 +5,7 @@
 
 <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}>
 <{if $currentClient}>
-  ( <{$currentClient->getVar('name')}> )
+  ( <{$currentClient->getShow('name')}> )
 <{/if}>
 </h3>
 
@@ -42,19 +42,19 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mClient->getVar('name')}></td>
+      <td><{$obj->getShow('bid')}></td>
+      <td><{$obj->mClient->getShow('name')}></td>
       <td>
         <{if $obj->get('imptotal') > 0}>
-          <{$obj->getVar('imptotal')}>
+          <{$obj->getShow('imptotal')}>
         <{else}>
           <{$smarty.const._AD_LEGACYRENDER_LANG_UN_LIMITED}>
         <{/if}>
       </td>
-      <td><{$obj->getVar('impmade')}></td>
-      <td><{$obj->getVar('clicks')}></td>
+      <td><{$obj->getShow('impmade')}></td>
+      <td><{$obj->getShow('clicks')}></td>
       <td><{$obj->get('date')|xoops_formattimestamp}></td>
-      <td><{if $obj->getVar('htmlbanner') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}></td>
+      <td><{if $obj->getShow('htmlbanner') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}></td>
       <td>
         <a href="./index.php?action=BannerEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <a href="./index.php?action=BannerDelete&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 16:26:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 16:26:43 +0900
Subject: [xoops-cvslog 3480] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710072643.478A82AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.6	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Mon Jul 10 16:26:43 2006
@@ -43,7 +43,7 @@
         <{if $actionForm->get('htmlbanner')}>
           <{$actionForm->get('htmlcode')}>
         <{else}>
-          <a href="<{$actionForm->getVar('clickurl')}>" target="_blank"><img src="<{$actionForm->getVar('imageurl')}>" alt="Banner" /></a>
+          <a href="<{$actionForm->getShow('clickurl')}>" target="_blank"><img src="<{$actionForm->getShow('imageurl')}>" alt="Banner" /></a>
         <{/if}>
       </td>
     </tr>
@@ -85,7 +85,7 @@
     <tr class="foot">
       <td colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 18:37:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 18:37:08 +0900
Subject: [xoops-cvslog 3481] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060710093708.CA6C62AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.16 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.17
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.16	Tue Jun 20 19:53:44 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Mon Jul 10 18:37:08 2006
@@ -13,6 +13,11 @@
 	var $mPrimary = null;
 	var $mClass = null;
 
+	/**
+	 * A instance of xoops simple object to get type information.
+	 */	
+	var $_mDummyObj = null;
+
 	function XoopsObjectGenericHandler(&$db)
 	{
 		parent::XoopsObjectHandler($db);
@@ -34,31 +39,34 @@
 	{
 		$ret = null;
 		
-		$id = $this->db->quoteString($id);
-		$sql = "SELECT * FROM " . $this->mTable . " WHERE " . $this->mPrimary . "=${id}";
-
-		$result = $this->db->query($sql);
+		$criteria =& new Criteria($this->mPrimary, $id);
+		$objArr =& $this->getObjects($criteria);
 		
-		if (!$result) {
-			return $ret;
-		}
-		
-		if ($this->db->getRowsNum($result) == 1) {
-			$ret =& new $this->mClass();
-			$ret->assignVars($this->db->fetchArray($result));
-			$ret->unsetNew();
+		if (count($objArr) == 1) {
+			$ret =& $objArr[0];
 		}
 
 		return $ret;
 	}
 
+	/**
+	 * Return array of object with $criteria.
+	 * 
+	 * @access public
+	 * @param CriteriaElement $criteria
+	 * @param int  $limit
+	 * @param int  $start
+	 * @param bool $id_as_key
+	 * 
+	 * @return array
+	 */
 	function &getObjects($criteria = null, $param1 = false, $param2 = false, $param3 = false)
 	{
 		$ret = array();
 
-		$sql = "SELECT * FROM " . $this->mTable;
-
 		if($criteria !== null && is_a($criteria, 'CriteriaElement')) {
+			$sql = "SELECT * FROM " . $this->mTable;
+			
 			$where = $this->_makeCriteria4sql($criteria);
 			
 			if (trim($where)) {
@@ -73,51 +81,36 @@
 				$sql .= " ORDER BY " . implode(',', $sorts);
 			}
 			
-			$limit=$criteria->getLimit();
-			$start=$criteria->getStart();
+			$limit = $criteria->getLimit();
+			$start = $criteria->getStart();
 			
-			$ret =& $this->_getObjects($sql, $limit, $start, $param1);
-		}
-		else {
-			$ret =& $this->_getObjects($sql, $param1, $param2, $param3);
-		}
-		
-		return $ret;
-	}
-	
-	/**
-	 * @access private
-	 */
-	function &_getObjects($sql = null, $limit = 0, $start = 0, $id_as_key = false)
-	{
-		$ret = array();
-
-		$result = $this->db->query($sql, $limit, $start);
+			$result = $this->db->query($sql, $limit, $start);
 
-		if (!$result) {
-			return $ret;
-		}
+			if (!$result) {
+				return $ret;
+			}
 
-		while($row=$this->db->fetchArray($result)) {
-			$obj =& new $this->mClass();
-			$obj->assignVars($row);
-			$obj->unsetNew();
+			while($row = $this->db->fetchArray($result)) {
+				$obj =& new $this->mClass();
+				$obj->assignVars($row);
+				$obj->unsetNew();
 			
-			if ($id_as_key)
-			{
-				$ret[$obj->get($this->mPrimary)]=&$obj;
-			}
-			else
-			{
-				$ret[]=&$obj;
-			}
+				if ($id_as_key)	{
+					$ret[$obj->get($this->mPrimary)] =& $obj;
+				}
+				else {
+					$ret[]=&$obj;
+				}
 			
-			unset($obj);
+				unset($obj);
+			}
+		
+			return $ret;
 		}
 		
 		return $ret;
 	}
-
+	
 	function getCount($criteria = null)
 	{
 		$ret = array();
@@ -247,9 +240,11 @@
 	
 	function _makeCriteria4sql($criteria)
 	{
-		$dmmyObj =& $this->create();
+		if ($this->_mDummyObj == null) {
+			$this->_mDummyObj =& $this->create();
+		}
 
-		return $this->_makeCriteriaElement4sql($criteria, $dmmyObj);
+		return $this->_makeCriteriaElement4sql($criteria, $this->_mDummyObj);
 	}
 
 	/**
@@ -350,8 +345,10 @@
 	 */
 	function &createCriteria()
 	{
-		$dmy =& $this->create();
-		$criteria =& new Legacy_Criteria($dmy->getTypeInformations());
+		if ($this->_mDummyObj == null) {
+			$this->_mDummyObj =& $this->create();
+		}
+		$criteria =& new Legacy_Criteria($this->_mDummyObj->getTypeInformations());
 		
 		return $criteria;
 	}

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:01:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:01:49 +0900
Subject: [xoops-cvslog 3482] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060710100149.BCDA52AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.17 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.18
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.17	Mon Jul 10 18:37:08 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Mon Jul 10 19:01:49 2006
@@ -311,20 +311,32 @@
 	}
 
 	/**
+	 * Delete $obj.
+	 * 
 	 * @return bool
 	 */
-	function delete(&$obj, $force=false)
+	function delete(&$obj, $force = false)
 	{
-		$id = $this->db->quoteString($obj->get($this->mPrimary));
-		$sql = "DELETE FROM " . $this->mTable . " WHERE " . $this->mPrimary . "=${id}";
+		//
+		// Because Criteria can generate the most appropriate sentence, use
+		// criteria even if this approach is few slow.
+		//
+		$criteria =& new Criteria($this->mPrimary, $obj->get($this->mPrimary));
+		$sql = "DELETE FROM " . $this->mTable . " WHERE " . $this->_makeCriteriaElement4sql($criteria, $obj);
 
 		return $force ? $this->db->queryF($sql) : $this->db->query($sql);
 	}
 	
 	/**
-	 * @param $criteria mixed Criteria or string
+	 * Delete plural objects by $criteria. If the sub-class want to override
+	 * the procedure of delete, delete() is better. This member function
+	 * fetches objects by $criteria and casts these objects into delete()
+	 * inside.
+	 * 
+	 * @param Criteria $criteria
+	 * @param bool     $force
 	 */
-	function deleteAll($criteria, $force=false)
+	function deleteAll($criteria, $force = false)
 	{
 		$objs =& $this->getObjects($criteria);
 		

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:57:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:57:40 +0900
Subject: [xoops-cvslog 3483] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060710105740.D839A2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.18 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.19
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.18	Mon Jul 10 19:01:49 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Mon Jul 10 19:57:40 2006
@@ -60,13 +60,13 @@
 	 * 
 	 * @return array
 	 */
-	function &getObjects($criteria = null, $param1 = false, $param2 = false, $param3 = false)
+	function &getObjects($criteria = null, $limit = null, $start = null, $id_as_key = false)
 	{
 		$ret = array();
 
+		$sql = "SELECT * FROM " . $this->mTable;
+
 		if($criteria !== null && is_a($criteria, 'CriteriaElement')) {
-			$sql = "SELECT * FROM " . $this->mTable;
-			
 			$where = $this->_makeCriteria4sql($criteria);
 			
 			if (trim($where)) {
@@ -81,33 +81,45 @@
 				$sql .= " ORDER BY " . implode(',', $sorts);
 			}
 			
-			$limit = $criteria->getLimit();
-			$start = $criteria->getStart();
-			
-			$result = $this->db->query($sql, $limit, $start);
-
-			if (!$result) {
-				return $ret;
+			if ($limit === null) {
+				$limit = $criteria->getLimit();
 			}
-
-			while($row = $this->db->fetchArray($result)) {
-				$obj =& new $this->mClass();
-				$obj->assignVars($row);
-				$obj->unsetNew();
 			
-				if ($id_as_key)	{
-					$ret[$obj->get($this->mPrimary)] =& $obj;
-				}
-				else {
-					$ret[]=&$obj;
-				}
+			if ($start === null) {
+				$start = $criteria->getStart();
+			}
+		}
+		else {
+			if ($limit === null) {
+				$limit = 0;
+			}
 			
-				unset($obj);
+			if ($start === null) {
+				$start = 0;
 			}
-		
+		}
+
+		$result = $this->db->query($sql, $limit, $start);
+
+		if (!$result) {
 			return $ret;
 		}
+
+		while($row = $this->db->fetchArray($result)) {
+			$obj =& new $this->mClass();
+			$obj->assignVars($row);
+			$obj->unsetNew();
+			
+			if ($id_as_key)	{
+				$ret[$obj->get($this->mPrimary)] =& $obj;
+			}
+			else {
+				$ret[]=&$obj;
+			}
 		
+			unset($obj);
+		}
+	
 		return $ret;
 	}
 	

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:57:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:57:57 +0900
Subject: [xoops-cvslog 3484] CVS update:
	xoops2jp/html/modules/legacyRender/admin/class
Message-ID: <20060710105757.440482AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/class/LegacyRenderActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/class/LegacyRenderActionFrame.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/class/LegacyRenderActionFrame.class.php:removed
--- xoops2jp/html/modules/legacyRender/admin/class/LegacyRenderActionFrame.class.php:1.1.2.5	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/class/LegacyRenderActionFrame.class.php	Mon Jul 10 19:57:57 2006
@@ -1,165 +0,0 @@
-<?php
-// $Id: LegacyRenderActionFrame.class.php,v 1.1.2.5 2006/03/28 13:30:48 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionStrategy.class.php";
-
-define ("LEGACYRENDER_FRAME_PERFORM_SUCCESS",1);
-define ("LEGACYRENDER_FRAME_PERFORM_FAIL",2);
-define ("LEGACYRENDER_FRAME_INIT_SUCCESS",3);
-
-define ("LEGACYRENDER_FRAME_VIEW_NONE",0);
-define ("LEGACYRENDER_FRAME_VIEW_SUCCESS",1);
-define ("LEGACYRENDER_FRAME_VIEW_ERROR",2);
-define ("LEGACYRENDER_FRAME_VIEW_INDEX",3);
-define ("LEGACYRENDER_FRAME_VIEW_INPUT",4);
-
-/**
- * This is simple frame work for misc page controller.
- * @package legacy
- */
-class LegacyRenderActionFrame extends XCube_ActionStrategy
-{
-	var $mActionName="";
-	var $mAction=null;
-	
-	function LegacyRenderActionFrame()
-	{
-	}
-	
-	function setActionName($actionName)
-	{
-		$this->mActionName=$actionName;
-	}
-	
-	function execute(&$controller)
-	{
-		if($this->mActionName==null)
-			$this->mActionName=isset($_REQUEST['action']) ? trim($_REQUEST['action']) : "ThemeList";
-
-		if(!preg_match("/^\w+$/",$this->mActionName))
-			die();
-
-
-		//
-		// Create action object by mActionName
-		//
-		$className="LegacyRender_".ucfirst($this->mActionName)."Action";
-		$fileName=XOOPS_ROOT_PATH."/modules/legacyRender/admin/actions/".ucfirst($this->mActionName)."Action.class.php";
-		if(!file_exists($fileName))
-			die();	// TODO
-		
-		require_once $fileName;
-		if(class_exists($className))
-				$this->mAction=new $className($controller,$controller->getXoopsUser());
-		
-		if(!is_object($this->mAction))
-			die();	// TODO
-
-		$this->mAction->prepare($controller,$controller->getXoopsUser());
-			
-		//
-		// Simple execute action switch.
-		//
-		if(xoops_getenv("REQUEST_METHOD")=="POST") {
-			$viewStatus=$this->mAction->execute($controller,$controller->getXoopsUser());
-		}
-		else {
-			$viewStatus=$this->mAction->getDefaultView($controller,$controller->getXoopsUser());
-		}
-
-
-		//
-		// Call the view stab method of action by $viewStatus
-		//
-		switch($viewStatus) {
-			case LEGACYRENDER_FRAME_VIEW_SUCCESS:
-				$this->mAction->executeViewSuccess($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case LEGACYRENDER_FRAME_VIEW_ERROR:
-				$this->mAction->executeViewError($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-			
-			case LEGACYRENDER_FRAME_VIEW_INDEX:
-				$this->mAction->executeViewIndex($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-
-			case LEGACYRENDER_FRAME_VIEW_INPUT:
-				$this->mAction->executeViewInput($controller,$controller->getXoopsUser(),$controller->mRenderSystem);
-				break;
-		}
-	}
-}
-
-class LegacyRender_Action
-{
-	var $mConfig;
-	
-	function LegacyRenderAction(&$controller,&$xoopsUser)
-	{
-		$this->mConfig=$controller->mModuleController->getConfig();
-	}
-	
-	function prepare(&$controller,&$xoopsUser)
-	{
-		return LEGACYRENDER_FRAME_VIEW_NONE;
-	}
-
-	/**
-	 * @param $controller Base_Controller
-	 * @param $xoopsUser XoopsUserObject
-	 */
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		return LEGACYRENDER_FRAME_VIEW_NONE;
-	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		return LEGACYRENDER_FRAME_VIEW_NONE;
-	}
-	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
-	{
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/legacyRender/admin/class/AbstractListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/class/AbstractListAction.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/class/AbstractListAction.class.php:removed
--- xoops2jp/html/modules/legacyRender/admin/class/AbstractListAction.class.php:1.1.2.5	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/class/AbstractListAction.class.php	Mon Jul 10 19:57:57 2006
@@ -1,47 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/PageNavigator.class.php";
-
-class LegacyRender_AbstractListAction extends LegacyRender_Action
-{
-	var $mObjects = array();
-	var $mFilter = null;
-	var $mActionForm = null;
-	var $mPageNavi = null;
-
-	function &_getHandler()
-	{
-	}
-
-	function &_getFilterForm()
-	{
-	}
-
-	function _getBaseUrl()
-	{
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mPageNavi =& new LegacyRender_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
-
-		$this->mFilter =& $this->_getFilterForm();
-		$this->mFilter->fetch();
-	
-		$handler =& $this->_getHandler();
-	
-		$total = $handler->getCount($this->mFilter->getCriteria());
-		
-		$this->mPageNavi->setTotal($total);
-		$this->mPageNavi->fetch();
-		
-		$criteria = $this->mFilter->getCriteria($this->mPageNavi->getStart(), $this->mPageNavi->getPerpage());
-		$this->mObjects =& $handler->getObjects($criteria);
-	
-		return LEGACYRENDER_FRAME_VIEW_INDEX;
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/legacyRender/admin/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/class/AbstractEditAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/class/AbstractEditAction.class.php:removed
--- xoops2jp/html/modules/legacyRender/admin/class/AbstractEditAction.class.php:1.1.2.2	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/class/AbstractEditAction.class.php	Mon Jul 10 19:57:57 2006
@@ -1,85 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-class LegacyRender_AbstractEditAction extends LegacyRender_Action
-{
-	var $mObject = null;
-	var $mObjectHandler = null;
-	var $mActionForm = null;
-
-	function _getId()
-	{
-	}
-	
-	function &_getHandler()
-	{
-	}
-	
-	function _setupObject()	
-	{
-		$id = $this->_getId();
-
-		$this->mObjectHandler = $this->_getHandler();
-		
-		$this->mObject =& $this->mObjectHandler->get($id);
-		if ($this->mObject == null && $this->isEnableCreate()) {
-			$this->mObject =& $this->mObjectHandler->create();
-		}
-	}
-
-	function _setupActionForm()
-	{
-	}
-
-	/**
-	 * @return bool
-	 */	
-	function isEnableCreate()
-	{
-		return true;
-	}
-	
-	function prepare(&$controller, &$xoopsUser)
-	{
-		$this->_setupActionForm();
-		$this->_setupObject();
-	}
-
-	function getDefaultView(&$controller,&$xoopsUser)
-	{
-		if ($this->mObject == null) {
-			return LEGACYRENDER_FRAME_VIEW_ERROR;
-		}
-
-		$this->mActionForm->load($this->mObject);
-
-		return LEGACYRENDER_FRAME_VIEW_INPUT;
-	}
-
-	function execute(&$controller,&$xoopsUser)
-	{
-		if ($this->mObject == null) {
-			return LEGACYRENDER_FRAME_VIEW_ERROR;
-		}
-
-		//
-		// If image is no, the data has to continue to keep his value.
-		//
-		$this->mActionForm->load($this->mObject);
-
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-
-		if($this->mActionForm->hasError()) {
-			return LEGACYRENDER_FRAME_VIEW_INPUT;
-		}
-			
-		$this->mActionForm->update($this->mObject);
-
-		return $this->mObjectHandler->insert($this->mObject) ? LEGACYRENDER_FRAME_VIEW_SUCCESS
-		                                                     : LEGACYRENDER_FRAME_VIEW_ERROR;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:58:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:58:22 +0900
Subject: [xoops-cvslog 3485] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710105822.6386F2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.2	Mon Jul 10 16:23:21 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php	Mon Jul 10 19:58:22 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: BannerDeleteAction.class.php,v 1.1.2.2 2006/07/10 07:23:21 minahito Exp $
+ * @version $Id: BannerDeleteAction.class.php,v 1.1.2.3 2006/07/10 10:58:22 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -13,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+		return xoops_getrequest('bid');
 	}
 
 	function &_getHandler()

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:58:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:58:34 +0900
Subject: [xoops-cvslog 3486] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710105834.5DE172AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.3	Mon Jul 10 16:23:37 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php	Mon Jul 10 19:58:34 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: BannerEditAction.class.php,v 1.1.2.3 2006/07/10 07:23:37 minahito Exp $
+ * @version $Id: BannerEditAction.class.php,v 1.1.2.4 2006/07/10 10:58:34 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -13,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+		return xoops_getrequest('bid');
 	}
 
 	function &_getHandler()

From minahito ＠ users.sourceforge.jp  Mon Jul 10 19:58:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 19:58:55 +0900
Subject: [xoops-cvslog 3487] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710105855.7D6682AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php:1.1.2.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php	Mon Jul 10 19:58:55 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerfinishDeleteAction.class.php,v 1.1.2.2 2006/07/10 10:58:55 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+		return xoops_getrequest('bid');
 	}
 
 	function &_getHandler()
@@ -39,7 +43,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=BannerfinishList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=BannerfinishList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerfinishList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:00:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:00:12 +0900
Subject: [xoops-cvslog 3488] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110012.96C092AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.2	Thu May 18 12:04:51 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php	Mon Jul 10 20:00:12 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileDownloadAction.class.php,v 1.1.2.3 2006/07/10 11:00:12 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -45,7 +49,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:00:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:00:49 +0900
Subject: [xoops-cvslog 3489] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110049.1EEAC2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.11 xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.12
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.11	Sat May 27 22:10:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php	Mon Jul 10 20:00:48 2006
@@ -1,19 +1,27 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileListAction.class.php,v 1.1.2.12 2006/07/10 11:00:48 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileFilterForm.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileSetFilterForm.class.php";
-
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileUploadForm.class.php";
 
 class LegacyRender_TplfileListAction extends LegacyRender_AbstractListAction
 {
+	/**
+	 * A instance of action form for uploading.
+	 * @var LegacyRender_TplfileUploadForm
+	 */
 	var $mActionForm = null;
 	
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
+		LegacyRender_AbstractListAction::prepare($controller, $xoopsUser, $moduleConfig);
 		$this->mActionForm =& new LegacyRender_TplfileUploadForm();
 		$this->mActionForm->prepare();
 	}
@@ -26,7 +34,7 @@
 
 	function &_getFilterForm()
 	{
-		$filter = isset($_REQUEST['tpl_tplset']) ? new LegacyRender_TplfileSetFilterForm($this->mPageNavi) : new LegacyRender_TplfileFilterForm($this->mPageNavi);
+		$filter = isset($_REQUEST['tpl_tplset']) ? new LegacyRender_TplfileSetFilterForm($this->mNavi) : new LegacyRender_TplfileFilterForm($this->mNavi);
 		return $filter;
 	}
 	
@@ -37,7 +45,7 @@
 
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$this->mPageNavi =& new LegacyRender_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
+		$this->mNavi =& new LegacyRender_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
 
 		$this->mFilter =& $this->_getFilterForm();
 		$this->mFilter->fetch();
@@ -46,10 +54,10 @@
 	
 		$total = $handler->getCount($this->mFilter->getCriteria());
 		
-		$this->mPageNavi->setTotal($total);
-		$this->mPageNavi->fetch();
+		$this->mNavi->setTotal($total);
+		$this->mNavi->fetch();
 		
-		$criteria = $this->mFilter->getCriteria($this->mPageNavi->getStart(), $this->mPageNavi->getPerpage());
+		$criteria = $this->mFilter->getCriteria($this->mNavi->getStart(), $this->mNavi->getPerpage());
 		
 		if (isset($_REQUEST['tpl_tplset'])) {
 			$this->mObjects =& $handler->getObjectsWithOverride($criteria, xoops_getrequest('tpl_tplset'));
@@ -61,6 +69,9 @@
 		return LEGACYRENDER_FRAME_VIEW_INDEX;
 	}
 
+	/**
+	 * This member function processes the uploaded file.
+	 */
 	function execute(&$controller, &$xoopsUser)
 	{
 		require_once XOOPS_ROOT_PATH . "/class/template.php";
@@ -124,7 +135,11 @@
 		
 		$errorMessage = $successFlag ? _AD_LEGACYRENDER_MESSAGE_UPLOAD_TEMPLATE_SUCCESS : _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED;
 		
-		XCube_Utils::redirectHeader("index.php?action=TplfileList&amp;tpl_tplset=${last_tplset}&amp;tpl_module=${last_module}",	1, $errorMessage);
+		//
+		// No good exmaple ;)
+		// Because some local variables are used, jump directly without the return value of view status.
+		//
+		$controller->executeRedirect("index.php?action=TplfileList&tpl_tplset=${last_tplset}&tpl_module=${last_module}", 1, $errorMessage);
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
@@ -141,7 +156,7 @@
 		}
 		
 		$render->setAttribute('objects', $this->mObjects);
-		$render->setAttribute('pageNavi', $this->mPageNavi);
+		$render->setAttribute('pageNavi', $this->mNavi);
 		$render->setAttribute('filterForm', $this->mFilter);
 		$render->setAttribute('actionForm', $this->mActionForm);
 		

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:01:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:01:07 +0900
Subject: [xoops-cvslog 3490] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110107.74FBD2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileViewAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileViewAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/TplfileViewAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileViewAction.class.php:1.1.2.2	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileViewAction.class.php	Mon Jul 10 20:01:07 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileViewAction.class.php,v 1.1.2.3 2006/07/10 11:01:07 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -8,7 +12,7 @@
 	
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$id = isset($_REQUEST['tpl_id']) ? intval($_REQUEST['tpl_id']) : 0;
+		$id = xoops_getrequest('tpl_id');
 		
 		$handler =& xoops_getmodulehandler('tplfile');
 		$this->mObject =& $handler->get($id);
@@ -30,7 +34,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:01:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:01:21 +0900
Subject: [xoops-cvslog 3491] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110121.D2E332AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.4	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php	Mon Jul 10 20:01:21 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetCloneAction.class.php,v 1.1.2.5 2006/07/10 11:01:21 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -17,7 +21,7 @@
 	
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new TplsetCloneForm();
+		$this->mActionForm =& new LegacyRender_TplsetCloneForm();
 		$this->mActionForm->prepare();
 	}
 
@@ -31,6 +35,11 @@
 		if ($this->mObject == null) {
 			return LEGACYRENDER_FRAME_VIEW_ERROR;
 		}
+
+		if (xoops_getrequest('_form_control_cancel') != null) {
+			return LEGACYRENDER_FRAME_VIEW_CANCEL;
+		}
+
 		//
 		// If image is no, the data has to continue to keep his value.
 		//
@@ -48,7 +57,7 @@
 		return $this->mObjectHandler->insertClone($this->mObject, $this->mCloneObject) ? LEGACYRENDER_FRAME_VIEW_SUCCESS
 		                                                     : LEGACYRENDER_FRAME_VIEW_ERROR;
 	}
-
+	
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("tplset_clone.html");
@@ -63,7 +72,13 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		die("HOGE");
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:01:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:01:34 +0900
Subject: [xoops-cvslog 3492] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110134.B65032AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetEditAction.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/actions/TplsetEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetEditAction.class.php:1.1.2.4	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetEditAction.class.php	Mon Jul 10 20:01:34 2006
@@ -1,20 +1,24 @@
 <?php
+/**
+ * @version legacyRender
+ * @version $Id: TplsetEditAction.class.php,v 1.1.2.5 2006/07/10 11:01:34 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetEditForm.class.php";
 
 class LegacyRender_TplsetEditAction extends LegacyRender_AbstractEditAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['tplset_id']) ? intval($_REQUEST['tplset_id']) : 0;
+		return xoops_getrequest('tplset_id');
 	}
 
 	function &_getHandler()
 	{
-		$handler = xoops_getmodulehandler('tplset');
+		$handler =& xoops_getmodulehandler('tplset');
 		return $handler;
 	}
 
@@ -31,7 +35,7 @@
 	
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new TplsetEditForm();
+		$this->mActionForm =& new LegacyRender_TplsetEditForm();
 		$this->mActionForm->prepare();
 	}
 
@@ -54,13 +58,17 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		header("location: ./index.php?action=TplsetList");
-		exit();
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:02:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:02:25 +0900
Subject: [xoops-cvslog 3493] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060710110225.752D92AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.4	Mon Jul 10 15:08:41 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Mon Jul 10 20:02:25 2006
@@ -64,7 +64,12 @@
 			die();
 		}
 		
-		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser())) {
+		$handler =& xoops_gethandler('config');
+		$moduleConfig =& $handler->getConfigsByDirname('legacyRender');
+	
+		$this->mAction->prepare($controller, $controller->getXoopsUser(), $moduleConfig);
+
+		if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser())) {
 			if ($this->mAdminFlag) {
 				$controller->executeForward(XOOPS_URL . "/admin.php");
 			}
@@ -73,8 +78,6 @@
 			}
 		}
 	
-		$this->mAction->prepare($controller, $controller->getXoopsUser());
-	
 		if (xoops_getenv("REQUEST_METHOD") == "POST") {
 			$viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
 		}
@@ -122,12 +125,12 @@
 		$this->_mAdminFlag = $adminFlag;
 	}
 
-	function hasPerm(&$controller, &$xoopsUser)
+	function hasPermission(&$controller, &$xoopsUser)
 	{
 		return true;
 	}
 	
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 	}
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:02:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:02:55 +0900
Subject: [xoops-cvslog 3494] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110255.E8EB92AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.6 xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.6	Mon Jul 10 16:25:23 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html	Mon Jul 10 20:02:55 2006
@@ -56,8 +56,8 @@
       <td><{$obj->get('date')|xoops_formattimestamp}></td>
       <td><{if $obj->getShow('htmlbanner') == 1}><{$smarty.const._YES}><{else}><{$smarty.const._NO}><{/if}></td>
       <td>
-        <a href="./index.php?action=BannerEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <a href="./index.php?action=BannerDelete&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=BannerEdit&amp;bid=<{$obj->getShow('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=BannerDelete&amp;bid=<{$obj->getShow('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
   <{/foreach}>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:03:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:03:17 +0900
Subject: [xoops-cvslog 3495] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110317.7D62D2AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.5	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html	Mon Jul 10 20:03:17 2006
@@ -18,19 +18,19 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_BID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('bid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getVar('name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getShow('name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('impressions')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('impressions')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clicks')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('clicks')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}></td>
@@ -42,8 +42,8 @@
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:03:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:03:25 +0900
Subject: [xoops-cvslog 3496] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110325.047262AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.5	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html	Mon Jul 10 20:03:24 2006
@@ -6,7 +6,7 @@
 
 <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>
 <{if $currentClient}>
-  ( <{$currentClient->getVar('name')}> )
+  ( <{$currentClient->getShow('name')}> )
 <{/if}>
 </h3>
 
@@ -39,14 +39,14 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mClient->getVar('name')}></td>
-      <td><{$obj->getVar('impressions')}></td>
-      <td><{$obj->getVar('clicks')}></td>
+      <td><{$obj->getShow('bid')}></td>
+      <td><{$obj->mClient->getShow('name')}></td>
+      <td><{$obj->getShow('impressions')}></td>
+      <td><{$obj->getShow('clicks')}></td>
       <td><{$obj->get('datestart')|xoops_formattimestamp}></td>
       <td><{$obj->get('dateend')|xoops_formattimestamp}></td>
       <td>
-        <a href="./index.php?action=BannerfinishDelete&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=BannerfinishDelete&amp;bid=<{$obj->getShow('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
   <{/foreach}>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:04:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:04:00 +0900
Subject: [xoops-cvslog 3497] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110400.306712AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html:1.1.2.4	Thu Feb  2 22:59:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_view.html	Mon Jul 10 20:04:00 2006
@@ -25,19 +25,19 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_tplset')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_tplset')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_module')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_module')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_file')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_file')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_desc')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_desc')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}></td>
@@ -55,7 +55,7 @@
         &raquo;&raquo;
         <{$smarty.const._AD_LEGACYRENDER_LANG_MORE_LARGE}>
       </div>
-      <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;"><{$object->Source->get('tpl_source')|escape}></textarea>
+      <textarea name=tpl_source id=tpl_source style="width:600px;height:400px;" readonly="readonly"><{$object->Source->get('tpl_source')|escape}></textarea>
     </td>
   </tr>
     <tr>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:04:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:04:22 +0900
Subject: [xoops-cvslog 3498] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110422.4F5B02AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.10
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html:1.1.2.9	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_clone.html	Mon Jul 10 20:04:22 2006
@@ -26,26 +26,26 @@
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}></td>
       <td class="<{cycle values="odd,even"}>">
-        <b><{$object->getVar('tplset_name')}></b> &raquo; &raquo; 
+        <b><{$object->getShow('tplset_name')}></b> &raquo; &raquo; 
        <{xoops_input type=text name=tplset_name value=$actionForm->get('tplset_name') size=30 maxlength=50}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=tplset_desc value=$object->getVar('tplset_desc') size=50 maxlength=255}>
+        <{xoops_input type=text name=tplset_desc value=$object->get('tplset_desc') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$object->getVar('tplset_credits')}>
+        <{xoops_textarea name=tplset_credits rows=5 cols=50 value=$actionForm->get('tplset_credits')}>
       </td>
     </tr>
     <tr>
       <td colspan="2" class="foot">
         <input class="formButton" type="submit" value="<{$smarty.const._CLONE}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:04:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:04:49 +0900
Subject: [xoops-cvslog 3499] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110449.D9E072AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.8
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html:1.1.2.7	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_delete.html	Mon Jul 10 20:04:49 2006
@@ -6,7 +6,7 @@
 
 <h3><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE}></h3>
 
-<div class="confirm"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF|replace:"%s":$object->getVar('tplset_name')}></div>
+<div class="confirm"><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE_SET_DELETE_CONF|replace:"%s":$object->getShow('tplset_name')}></div>
 
 <form action="index.php?action=TplsetDelete" method="post">
 <{xoops_token form=$actionForm}>
@@ -17,15 +17,15 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_ID}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('tplset_id')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('tplset_id')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tplset_name')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tplset_name')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('tplset_desc')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('tplset_desc')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
@@ -33,12 +33,12 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREATED}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('tplset_created')|xoops_formattimestamp:l}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->get('tplset_created')|xoops_formattimestamp:l}></td>
   </tr>
   <tr>
     <td class="foot" colspan="2">
-      <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+      <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+      <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
     </td>
   </tr>
 </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:05:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:05:00 +0900
Subject: [xoops-cvslog 3500] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110500.9D18E2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.10
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html:1.1.2.9	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_edit.html	Mon Jul 10 20:05:00 2006
@@ -25,7 +25,7 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tplset_name')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tplset_name')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}></td>
@@ -36,13 +36,13 @@
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_textarea type=text name=tplset_credits rows=5 cols=50 value=$actionForm->get('tplset_credits')}>
+        <{xoops_textarea name=tplset_credits rows=5 cols=50 value=$actionForm->get('tplset_credits')}>
       </td>
     </tr>
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._EDIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:05:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:05:08 +0900
Subject: [xoops-cvslog 3501] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110509.0C0B62AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.17 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.18
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.17	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html	Mon Jul 10 20:05:08 2006
@@ -56,25 +56,25 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
-    <{if $activeTemplateSet == $obj->getVar('tplset_name')}>
+    <{if $activeTemplateSet == $obj->get('tplset_name')}>
       <tr class="head" style="background-color:pink;">
     <{else}>
       <tr class="<{cycle values='odd,even'}>">
     <{/if}>
-      <td style="text-align:center;"><{$obj->getVar('tplset_id')}></td>
-      <td><b><{$obj->getVar('tplset_name')}></b><br /><br />
-        <{$obj->getVar('tplset_desc')}></td>
+      <td style="text-align:center;"><{$obj->getShow('tplset_id')}></td>
+      <td><b><{$obj->getShow('tplset_name')}></b><br /><br />
+        <{$obj->getShow('tplset_desc')}></td>
       <td><{$obj->get('tplset_credits')|escape|nl2br}></td>
-      <td style="text-align:center;"><{$obj->getVar('tplset_created')|xoops_formattimestamp:l}></td>
+      <td style="text-align:center;"><{$obj->get('tplset_created')|xoops_formattimestamp:l}></td>
       <td>
         <ul>
         <{foreach item=moduletpl from=$obj->mModuleTemplates}>
-          <li><a href="./index.php?action=TplfileList&amp;tpl_tplset=<{$obj->get('tplset_name')|escape}>&amp;tpl_module=<{$moduletpl->get('dirname')|escape}>"><{$moduletpl->getVar('name')}></a> (<{$moduletpl->getVar('count')}>)</li>
+          <li><a href="./index.php?action=TplfileList&amp;tpl_tplset=<{$obj->get('tplset_name')|escape}>&amp;tpl_module=<{$moduletpl->get('dirname')|escape}>"><{$moduletpl->getShow('name')}></a> (<{$moduletpl->getShow('count')}>)</li>
         <{/foreach}>
         </ul>
       </td>
       <td style="text-align:center;">
-        <{if $activeTemplateSet == $obj->getVar('tplset_name')}>
+        <{if $activeTemplateSet == $obj->get('tplset_name')}>
           <img src="<{"icons/active.gif"|theme}>" alt="*active*" title="*active*" /><br /><br />
         <{else}>
           <form action="./index.php?action=TplsetList" method="POST">
@@ -87,9 +87,9 @@
         <a href="index.php?action=TplsetDownload&amp;tplset_id=<{$obj->get('tplset_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /></a>
         <a href="index.php?action=TplsetClone&amp;tplset_id=<{$obj->get('tplset_id')}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /></a>
         <br />
-        <{if $obj->getVar('tplset_name') != "default"}>
+        <{if $obj->get('tplset_name') != "default"}>
           <a href="index.php?action=TplsetEdit&amp;tplset_id=<{$obj->get('tplset_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-          <{if $activeTemplateSet != $obj->getVar('tplset_name')}>
+          <{if $activeTemplateSet != $obj->get('tplset_name')}>
             <a href="index.php?action=TplsetDelete&amp;tplset_id=<{$obj->get('tplset_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
           <{/if}>
         <{/if}>
@@ -115,23 +115,23 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$recentObjects}>
-    <{if $obj->getVar('tpl_type') == "block"}>
+    <{if $obj->get('tpl_type') == "block"}>
       <tr class="<{cycle values='odd,even'}>" style="color:#0000ff;">
     <{else}>
       <tr class="<{cycle values='odd,even'}>">
     <{/if}>
-      <td><{$obj->getVar('tpl_id')}></td>
-      <td><{$obj->getVar('tpl_module')}></td>
-      <td><{$obj->getVar('tpl_tplset')}></td>
+      <td><{$obj->getShow('tpl_id')}></td>
+      <td><{$obj->getShow('tpl_module')}></td>
+      <td><{$obj->getShow('tpl_tplset')}></td>
       <td>
-        <b><{$obj->getVar('tpl_file')}></b><br />
-        <{$obj->getVar('tpl_desc')}>
+        <b><{$obj->getShow('tpl_file')}></b><br />
+        <{$obj->getShow('tpl_desc')}>
       </td>
-      <td><{$obj->getVar('tpl_lastmodified')|xoops_formattimestamp:l}></td>
-      <td><{$obj->getVar('tpl_lastimported')|xoops_formattimestamp:l}></td>
-      <td><{$obj->getVar('tpl_type')}></td>
+      <td><{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}></td>
+      <td><{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getShow('tpl_type')}></td>
       <td style="text-align:center;">
-        <{if $obj->getVar('tpl_tplset') == "default"}>
+        <{if $obj->get('tpl_tplset') == "default"}>
           <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->get('tpl_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
         <{else}>
           <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->get('tpl_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
@@ -145,3 +145,5 @@
     </td>
   </tr>
 </table>
+
+<div class="pagenavi"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:06:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:06:04 +0900
Subject: [xoops-cvslog 3502] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110604.1B9652AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php:1.1.2.2	Mon Apr 24 19:58:21 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php	Mon Jul 10 20:06:03 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientListAction.class.php,v 1.1.2.3 2006/07/10 11:06:03 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:09:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:09:40 +0900
Subject: [xoops-cvslog 3503] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060710110940.0F7B42AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.3	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html	Mon Jul 10 20:09:39 2006
@@ -11,35 +11,35 @@
 <table class="outer" cellspacing="1">
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_ID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_id')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_id')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_REFID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_refid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_refid')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_module')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_module')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_tplset')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_tplset')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_file')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_file')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_desc')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_desc')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTMODIFIED}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_lastmodified')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('tpl_lastmodified')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTIMPORTED}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_lastimported')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_lastimported')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TYPE}></th>
@@ -50,8 +50,8 @@
         <form action="./index.php?action=TplfileDelete" method="POST">
           <{xoops_token form=$actionForm}>
           <{xoops_input type=hidden name=tpl_id value=$actionForm->get('tpl_id')}>
-          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+          <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+          <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
         </form>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:09:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:09:53 +0900
Subject: [xoops-cvslog 3504] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710110953.2278D2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileDeleteAction.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/actions/TplfileDeleteAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileDeleteAction.class.php:1.1.2.4	Sat May 27 22:10:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileDeleteAction.class.php	Mon Jul 10 20:09:53 2006
@@ -9,7 +9,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['tpl_id']) ? intval($_REQUEST['tpl_id']) : 0;
+		return xoops_getrequest('tpl_id');
 	}
 
 	function &_getHandler()
@@ -36,7 +36,7 @@
 	{
 		$render->setTemplateName("tplfile_delete.html");
 		$render->setAttribute('actionForm', $this->mActionForm);
-		#cubson::lazy_load('tplfile', $this->mObject);
+		$this->mObject->loadSource();
 		$render->setAttribute('object', $this->mObject);
 	}
 
@@ -55,7 +55,14 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplfileList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplfileList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$tplset = $this->mObject->get('tpl_tplset');
+		$module = $this->mObject->get('tpl_module');
+		$controller->executeForward("./index.php?action=TplfileList&tpl_tplset=${tplset}&tpl_module=${module}");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:10:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:10:19 +0900
Subject: [xoops-cvslog 3505] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060710111019.E32BB2AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.8
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.7	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php	Mon Jul 10 20:10:19 2006
@@ -3,7 +3,7 @@
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH . "/class/XCube_PageNavigator.class.php";
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetFilterForm.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetSelectForm.class.php";
 
@@ -12,9 +12,10 @@
 	var $mActionForm = null;
 	var $mActiveTemplateSet = null;
 	
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mActionForm = new TplsetSelectForm();
+		LegacyRender_AbstractListAction::prepare($controller, $xoopsUser, $moduleConfig);
+		$this->mActionForm =& new TplsetSelectForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -24,9 +25,9 @@
 		return $handler;
 	}
 
-	function &_getFilterForm()
+	function &_getFilterForm(&$navi)
 	{
-		$filter =& new LegacyRender_TplsetFilterForm($this->mPageNavi);
+		$filter =& new LegacyRender_TplsetFilterForm($navi);
 		return $filter;
 	}
 	
@@ -72,7 +73,7 @@
 
 		$render->setTemplateName("tplset_list.html");
 		$render->setAttribute('objects', $this->mObjects);
-		$render->setAttribute('pageNavi', $this->mPageNavi);
+		$render->setAttribute('pageNavi', $this->mNavi);
 		$render->setAttribute('activeTemplateSet', $this->mActiveTemplateSet);
 		$render->setAttribute('actionForm', $this->mActionForm);
 		

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:10:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:10:37 +0900
Subject: [xoops-cvslog 3506] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111037.7C3EB2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.3	Mon Jul 10 16:24:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php	Mon Jul 10 20:10:37 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerclientFilterForm.class.php,v 1.1.2.4 2006/07/10 11:10:37 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -17,7 +21,6 @@
 
 class LegacyRender_BannerclientFilterForm extends LegacyRender_AbstractFilterForm
 {
-	var $mSort = 0;
 	var $mSortKeys = array(
 		BANNERCLIENT_SORT_KEY_CID => 'cid',
 		BANNERCLIENT_SORT_KEY_NAME => 'name',
@@ -27,7 +30,6 @@
 		BANNERCLIENT_SORT_KEY_PASSWD => 'passwd',
 		BANNERCLIENT_SORT_KEY_EXTRAINFO => 'extrainfo'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:10:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:10:48 +0900
Subject: [xoops-cvslog 3507] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111048.332412AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.4	Mon Jul 10 16:24:55 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php	Mon Jul 10 20:10:48 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: BannerFilterForm.class.php,v 1.1.2.4 2006/07/10 07:24:55 minahito Exp $
+ * @version $Id: BannerFilterForm.class.php,v 1.1.2.5 2006/07/10 11:10:48 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -24,7 +24,6 @@
 
 class LegacyRender_BannerFilterForm extends LegacyRender_AbstractFilterForm
 {
-	var $mSort = 0;
 	var $mSortKeys = array(
 		BANNER_SORT_KEY_BID => 'bid',
 		BANNER_SORT_KEY_CID => 'cid',
@@ -37,7 +36,6 @@
 		BANNER_SORT_KEY_HTMLBANNER => 'htmlbanner',
 		BANNER_SORT_KEY_HTMLCODE => 'htmlcode'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:11:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:11:03 +0900
Subject: [xoops-cvslog 3508] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111103.526E52AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php:1.1.2.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php	Mon Jul 10 20:11:03 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerfinishAdminDeleteForm.class.php,v 1.1.2.2 2006/07/10 11:11:03 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.BannerfinishAdminDeleteForm.TOKEN";
+		return "module.legacyRender.BannerfinishAdminDeleteForm.TOKEN" . $this->get('bid');
 	}
 
 	function prepare()
@@ -22,7 +26,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['bid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_BID);

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:11:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:11:30 +0900
Subject: [xoops-cvslog 3509] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111130.1879A2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php:1.1.2.2	Tue Apr 25 14:24:16 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php	Mon Jul 10 20:11:29 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: BannerfinishFilterForm.class.php,v 1.1.2.3 2006/07/10 11:11:29 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -16,8 +20,7 @@
 
 class LegacyRender_BannerfinishFilterForm extends LegacyRender_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		BANNERFINISH_SORT_KEY_BID => 'bid',
 		BANNERFINISH_SORT_KEY_CID => 'cid',
 		BANNERFINISH_SORT_KEY_IMPRESSIONS => 'impressions',
@@ -25,19 +28,18 @@
 		BANNERFINISH_SORT_KEY_DATESTART => 'datestart',
 		BANNERFINISH_SORT_KEY_DATEEND => 'dateend'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNERFINISH_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > BANNERFINISH_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = BANNERFINISH_SORT_KEY_DEFAULT;
 		}
 	
 		if (isset($_REQUEST['cid'])) {
 			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
-			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
+			$this->_mCriteria->add(new Criteria('cid', xoops_getrequest('cid')));
 		}
 		
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:11:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:11:41 +0900
Subject: [xoops-cvslog 3510] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111141.C984E2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetCloneForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetCloneForm.class.php:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/forms/TplsetCloneForm.class.php:1.1.2.8
--- xoops2jp/html/modules/legacyRender/admin/forms/TplsetCloneForm.class.php:1.1.2.7	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetCloneForm.class.php	Mon Jul 10 20:11:41 2006
@@ -1,17 +1,22 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetCloneForm.class.php,v 1.1.2.8 2006/07/10 11:11:41 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
 
 /**
  * This class is generated by makeActionForm tool.
  */
-class TplsetCloneForm extends TplsetEditForm
+class LegacyRender_TplsetCloneForm extends LegacyRender_TplsetEditForm
 {
 	function getTokenName()
 	{
-		return "module.legacyRender.TplsetCloneForm.TOKEN";
+		return "module.legacyRender.TplsetCloneForm.TOKEN" . $this->get('tplset_id');
 	}
 
 	function prepare()
@@ -55,14 +60,14 @@
 	function load(&$obj)
 	{
 		parent::load($obj);
-		$this->setVar('tplset_name', $obj->get('tplset_name'));
+		$this->set('tplset_name', $obj->get('tplset_name'));
 	}
 
 	function update(&$obj)
 	{
 		parent::update($obj);
-		$obj->setVar('tplset_name', $this->get('tplset_name'));
-		$obj->setVar('tplset_id', 0);
+		$obj->set('tplset_name', $this->get('tplset_name'));
+		$obj->set('tplset_id', 0);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:11:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:11:54 +0900
Subject: [xoops-cvslog 3511] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111154.929CE2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetEditForm.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/forms/TplsetEditForm.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/forms/TplsetEditForm.class.php:1.1.2.4	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetEditForm.class.php	Mon Jul 10 20:11:54 2006
@@ -1,14 +1,24 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetEditForm.class.php,v 1.1.2.5 2006/07/10 11:11:54 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
 
 /**
  * This class is generated by makeActionForm tool.
  */
-class TplsetEditForm extends XCube_ActionForm
+class LegacyRender_TplsetEditForm extends XCube_ActionForm
 {
+	function getTokenName()
+	{
+		return "module.legacyRender.TplsetEditForm.TOKEN" . $this->get('tplset_id');
+	}
+
 	function prepare()
 	{
 		//
@@ -30,23 +40,19 @@
 		$this->mFieldProperties['tplset_desc']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_TPLSET_DESC, '255');
 		$this->mFieldProperties['tplset_desc']->addVar('maxlength', 255);
 	}
-	function getTokenName()
-	{
-		return "module.legacyRender.TplsetEditForm.TOKEN";
-	}
 
 	function load(&$obj)
 	{
-		$this->setVar('tplset_id', $obj->get('tplset_id'));
-		$this->setVar('tplset_desc', $obj->get('tplset_desc'));
-		$this->setVar('tplset_credits', $obj->get('tplset_credits'));
+		$this->set('tplset_id', $obj->get('tplset_id'));
+		$this->set('tplset_desc', $obj->get('tplset_desc'));
+		$this->set('tplset_credits', $obj->get('tplset_credits'));
 	}
 
 	function update(&$obj)
 	{
-		$obj->setVar('tplset_id', $this->get('tplset_id'));
-		$obj->setVar('tplset_desc', $this->get('tplset_desc'));
-		$obj->setVar('tplset_credits', $this->get('tplset_credits'));
+		$obj->set('tplset_id', $this->get('tplset_id'));
+		$obj->set('tplset_desc', $this->get('tplset_desc'));
+		$obj->set('tplset_credits', $this->get('tplset_credits'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 10 20:12:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Jul 2006 20:12:12 +0900
Subject: [xoops-cvslog 3512] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060710111212.09A742AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php:1.1.2.5	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetFilterForm.class.php	Mon Jul 10 20:12:11 2006
@@ -2,66 +2,37 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-define('TPLSET_SORT_KEY_DEFAULT', 0);
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
+
 define('TPLSET_SORT_KEY_TPLSET_ID', 1);
-define('TPLSET_SORT_KEY_NAME', 2);
-define('TPLSET_SORT_KEY_DESC', 3);
-define('TPLSET_SORT_KEY_LOCK', 4);
-define('TPLSET_SORT_KEY_MAXVALUE', 4);
+define('TPLSET_SORT_KEY_TPLSET_NAME', 2);
+define('TPLSET_SORT_KEY_TPLSET_DESC', 3);
+define('TPLSET_SORT_KEY_TPLSET_CREDITS', 4);
+define('TPLSET_SORT_KEY_TPLSET_CREATED', 5);
+
+define('TPLSET_SORT_KEY_DEFAULT', TPLSET_SORT_KEY_TPLSET_ID);
+define('TPLSET_SORT_KEY_MAXVALUE', 5);
 
-class LegacyRender_TplsetFilterForm
+class LegacyRender_TplsetFilterForm extends LegacyRender_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		TPLSET_SORT_KEY_DEFAULT => 'tplset_id',
 		TPLSET_SORT_KEY_TPLSET_ID => 'tplset_id',
-		TPLSET_SORT_KEY_NAME => 'name',
-		TPLSET_SORT_KEY_DESC => 'desc',
-		TPLSET_SORT_KEY_LOCK => 'lock'
+		TPLSET_SORT_KEY_TPLSET_NAME => 'tplset_name',
+		TPLSET_SORT_KEY_TPLSET_DESC => 'tplset_desc',
+		TPLSET_SORT_KEY_TPLSET_CREDITS => 'tplset_credits',
+		TPLSET_SORT_KEY_TPLSET_CREATED => 'tplset_created'
 	);
-	var $_mCriteria = null;
-	
-	var $_mNavi = null;
-
-	function LegacyRender_TplsetFilterForm(&$navi)
-	{
-		$this->_mNavi =& $navi;
-		$this->_mCriteria =& new CriteriaCompo();
-	}
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
 	
-		if (abs($this->mSort) > TPLSET_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSort[abs($this->mSort)])) {
 			$this->mSort = TPLSET_SORT_KEY_DEFAULT;
 		}
-
-		$this->_mNavi->addExtra('sort', $this->mSort);
-	}
-
-	function getSort()
-	{
-		$sortkey = abs($this->mSort);
-		return $this->_mSortKeys[$sortkey];
-	}
-
-	function getOrder()
-	{
-		return ($this->mSort < 0) ? "DESC" : "ASC";
-	}
-
-	function getCriteria($start = 0, $limit = 0)
-	{
-		$criteria = $this->_mCriteria;
-	
-		$criteria->setStart($start);
-		$criteria->setLimit($limit);
-	
-		$criteria->setSort($this->getSort());
-		$criteria->setOrder($this->getOrder());
 	
-		return $criteria;
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 10:33:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 10:33:36 +0900
Subject: [xoops-cvslog 3513] CVS update: xoops2jp/html
Message-ID: <20060711013336.A728F2AC042@users.sourceforge.jp>

Index: xoops2jp/html/readpmsg.php
diff -u xoops2jp/html/readpmsg.php:1.2.8.1 xoops2jp/html/readpmsg.php:1.2.8.2
--- xoops2jp/html/readpmsg.php:1.2.8.1	Tue Nov  8 18:49:34 2005
+++ xoops2jp/html/readpmsg.php	Tue Jul 11 10:33:36 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: readpmsg.php,v 1.2.8.1 2005/11/08 09:49:34 minahito Exp $
+// $Id: readpmsg.php,v 1.2.8.2 2006/07/11 01:33:36 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -27,8 +27,6 @@
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Readpmsg.Access",$root->mController,$eventArgs);
+XCube_DelegateUtils::call("Legacypage.Readpmsg.Access");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul 11 10:33:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 10:33:49 +0900
Subject: [xoops-cvslog 3514] CVS update: xoops2jp/html
Message-ID: <20060711013349.488172AC042@users.sourceforge.jp>

Index: xoops2jp/html/pmlite.php
diff -u xoops2jp/html/pmlite.php:1.2.8.3 xoops2jp/html/pmlite.php:1.2.8.4
--- xoops2jp/html/pmlite.php:1.2.8.3	Mon Dec 26 21:16:27 2005
+++ xoops2jp/html/pmlite.php	Tue Jul 11 10:33:49 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: pmlite.php,v 1.2.8.3 2005/12/26 12:16:27 minahito Exp $
+// $Id: pmlite.php,v 1.2.8.4 2006/07/11 01:33:49 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -31,8 +31,6 @@
 // This is old page controller in Xoops 2.0.x
 // Raise event "Legacypage.Pmlite.Access"
 //
-$root=&XCube_Root::getSingleton();
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Pmlite.Access", $root->mController, $eventArgs);
+XCube_DelegateUtils::call("Legacypage.Pmlite.Access");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul 11 10:33:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 10:33:59 +0900
Subject: [xoops-cvslog 3515] CVS update: xoops2jp/html
Message-ID: <20060711013359.AE4B02AC042@users.sourceforge.jp>

Index: xoops2jp/html/viewpmsg.php
diff -u xoops2jp/html/viewpmsg.php:1.2.8.2 xoops2jp/html/viewpmsg.php:1.2.8.3
--- xoops2jp/html/viewpmsg.php:1.2.8.2	Tue Nov  8 18:49:48 2005
+++ xoops2jp/html/viewpmsg.php	Tue Jul 11 10:33:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: viewpmsg.php,v 1.2.8.2 2005/11/08 09:49:48 minahito Exp $
+// $Id: viewpmsg.php,v 1.2.8.3 2006/07/11 01:33:59 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -27,8 +27,6 @@
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Viewpmsg.Access",$root->mController,$eventArgs);
+XCube_DelegateUtils::call("Legacypage.Viewpmsg.Access");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul 11 11:41:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 11:41:14 +0900
Subject: [xoops-cvslog 3516] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711024114.A90B32AC044@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php:1.1.2.5	Mon Jul 10 20:01:21 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetCloneAction.class.php	Tue Jul 11 11:41:14 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: TplsetCloneAction.class.php,v 1.1.2.5 2006/07/10 11:01:21 minahito Exp $
+ * @version $Id: TplsetCloneAction.class.php,v 1.1.2.6 2006/07/11 02:41:14 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -77,7 +77,6 @@
 
 	function executeViewCancel(&$controller, &$xoopsUser, &$render)
 	{
-		die("HOGE");
 		$controller->executeForward("./index.php?action=TplsetList");
 	}
 }

From minahito ＠ users.sourceforge.jp  Tue Jul 11 11:58:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 11:58:47 +0900
Subject: [xoops-cvslog 3517] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20060711025847.87DDB2AC053@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.17 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.18
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.17	Tue Jun 27 18:12:50 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Tue Jul 11 11:58:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.17 2006/06/27 09:12:50 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.18 2006/07/11 02:58:47 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -91,7 +91,7 @@
 		
 		if (is_object($legacyRender)) {
 			$configHandler =& xoops_gethandler('config');
-			$configs =& $configHandler->getConfigsByCat(0, $legacyRender->getVar('mid'));
+			$configs =& $configHandler->getConfigsByCat(0, $legacyRender->get('mid'));
 			
 			foreach ($configs as $name => $value) {
 				// prefix each tag with 'xoops_'
@@ -106,8 +106,8 @@
 		if (is_object($this->mController->mXoopsUser)) {
 			$arr = array(
 				'xoops_isuser' => true,
-				'xoops_userid' => $this->mController->mXoopsUser->getVar('uid'),
-				'xoops_uname' => $this->mController->mXoopsUser->getVar('uname'),
+				'xoops_userid' => $this->mController->mXoopsUser->getShow('uid'),
+				'xoops_uname' => $this->mController->mXoopsUser->getShow('uname'),
 				'xoops_isadmin' => $this->mController->mXoopsUser->isAdmin());
 		}
 		else {
@@ -239,10 +239,10 @@
 		//
 		if($this->mController->mModuleController->isModuleProcess()) {	// The process of module
 			$xoopsModule=&$this->mController->mModuleController->mModuleObject;
-			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getVar('name'),
-			                               'xoops_dirname' => $xoopsModule->getVar('dirname')));
+			$this->mXoopsTpl->assign(array('xoops_modulename' => $xoopsModule->getShow('name'),
+			                               'xoops_dirname' => $xoopsModule->getShow('dirname')));
 			if (!$this->mXoopsTpl->get_template_vars('xoops_pagetitle')) {
-				$this->mXoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getVar('name')));
+				$this->mXoopsTpl->assign(array('xoops_pagetitle' => $xoopsModule->getShow('name')));
 			}
 		}
 		else {

From minahito ＠ users.sourceforge.jp  Tue Jul 11 11:59:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 11:59:03 +0900
Subject: [xoops-cvslog 3518] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711025903.6E8D32AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.15 xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.16
--- xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.15	Wed Jun 14 21:45:25 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html	Tue Jul 11 11:59:03 2006
@@ -36,7 +36,7 @@
           <img src="<{$smarty.const.XOOPS_THEME_URL}>/<{$theme->get('name')}>/<{$theme->mPackage.Theme.ScreenShot}>" alt="<{$theme->get('name')}>" title="<{$theme->get('name')}>" width="120" height="90" /><br/>
         <{/if}>
         <!--- Sorry, please modify the following line --->
-        <b><{$theme->getVar('name')}></b>
+        <b><{$theme->getShow('name')}></b>
       </td>
       <td style="text-align:left;">
         <{if $theme->mPackage}>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 11:59:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 11:59:28 +0900
Subject: [xoops-cvslog 3519] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711025928.78F752AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html:1.1.2.3	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_clone.html	Tue Jul 11 11:59:28 2006
@@ -40,19 +40,19 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_tplset')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_tplset')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_module')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_module')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_file')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_file')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
-      <td class="<{cycle values="odd,even"}>"><{$actionForm->get('tpl_desc')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_desc')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}></td>
@@ -76,6 +76,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._EDIT}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:00:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:00:15 +0900
Subject: [xoops-cvslog 3520] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711030015.5FA432AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.4	Mon Jul 10 20:09:39 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html	Tue Jul 11 12:00:15 2006
@@ -39,11 +39,11 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTIMPORTED}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_lastimported')|xoops_formattimestamp:l}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('tpl_lastimported')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TYPE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('tpl_type')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_type')}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2" style="text-align:center;"><br />

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:00:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:00:29 +0900
Subject: [xoops-cvslog 3521] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711030029.55E272AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.9 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.10
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html:1.1.2.9	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_edit.html	Tue Jul 11 12:00:29 2006
@@ -39,19 +39,19 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_tplset')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_tplset')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_module')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_module')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('tpl_file')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('tpl_file')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
-      <td class="<{cycle values="odd,even"}>"><{$actionForm->get('tpl_desc')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_desc')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_SOURCE}></td>
@@ -75,6 +75,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._EDIT}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:00:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:00:39 +0900
Subject: [xoops-cvslog 3522] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711030039.A46DD2AC053@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.13 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.14
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.13	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html	Tue Jul 11 12:00:39 2006
@@ -29,11 +29,11 @@
   <select name="tpl_tplset">
     <{foreach from=$tplsets item=tplset}>
       <{if is_object($filterForm->mTplset)}>
-        <option value="<{$tplset->getVar('tplset_name')}>" <{if $filterForm->mTplset->get('tplset_name') == $tplset->getVar('tplset_name')}>selected<{/if}> >
-        <{$tplset->getVar('tplset_name')}></option>
+        <option value="<{$tplset->getShow('tplset_name')}>" <{if $filterForm->mTplset->get('tplset_name') == $tplset->get('tplset_name')}>selected<{/if}> >
+        <{$tplset->getShow('tplset_name')}></option>
       <{else}>
-        <option value="<{$tplset->getVar('tplset_name')}>">
-        <{$tplset->getVar('tplset_name')}></option>
+        <option value="<{$tplset->getShow('tplset_name')}>">
+        <{$tplset->getShow('tplset_name')}></option>
       <{/if}>
     <{/foreach}>
   </select>
@@ -42,11 +42,11 @@
   <select name="tpl_module">
     <{foreach from=$modules item=module}>
       <{if is_object($filterForm->mModule)}>
-        <option value="<{$module->getVar('dirname')}>" <{if $filterForm->mModule->get('dirname') == $module->getVar('dirname')}>selected<{/if}> >
-        <{$module->getVar('name')}>(<{$module->getVar('dirname')}>)</option>
+        <option value="<{$module->getShow('dirname')}>" <{if $filterForm->mModule->get('dirname') == $module->get('dirname')}>selected<{/if}> >
+        <{$module->getShow('name')}>(<{$module->getShow('dirname')}>)</option>
       <{else}>
-        <option value="<{$module->getVar('dirname')}>">
-        <{$module->getVar('name')}>(<{$module->getVar('dirname')}>)</option>
+        <option value="<{$module->getShow('dirname')}>">
+        <{$module->getShow('name')}>(<{$module->getShow('dirname')}>)</option>
       <{/if}>
     <{/foreach}>
   </select>
@@ -95,65 +95,65 @@
     <{foreach item=obj from=$objects}>
       <{if $obj->mOverride == null && $targetTplset != null && $targetTplset != 'default'}>
         <tr class="<{cycle values='odd,even'}>" style="color:#ff0000;" style="text-align:center;">
-      <{elseif $obj->getVar('tpl_type') == "block"}>
+      <{elseif $obj->get('tpl_type') == "block"}>
         <tr class="<{cycle values='odd,even'}>" style="color:#0000ff;" style="text-align:center;">
       <{else}>
         <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
       <{/if}>
         <td>
           <{if $obj->mOverride != null}>
-            <{$obj->mOverride->getVar('tpl_id')}>
+            <{$obj->mOverride->getShow('tpl_id')}>
           <{else}>
-            <{$obj->getVar('tpl_id')}>
+            <{$obj->getShow('tpl_id')}>
           <{/if}>
         </td>
-        <td><{$obj->getVar('tpl_module')}></td>
+        <td><{$obj->getShow('tpl_module')}></td>
         <td>
           <{if $obj->mOverride != null}>
-            <{$obj->mOverride->getVar('tpl_tplset')}>
+            <{$obj->mOverride->getShow('tpl_tplset')}>
           <{else}>
-            <{$obj->getVar('tpl_tplset')}>
+            <{$obj->getShow('tpl_tplset')}>
           <{/if}>
         </td>
-        <td style="text-align:left;"><b><{$obj->getVar('tpl_file')}></b><br />
-          <{$obj->getVar('tpl_desc')}></td>
+        <td style="text-align:left;"><b><{$obj->getShow('tpl_file')}></b><br />
+          <{$obj->getShow('tpl_desc')}></td>
         <td>
           <{if $obj->mOverride != null}>
-            <{$obj->mOverride->getVar('tpl_lastmodified')|xoops_formattimestamp:l}>
+            <{$obj->mOverride->get('tpl_lastmodified')|xoops_formattimestamp:l}>
           <{else}>
-            <{$obj->getVar('tpl_lastmodified')|xoops_formattimestamp:l}>
+            <{$obj->get('tpl_lastmodified')|xoops_formattimestamp:l}>
           <{/if}>
         </td>
         <td>
           <{if $obj->mOverride != null}>
-            <{$obj->mOverride->getVar('tpl_lastimported')|xoops_formattimestamp:l}>
+            <{$obj->mOverride->get('tpl_lastimported')|xoops_formattimestamp:l}>
           <{else}>
-            <{$obj->getVar('tpl_lastimported')|xoops_formattimestamp:l}>
+            <{$obj->get('tpl_lastimported')|xoops_formattimestamp:l}>
           <{/if}>
         </td>
-        <td><{$obj->getVar('tpl_type')}></td>
+        <td><{$obj->getShow('tpl_type')}></td>
         <td nowrap>
           <{if $targetTplset == 'default'}>
-            <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->getVar('tpl_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
-            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getVar('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>
+            <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>
+            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /></a>
           <{elseif $obj->mOverride != null}>
-            <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->mOverride->getVar('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->getVar('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->getVar('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>
+            <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>
-              <{xoops_input type=file name=upload key=$obj->mOverride->getVar('tpl_id')}>
+              <{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->getVar('tpl_id')}>&amp;tpl_tplset=<{$targetTplset|escape}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /></a>
-            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getVar('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>
+            <a href="index.php?action=TplfileClone&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$targetTplset|escape}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" title="<{$smarty.const._CLONE}>" /></a>
+            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /></a>
             <td>&nbsp;</td>
           <{else}>
-            <{if $obj->getVar('tpl_tplset') == 'default'}>
-              <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->getVar('tpl_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
+            <{if $obj->get('tpl_tplset') == 'default'}>
+              <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
             <{else}>
-              <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->getVar('tpl_id')}>&amp;tpl_tplset=<{$obj->getVar('tpl_tplset')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+              <a href="index.php?action=TplfileEdit&amp;tpl_id=<{$obj->getShow('tpl_id')}>&amp;tpl_tplset=<{$obj->getShow('tpl_tplset')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
             <{/if}>
-            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getVar('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>
+            <a href="index.php?action=TplfileDownload&amp;tpl_id=<{$obj->getShow('tpl_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DOWNLOAD}>" /></a>
           <{/if}>
 
         </td>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:00:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:00:52 +0900
Subject: [xoops-cvslog 3523] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711030052.D5E242AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html:1.1.2.4	Wed Jun 14 01:12:52 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_upload.html	Tue Jul 11 12:00:52 2006
@@ -39,7 +39,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._AD_LEGACYRENDER_LANG_UPLOAD}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:01:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:01:45 +0900
Subject: [xoops-cvslog 3524] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060711030145.8F7102AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileCloneForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileCloneForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/TplfileCloneForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/TplfileCloneForm.class.php:1.1.2.1	Wed May 17 16:19:56 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileCloneForm.class.php	Tue Jul 11 12:01:45 2006
@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileCloneForm.class.php,v 1.1.2.2 2006/07/11 03:01:45 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileEditForm.class.php";
 require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
 
-class LegacyRender_TplfileCloneForm extends TplfileEditForm
+class LegacyRender_TplfileCloneForm extends LegacyRender_TplfileEditForm
 {
 	function getTokenName()
 	{
@@ -52,10 +56,10 @@
 	{
 		$obj->loadSource();
 
-		$obj->setVar('tpl_desc', $this->get('tpl_desc'));
-		$obj->setVar('tpl_lastmodified', time());
+		$obj->set('tpl_desc', $this->get('tpl_desc'));
+		$obj->set('tpl_lastmodified', time());
 
-		$obj->Source->setVar('tpl_source', $this->get('tpl_source'));
+		$obj->Source->set('tpl_source', $this->get('tpl_source'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:02:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:02:34 +0900
Subject: [xoops-cvslog 3525] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060711030234.D35182AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php:1.1.2.3	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplfileEditForm.class.php	Tue Jul 11 12:02:34 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileEditForm.class.php,v 1.1.2.4 2006/07/11 03:02:34 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,7 +11,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class TplfileEditForm extends XCube_ActionForm
+class LegacyRender_TplfileEditForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
@@ -44,21 +48,21 @@
 	{
 		$obj->loadSource();
 		
-		$this->setVar('tpl_id', $obj->get('tpl_id'));
-		$this->setVar('tpl_desc', $obj->get('tpl_desc'));
-		$this->setVar('tpl_source', $obj->Source->get('tpl_source'));
+		$this->set('tpl_id', $obj->get('tpl_id'));
+		$this->set('tpl_desc', $obj->get('tpl_desc'));
+		$this->set('tpl_source', $obj->Source->get('tpl_source'));
 	}
 
 	function update(&$obj)
 	{
 		$obj->loadSource();
 
-		$obj->setVar('tpl_id', $this->get('tpl_id'));
-		$obj->setVar('tpl_desc', $this->get('tpl_desc'));
+		$obj->set('tpl_id', $this->get('tpl_id'));
+		$obj->set('tpl_desc', $this->get('tpl_desc'));
 
-		$obj->setVar('tpl_lastmodified', time());
+		$obj->set('tpl_lastmodified', time());
 
-		$obj->Source->setVar('tpl_source', $this->get('tpl_source'));
+		$obj->Source->set('tpl_source', $this->get('tpl_source'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:03:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:03:11 +0900
Subject: [xoops-cvslog 3526] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060711030311.07A742AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetDeleteForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetDeleteForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/TplsetDeleteForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/TplsetDeleteForm.class.php:1.1.2.2	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetDeleteForm.class.php	Tue Jul 11 12:03:10 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetDeleteForm.class.php,v 1.1.2.3 2006/07/11 03:03:10 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,8 +11,13 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class TplsetDeleteForm extends XCube_ActionForm
+class LegacyRender_TplsetDeleteForm extends XCube_ActionForm
 {
+	function getTokenName()
+	{
+		return "module.legacyRender.TplsetDeleteForm.TOKEN" . $this->get('tplset_id');
+	}
+
 	function prepare()
 	{
 		//
@@ -23,19 +32,15 @@
 		$this->mFieldProperties['tplset_id']->setDependsByArray(array('required'));
 		$this->mFieldProperties['tplset_id']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_TPLSET_ID);
 	}
-	function getTokenName()
-	{
-		return "module.legacyRender.TplsetDeleteForm.TOKEN";
-	}
 
 	function load(&$obj)
 	{
-		$this->setVar('tplset_id', $obj->get('tplset_id'));
+		$this->set('tplset_id', $obj->get('tplset_id'));
 	}
 
 	function update(&$obj)
 	{
-		$obj->setVar('tplset_id', $this->get('tplset_id'));
+		$obj->set('tplset_id', $this->get('tplset_id'));
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:03:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:03:30 +0900
Subject: [xoops-cvslog 3527] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060711030330.EE28F2AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/TplsetSelectForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/TplsetSelectForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/TplsetSelectForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/TplsetSelectForm.class.php:1.1.2.2	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/TplsetSelectForm.class.php	Tue Jul 11 12:03:30 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetSelectForm.class.php,v 1.1.2.3 2006/07/11 03:03:30 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,7 +11,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class TplsetSelectForm extends XCube_ActionForm
+class LegacyRender_TplsetSelectForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:04:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:04:18 +0900
Subject: [xoops-cvslog 3528] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030418.03D532AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileCloneAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileCloneAction.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/actions/TplfileCloneAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileCloneAction.class.php:1.1.2.3	Wed May 17 18:43:27 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileCloneAction.class.php	Tue Jul 11 12:04:17 2006
@@ -1,9 +1,13 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileCloneAction.class.php,v 1.1.2.4 2006/07/11 03:04:17 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileCloneForm.class.php";
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractEditAction.class.php";
 
 class LegacyRender_TplfileCloneAction extends LegacyRender_AbstractEditAction
 {
@@ -11,12 +15,12 @@
 	
 	function _getId()
 	{
-		return isset($_REQUEST['tpl_id']) ? intval($_REQUEST['tpl_id']) : 0;
+		return xoops_getrequest('tpl_id');
 	}
 	
 	function &_getHandler()
 	{
-		$handler = xoops_getmodulehandler('tplfile');
+		$handler =& xoops_getmodulehandler('tplfile');
 		return $handler;
 	}
 
@@ -27,6 +31,10 @@
 		$this->mObjectHandler =& $this->_getHandler();
 		$obj =& $this->mObjectHandler->get($id);
 		
+		//
+		// The following code uses 'tpl_tplset' directly. This input value will
+		// be checked by ActionForm.
+		//
 		if (is_object($obj) && $obj->get('tpl_tplset') == 'default') {
 			$this->mObject =& $obj->createClone(xoops_getrequest('tpl_tplset'));
 		}
@@ -60,7 +68,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:04:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:04:31 +0900
Subject: [xoops-cvslog 3529] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030431.6B7D52AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php:1.1.2.3	Mon Jul 10 20:00:12 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileDownloadAction.class.php	Tue Jul 11 12:04:31 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: TplfileDownloadAction.class.php,v 1.1.2.3 2006/07/10 11:00:12 minahito Exp $
+ * @version $Id: TplfileDownloadAction.class.php,v 1.1.2.4 2006/07/11 03:04:31 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -36,9 +36,9 @@
 		header('Content-Type: application/force-download');
 		
 		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename=' . $this->mObject->getVar('tpl_file'));
+			header('Content-Disposition: filename=' . $this->mObject->getShow('tpl_file'));
 		} else {
-			header('Content-Disposition: attachment; filename=' . $this->mObject->getVar('tpl_file'));
+			header('Content-Disposition: attachment; filename=' . $this->mObject->getShow('tpl_file'));
 		}
 
 		header('Content-length: ' . strlen($source));

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:04:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:04:58 +0900
Subject: [xoops-cvslog 3530] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030458.DD59E2AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileEditAction.class.php:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/actions/TplfileEditAction.class.php:1.1.2.9
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileEditAction.class.php:1.1.2.8	Sat May 27 22:10:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileEditAction.class.php	Tue Jul 11 12:04:58 2006
@@ -1,20 +1,24 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplfileEditAction.class.php,v 1.1.2.9 2006/07/11 03:04:58 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplfileEditForm.class.php";
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractEditAction.class.php";
 
 class LegacyRender_TplfileEditAction extends LegacyRender_AbstractEditAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['tpl_id']) ? intval($_REQUEST['tpl_id']) : 0;
+		return xoops_getrequest('tpl_id');
 	}
 	
 	function &_getHandler()
 	{
-		$handler = xoops_getmodulehandler('tplfile');
+		$handler =& xoops_getmodulehandler('tplfile');
 		return $handler;
 	}
 
@@ -29,7 +33,7 @@
 	
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new TplfileEditForm();
+		$this->mActionForm =& new LegacyRender_TplfileEditForm();
 		$this->mActionForm->prepare();
 	}
 
@@ -47,8 +51,12 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
+		//
+		// This class knows the db template mechanism, because this is in
+		// LegacyRender.
+		//
 		require_once XOOPS_ROOT_PATH . "/class/template.php";
-		
+
 		$xoopsTpl =& new XoopsTpl();
 		$xoopsTpl->clear_cache('db:' . $this->mObject->get('tpl_file'));
 		$xoopsTpl->clear_compiled_tpl('db:' . $this->mObject->get('tpl_file'));
@@ -60,7 +68,14 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$tplset = $this->mObject->get('tpl_tplset');
+		$module = $this->mObject->get('tpl_module');
+		$controller->executeForward("./index.php?action=TplfileList&tpl_tplset=${tplset}&tpl_module=${module}");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:05:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:05:13 +0900
Subject: [xoops-cvslog 3531] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030513.8822A2AC075@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.12 xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.13
--- xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php:1.1.2.12	Mon Jul 10 20:00:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplfileListAction.class.php	Tue Jul 11 12:05:13 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: TplfileListAction.class.php,v 1.1.2.12 2006/07/10 11:00:48 minahito Exp $
+ * @version $Id: TplfileListAction.class.php,v 1.1.2.13 2006/07/11 03:05:13 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -112,8 +112,8 @@
 
 			$obj->loadSource();
 			
-			$last_tplset = $obj->getVar('tpl_tplset');
-			$last_module = $obj->getVar('tpl_module');
+			$last_tplset = $obj->get('tpl_tplset');
+			$last_module = $obj->get('tpl_module');
 			
 			//
 			// [Warning] Access to a private property of XCube_FormFile.

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:05:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:05:26 +0900
Subject: [xoops-cvslog 3532] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030526.90F042AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php:1.1.2.2	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetDeleteAction.class.php	Tue Jul 11 12:05:26 2006
@@ -1,53 +1,25 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetDeleteAction.class.php,v 1.1.2.3 2006/07/11 03:05:26 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractDeleteAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetDeleteForm.class.php";
 
-class LegacyRender_TplsetDeleteAction extends LegacyRender_Action
+class LegacyRender_TplsetDeleteAction extends LegacyRender_AbstractDeleteAction
 {
-	var $mObject = null;
-	var $mObjectHandler = null;
-	var $mActionForm=null;
-	
-	function getDefaultView(&$controller,&$xoopsUser)
+	function _getId()
 	{
-		$this->_setupActionForm();
-		$this->_setupObject($controller);
-
-		if ($this->mObject == null) {
-			return LEGACYRENDER_FRAME_VIEW_ERROR;
-		}
-
-		$this->mActionForm->load($this->mObject);
-
-		return LEGACYRENDER_FRAME_VIEW_INPUT;
+		return xoops_getrequest('tplset_id');
 	}
-	
-	function execute(&$controller,&$xoopsUser)
-	{
-		$this->_setupActionForm();
-		$this->_setupObject($controller);
-
-		if ($this->mObject == null) {
-			return LEGACYRENDER_FRAME_VIEW_ERROR;
-		}
-
-		//
-		// If image is no, the data has to continue to keep his value.
-		//
-		$this->mActionForm->load($this->mObject);
-
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-
-		if($this->mActionForm->hasError())
-			return LEGACYRENDER_FRAME_VIEW_INPUT;
-			
-		$this->mActionForm->update($this->mObject);
 
-		return $this->mObjectHandler->delete($this->mObject) ? LEGACYRENDER_FRAME_VIEW_SUCCESS
-		                                                       : LEGACYRENDER_FRAME_VIEW_ERROR;
+	function &_getHandler()
+	{
+		$handler = xoops_getmodulehandler('tplset');
+		return $handler;
 	}
 
 	function _setupObject(&$controller)
@@ -62,20 +34,9 @@
 		}
 	}
 	
-	function &_getHandler()
-	{
-		$handler = xoops_getmodulehandler('tplset');
-		return $handler;
-	}
-	
-	function _getId()
-	{
-		return isset($_REQUEST['tplset_id']) ? intval($_REQUEST['tplset_id']) : 0;
-	}
-	
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new TplsetDeleteForm();
+		$this->mActionForm =& new LegacyRender_TplsetDeleteForm();
 		$this->mActionForm->prepare();
 	}
 
@@ -88,13 +49,17 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		header("location: ./index.php?action=TplsetList");
-		exit();
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:05:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:05:43 +0900
Subject: [xoops-cvslog 3533] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030543.443D02AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetDownloadAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetDownloadAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/TplsetDownloadAction.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetDownloadAction.class.php:1.1.2.1	Thu May 18 12:04:07 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetDownloadAction.class.php	Tue Jul 11 12:05:43 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetDownloadAction.class.php,v 1.1.2.2 2006/07/11 03:05:43 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -55,9 +59,9 @@
 
 		$xml = "<?xml version=\"1.0\"?>" . "\n" .
 		       "<tplset>" . "\n" .
-		       "  <name>" . $this->mTplset->getVar('tplset_name') . "</name>" . "\n" .
-		       "  <dateCreated>" . $this->mTplset->getVar('tplset_created') . "</dateCreated>" . "\n" .
-		       "  <credits>" . $this->mTplset->getVar('tplset_credits') . "</credits>" . "\n" .
+		       "  <name>" . $this->mTplset->getShow('tplset_name') . "</name>" . "\n" .
+		       "  <dateCreated>" . $this->mTplset->getShow('tplset_created') . "</dateCreated>" . "\n" .
+		       "  <credits>" . $this->mTplset->getShow('tplset_credits') . "</credits>" . "\n" .
 			   "  <generator>" . XOOPS_VERSION. "</generator>" . "\n";
 
 		$handler =& xoops_getmodulehandler('tplfile');
@@ -72,20 +76,20 @@
 				if ($files[$i]->Source != null) {
 					$type = null;
 					if ($files[$i]->get('tpl_type') == 'block') {
-						$path = $this->mTplset->getVar('tplset_name') . '/templates/' . $files[$i]->getVar('tpl_module') . "/blocks/" . $files[$i]->getVar('tpl_file');
+						$path = $this->mTplset->getShow('tplset_name') . '/templates/' . $files[$i]->getShow('tpl_module') . "/blocks/" . $files[$i]->getShow('tpl_file');
 						$type = "block";
 					}
 					elseif ($files[$i]->get('tpl_type') == 'module') {
-						$path = $this->mTplset->getVar('tplset_name') . '/templates/' . $files[$i]->getVar('tpl_module') . "/" . $files[$i]->getVar('tpl_file');
+						$path = $this->mTplset->getShow('tplset_name') . '/templates/' . $files[$i]->getShow('tpl_module') . "/" . $files[$i]->getShow('tpl_file');
 						$type = "module";
 					}
-					$xml .= '    <template name="' . $files[$i]->getVar('tpl_file') . '">' . "\n" .
-					        "      <module>" . $files[$i]->getVar('tpl_module') . "</module>" . "\n" .
-					        "      <type>module</type>" . $files[$i]->getVar('tpl_module') . "</module>" . "\n" .
-					        "      <lastModified>" . $files[$i]->getVar('tpl_lastmodified') . "</lastModified>" . "\n" .
+					$xml .= '    <template name="' . $files[$i]->getShow('tpl_file') . '">' . "\n" .
+					        "      <module>" . $files[$i]->getShow('tpl_module') . "</module>" . "\n" .
+					        "      <type>module</type>" . $files[$i]->getShow('tpl_module') . "</module>" . "\n" .
+					        "      <lastModified>" . $files[$i]->getShow('tpl_lastmodified') . "</lastModified>" . "\n" .
 					        "    </template>" . "\n";
 					
-					$this->mDownloader->addFileData($files[$i]->Source->get('tpl_source'), $path, $files[$i]->getVar('tpl_lastmodified'));
+					$this->mDownloader->addFileData($files[$i]->Source->get('tpl_source'), $path, $files[$i]->getShow('tpl_lastmodified'));
 				}
 			}
 			
@@ -94,20 +98,20 @@
 		
 		$xml .= "</tplset>";
 		
-		$this->mDownloader->addFileData($xml, $this->mTplset->getVar('tplset_name') . '/tplset.xml', time());
+		$this->mDownloader->addFileData($xml, $this->mTplset->getShow('tplset_name') . '/tplset.xml', time());
 		
 		return LEGACYRENDER_FRAME_VIEW_SUCCESS;
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		print $this->mDownloader->download($this->mTplset->getVar('tplset_name'), true);
+		print $this->mDownloader->download($this->mTplset->getShow('tplset_name'), true);
 		exit(0);
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:06:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:06:12 +0900
Subject: [xoops-cvslog 3534] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030612.B1D862AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.8 xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.9
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php:1.1.2.8	Mon Jul 10 20:10:19 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetListAction.class.php	Tue Jul 11 12:06:12 2006
@@ -15,7 +15,7 @@
 	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		LegacyRender_AbstractListAction::prepare($controller, $xoopsUser, $moduleConfig);
-		$this->mActionForm =& new TplsetSelectForm();
+		$this->mActionForm =& new LegacyRender_TplsetSelectForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -49,7 +49,7 @@
 			
 			$configs =& $configHandler->getConfigs($criteria);
 			if (count($configs) > 0) {
-				$configs[0]->setVar('conf_value', $this->mActionForm->get('tplset_name'));
+				$configs[0]->set('conf_value', $this->mActionForm->get('tplset_name'));
 				$configHandler->insertConfig($configs[0]);
 				$this->mActiveTemplateSet = $this->mActionForm->get('tplset_name');
 			}

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:06:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:06:23 +0900
Subject: [xoops-cvslog 3535] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030623.501CD2AC06E@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.2 xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php:1.1.2.2	Thu May 25 14:17:37 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/TplsetUploadAction.class.php	Tue Jul 11 12:06:23 2006
@@ -1,8 +1,12 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: TplsetUploadAction.class.php,v 1.1.2.3 2006/07/11 03:06:23 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/TplsetUploadForm.class.php";
 
 class LegacyRender_TplsetUploadAction extends LegacyRender_Action
@@ -28,6 +32,10 @@
 	
 	function execute(&$controller, &$xoopsUser)
 	{
+		if (xoops_getrequest('_form_control_cancel') != null) {
+			return LEGACYRENDER_FRAME_VIEW_CANCEL;
+		}
+
 		$this->mActionForm->fetch();
 		$this->mActionForm->validate();
 		
@@ -169,20 +177,24 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		header("location: ./index.php?action=TplsetList");
-		exit();
+		$controller->executeForward("./index.php?action=TplsetList");
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
 		if (count($this->mErrorMessages) == 0) {
-			redirect_header("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+			$controller->executeRedirect("./index.php?action=TplsetList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
 		}
 		else {
 			$render->setTemplateName("tplset_upload_error.html");
 			$render->setAttribute('errorMessages', $this->mErrorMessages);
 		}
 	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=TplsetList");
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 12:06:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 12:06:32 +0900
Subject: [xoops-cvslog 3536] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060711030632.D041C2AC06E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.4	Tue Mar 28 22:30:49 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php	Tue Jul 11 12:06:32 2006
@@ -78,7 +78,7 @@
 			
 			$configs =& $configHandler->getConfigs($criteria);
 
-			$configs[0]->setVar('conf_value', $themeName);
+			$configs[0]->set('conf_value', $themeName);
 			if ($configHandler->insertConfig($configs[0])) {
 				$controller->mRoot->setThemeName($this->mActionForm->getChooseTheme());
 			}

From tom_g3x ＠ users.sourceforge.jp  Tue Jul 11 12:43:27 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 11 Jul 2006 12:43:27 +0900
Subject: [xoops-cvslog 3537] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060711034327.3DD412AC05F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html:1.1.2.5	Tue Jul 11 12:00:15 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_delete.html	Tue Jul 11 12:43:27 2006
@@ -8,51 +8,54 @@
 
 <div class="confirm"><{$smarty.const._AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE}></div>
 
-<table class="outer" cellspacing="1">
+<form action="./index.php?action=TplfileDelete" method="POST">
+  <{xoops_token form=$actionForm}>
+  <table class="outer">
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_ID}></th>
+      <th colspan="2"><{$smarty.const._AD_LEGACYRENDER_LANG_TPLFILE_DELETE}></th>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_ID}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_id')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_REFID}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_REFID}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_refid')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_module')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_tplset')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_file')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_DESC}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_desc')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTMODIFIED}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTMODIFIED}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->get('tpl_lastmodified')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTIMPORTED}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTIMPORTED}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->get('tpl_lastimported')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TYPE}></th>
+      <td class="head"><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TYPE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getShow('tpl_type')}></td>
     </tr>
     <tr>
-      <td class="foot" colspan="2" style="text-align:center;"><br />
-        <form action="./index.php?action=TplfileDelete" method="POST">
-          <{xoops_token form=$actionForm}>
-          <{xoops_input type=hidden name=tpl_id value=$actionForm->get('tpl_id')}>
-          <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
-          <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
-        </form>
+      <td class="foot" colspan="2">
+        <{xoops_input type=hidden name=tpl_id value=$actionForm->get('tpl_id')}>
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
-</table>
+  </table>
+</form>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.7 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.8
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.7	Mon Jul 10 16:26:43 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Tue Jul 11 12:43:27 2006
@@ -82,8 +82,8 @@
         <{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}>
       </td>
     </tr>
-    <tr class="foot">
-      <td colspan="2">
+    <tr>
+      <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
         <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>

From tom_g3x ＠ users.sourceforge.jp  Tue Jul 11 12:43:27 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 11 Jul 2006 12:43:27 +0900
Subject: [xoops-cvslog 3538] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060711034327.63D012AC06F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.7	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Tue Jul 11 12:43:27 2006
@@ -75,8 +75,8 @@
         </td>
       </tr>
     <{/if}>
-    <tr class="foot">
-      <td colspan="2" style="text-align:center;">
+    <tr>
+      <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
         <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.13 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.14
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.13	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Tue Jul 11 12:43:27 2006
@@ -121,7 +121,7 @@
         </td>
       </tr>
     <{/foreach}>
-    <tr class="foot">
+    <tr>
       <td colspan="10" class="foot">
         <input type="submit" value="<{$smarty.const._SUBMIT}>"/>
       </td>

From tom_g3x ＠ users.sourceforge.jp  Tue Jul 11 12:43:27 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Tue, 11 Jul 2006 12:43:27 +0900
Subject: [xoops-cvslog 3539] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060711034327.86A392AC05F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.6	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html	Tue Jul 11 12:43:27 2006
@@ -16,7 +16,7 @@
       <th colspan="2"><{$smarty.const._AD_USER_LANG_DELETE_RANK}></th>
     </tr>
     <tr>
-      <td class="head" style="width:30%;"><{$smarty.const._AD_USER_LANG_RANK_ID}></td>
+      <td class="head"><{$smarty.const._AD_USER_LANG_RANK_ID}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_id')}></td>
     </tr>
     <tr>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 14:08:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 14:08:32 +0900
Subject: [xoops-cvslog 3540] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20060711050832.DE12A2AC011@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.2 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.3
--- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.2	Fri Jun 23 10:29:54 2006
+++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php	Tue Jul 11 14:08:32 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: ThemeSelect.class.php,v 1.1.2.2 2006/06/23 01:29:54 minahito Exp $
+// $Id: ThemeSelect.class.php,v 1.1.2.3 2006/07/11 05:08:32 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -27,18 +27,36 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
+/**
+ * Theme select mechanism is that base knows the method to change themes
+ * without RenderSystem. So this class uses delegate to check whether the
+ * specified theme is selectable. Functions should be added to this delegate in
+ * constructor, because the delegate is called in preBlockFilter().
+ */
 class Base_ThemeSelect extends XCube_ActionFilter
 {
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mIsSelectableTheme = null;
+	
+	function Base_ThemeSelect(&$controller)
+	{
+		parent::XCube_ActionFilter($controller);
+		$this->mIsSelectableTheme =& new XCube_NewDelegate();
+		$this->mIsSelectableTheme->register('Base_ThemeSelect.IsSelectableTheme');
+	}
+	
 	function preBlockFilter()
 	{
-		if (!empty($_POST['xoops_theme_select']) && in_array($_POST['xoops_theme_select'], $this->mController->mConfig['theme_set_allowed'])) {
+		if (!empty($_POST['xoops_theme_select']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
 			$this->mController->mConfig['theme_set'] = $_POST['xoops_theme_select'];
 			$_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
-		} elseif (!empty($_SESSION['xoopsUserTheme']) && in_array($_SESSION['xoopsUserTheme'], $this->mController->mConfig['theme_set_allowed'])) {
+		} elseif (!empty($_SESSION['xoopsUserTheme']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
 			$this->mController->mConfig['theme_set'] = $_SESSION['xoopsUserTheme'];
 		}
-
-		$delegate=new XCube_Delegate("Base_ThemeSelect","callbackCheckLoginSuccess");
+		
+		$delegate = new XCube_Delegate("Base_ThemeSelect","callbackCheckLoginSuccess");
 		$this->mController->mRoot->mEventManager->add("Site.CheckLogin.Success",$delegate);
 	}
 
@@ -60,6 +78,14 @@
 			$_SESSION['xoopsUserTheme'] = $userTheme;
 		}
 	}
+	
+	function _isSelectableTheme($theme_name)
+	{
+		$flag = false;
+		$this->mIsSelectableTheme->call(new XCube_Ref($flag), $theme_name);
+		
+		return $flag;
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Jul 11 14:09:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 14:09:54 +0900
Subject: [xoops-cvslog 3541] CVS update:
	xoops2jp/html/modules/legacyRender/blocks
Message-ID: <20060711050954.705662AC011@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/blocks/legacyRender_themes.php
diff -u xoops2jp/html/modules/legacyRender/blocks/legacyRender_themes.php:1.1.2.1 xoops2jp/html/modules/legacyRender/blocks/legacyRender_themes.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/blocks/legacyRender_themes.php:1.1.2.1	Fri Mar 24 22:05:46 2006
+++ xoops2jp/html/modules/legacyRender/blocks/legacyRender_themes.php	Tue Jul 11 14:09:54 2006
@@ -1,11 +1,16 @@
 <?php
+
 function b_legacyRender_themes_show($options)
 {
     global $xoopsConfig;
     $theme_options = array();
-    foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
-        $theme_option['name'] = $theme;
-        if ($theme == $xoopsConfig['theme_set']) {
+	
+	$handler =& xoops_getmodulehandler('theme', 'legacyRender');
+	$themeArr =& $handler->getObjects(new Criteria('enable_select', 1));
+	
+    foreach ($themeArr as $theme) {
+        $theme_option['name'] = $theme->getShow('name');
+        if ($theme->get('name') == $xoopsConfig['theme_set']) {
             $theme_option['selected'] = 'selected="selected"';
         } else {
             $theme_option['selected'] = '';
@@ -13,7 +18,7 @@
         $theme_options[] = $theme_option;
     }
     $block = array();
-    $block['count'] = count($xoopsConfig['theme_set_allowed']);
+    $block['count'] = count($themeArr);
     $block['mode'] = $options[0];
     $block['width'] = $options[1];
     $block['theme_options'] = $theme_options;

From minahito ＠ users.sourceforge.jp  Tue Jul 11 14:11:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 14:11:11 +0900
Subject: [xoops-cvslog 3542] CVS update:
	xoops2jp/html/modules/legacyRender/preload
Message-ID: <20060711051111.0DAB02AC011@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php:1.1.2.1
--- /dev/null	Tue Jul 11 14:11:10 2006
+++ xoops2jp/html/modules/legacyRender/preload/ThemeSelect.class.php	Tue Jul 11 14:11:10 2006
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package legacyRender
+ * @version $Id: ThemeSelect.class.php,v 1.1.2.1 2006/07/11 05:11:10 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class legacyRender_ThemeSelect extends XCube_ActionFilter
+{
+    function legacyRender_ThemeSelect(&$controller)
+    {
+		parent::XCube_ActionFilter($controller);
+		$controller->mRoot->mDelegateManager->add('Base_ThemeSelect.IsSelectableTheme', 'legacyRender_ThemeSelect::isSelectableTheme');
+    }
+    
+    function isSelectableTheme(&$flag, $theme_name)
+	{
+		$handler =& xoops_getmodulehandler('theme', 'legacyRender');
+		$themeArr =& $handler->getObjects(new Criteria('name', $theme_name));
+		
+		if (count($themeArr) == 1 && $themeArr[0]->get('enable_select')) {
+			$flag = true;
+		}
+    }
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Jul 11 19:05:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 19:05:27 +0900
Subject: [xoops-cvslog 3543] CVS update: xoops2jp/html/kernel
Message-ID: <20060711100527.124822AC048@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.11 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.12
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.11	Wed Jun 28 14:44:57 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Tue Jul 11 19:05:26 2006
@@ -60,7 +60,12 @@
 	 * Instance to implement the action process of this controller
 	 * @access private
 	 */
-	var $mActionStrategy=null;
+	var $mActionStrategy = null;
+
+	/**
+	 * @var string or object
+	 */	
+	var $mMainTheme = null;
 
 	function XCube_Controller()
 	{
@@ -358,12 +363,28 @@
 	}
 	
 	/**
-	 * Retern RenderSystem
-	 * @return XCube_RenderSystem
+	 * Set the main theme.
+	 * 
+	 * [Notice]
+	 * Some of sub-classes of XCube_Controller may use object to specify theme.
+	 * So this class uses references.
+	 * 
+	 * @var string or object
 	 */
-	function &getRenderSystem()
+	function setMainTheme(&$theme)
 	{
-		return $this->mRenderSystem;
+		$this->mMainTheme =& $theme;
+	}
+	
+	/**
+	 * Return the main theme.
+	 * 
+	 * @return string or object
+	 * @see XCube_Controller::setMainTheme()
+	 */
+	function &getMainTheme()
+	{
+		return $this->mMainTheme;
 	}
 	
 	function executeView()
@@ -400,9 +421,16 @@
 		exit();
 	}
 
+	/**
+	 * Redirect to the specified URL with displaying message.
+	 * 
+	 * @param string  $url      Can't use html tags.
+	 * @param int     $time
+	 * @param string  $message
+	 */
 	function executeRedirect($url, $time = 1, $message = null)
 	{
-		// TODO
+		$this->executeForward($url, $time, $message);
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Tue Jul 11 19:05:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 19:05:58 +0900
Subject: [xoops-cvslog 3544] CVS update: xoops2jp/html/kernel
Message-ID: <20060711100558.385C92AC048@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Root.class.php
diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.14 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.15
--- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.14	Thu Jun 22 14:32:20 2006
+++ xoops2jp/html/kernel/XCube_Root.class.php	Tue Jul 11 19:05:58 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: XCube_Root.class.php,v 1.1.2.14 2006/06/22 05:32:20 minahito Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.15 2006/07/11 10:05:58 minahito Exp $
  * @package XCube
  */
 
@@ -280,6 +280,7 @@
 	 * Set the theme name.
 	 * 
 	 * @param $theme string
+	 * @deprecated
 	 */	
 	function setThemeName($theme)
 	{
@@ -290,6 +291,7 @@
 	 * Return the theme name.
 	 * 
 	 * @return string
+	 * @deprecated
 	 */	
 	function getThemeName()
 	{

From minahito ＠ users.sourceforge.jp  Tue Jul 11 19:06:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 19:06:48 +0900
Subject: [xoops-cvslog 3545] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060711100648.2F9022AC048@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.46 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.47
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.46	Mon Jul 10 13:49:04 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Tue Jul 11 19:06:48 2006
@@ -397,7 +397,7 @@
 		$configHandler=&xoops_gethandler('config');
 		$this->mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF);
 
-		$this->mRoot->setThemeName($this->mConfig['theme_set']);
+		$this->setMainTheme($this->mConfig['theme_set']);
 		if ($this->mLanguage) {
 		    $this->mConfig['language'] = $this->mLanguage;
         }
@@ -567,6 +567,15 @@
 	{
 		return $this->mConfig['module_cache'][$xoopsModule->getVar('mid')];
 	}
+
+	/**
+	 * @var string $theme
+	 */	
+	function setMainTheme($theme)
+	{
+		$this->mMainTheme = $theme;
+		$this->mConfig['theme_set'] = $theme;
+	}
 	
 	function executeView()
 	{
@@ -620,7 +629,7 @@
 		// Theme Control
 		//
 		$screenTarget=$this->mDialogMode ? new Legacy_DialogRenderTarget() : new Legacy_ThemeRenderTarget();
-		$screenTarget->setTemplateName($this->mRoot->getThemeName());
+		$screenTarget->setTemplateName($this->getMainTheme());
 		
 		$screenTarget->setAttribute('xoops_contents',$resultRenderTarget->getResult());
 

From minahito ＠ users.sourceforge.jp  Tue Jul 11 19:06:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Jul 2006 19:06:58 +0900
Subject: [xoops-cvslog 3546] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20060711100658.6E7D62AC037@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.3 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.4
--- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.3	Tue Jul 11 14:08:32 2006
+++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php	Tue Jul 11 19:06:58 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: ThemeSelect.class.php,v 1.1.2.3 2006/07/11 05:08:32 minahito Exp $
+// $Id: ThemeSelect.class.php,v 1.1.2.4 2006/07/11 10:06:58 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -50,10 +50,10 @@
 	function preBlockFilter()
 	{
 		if (!empty($_POST['xoops_theme_select']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
-			$this->mController->mConfig['theme_set'] = $_POST['xoops_theme_select'];
+			$this->mController->setMainTheme($_POST['xoops_theme_select']);
 			$_SESSION['xoopsUserTheme'] = $_POST['xoops_theme_select'];
 		} elseif (!empty($_SESSION['xoopsUserTheme']) && $this->_isSelectableTheme($_POST['xoops_theme_select'])) {
-			$this->mController->mConfig['theme_set'] = $_SESSION['xoopsUserTheme'];
+			$this->mController->setMainTheme($_SESSION['xoopsUserTheme']);
 		}
 		
 		$delegate = new XCube_Delegate("Base_ThemeSelect","callbackCheckLoginSuccess");

From minahito ＠ users.sourceforge.jp  Wed Jul 12 14:34:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 14:34:52 +0900
Subject: [xoops-cvslog 3547] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates/stylesheets
Message-ID: <20060712053453.01ACC2AC085@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Wed Jul 12 14:35:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 14:35:59 +0900
Subject: [xoops-cvslog 3548] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates/stylesheets
Message-ID: <20060712053559.20ADB2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css:1.1.2.1
--- /dev/null	Wed Jul 12 14:35:59 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/stylesheets/module.css	Wed Jul 12 14:35:58 2006
@@ -0,0 +1,3 @@
+#
+# This file is empty for the designer
+#

From minahito ＠ users.sourceforge.jp  Wed Jul 12 15:58:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 15:58:56 +0900
Subject: [xoops-cvslog 3549] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060712065856.52FB32AC065@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/ThemeSelectForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/ThemeSelectForm.class.php:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/forms/ThemeSelectForm.class.php:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/forms/ThemeSelectForm.class.php:1.1.2.2	Tue Mar 28 22:30:48 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/ThemeSelectForm.class.php	Wed Jul 12 15:58:56 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: ThemeSelectForm.class.php,v 1.1.2.3 2006/07/12 06:58:56 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,7 +11,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class ThemeSelectForm extends XCube_ActionForm
+class LegacyRender_ThemeSelectForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{

From minahito ＠ users.sourceforge.jp  Wed Jul 12 16:16:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 16:16:44 +0900
Subject: [xoops-cvslog 3550] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060712071644.6D6AF2AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.5 xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.6
--- xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php:1.1.2.5	Tue Jul 11 12:06:32 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/ThemeListAction.class.php	Wed Jul 12 16:16:44 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: ThemeListAction.class.php,v 1.1.2.6 2006/07/12 07:16:44 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,14 +11,25 @@
 
 /**
  * This action shows the list of selectable themes to user.
+ * 
+ * [Notice]
+ * In XOOPS Cube Legacy which can have many themes with different render-
+ * systems, that one render-system has the control to change themes is wrong,
+ * because this action can't list up themes of other render-systems.
+ * The action to change themes should be in Legacy. And, each render-systems
+ * should send theme informations through delegate-mechanism.
+ * 
+ * Therefore, we may move this action to Legacy module after the discussion.
+ * If you want to check the concept of this strategy, see ThemeSelect preload
+ * in Legacy module.
  */
 class LegacyRender_ThemeListAction extends LegacyRender_Action
 {
 	var $mThemes = null;
 	var $mObjectHandler = null;
-	var $mActionForm=null;
+	var $mActionForm = null;
 
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		$this->_setupObject();
 		$this->_setupActionForm();
@@ -22,20 +37,16 @@
 	
 	function _setupObject()
 	{
-		if ($this->mThemes == null) {
-			$this->mObjectHandler =& xoops_getmodulehandler('theme');
-			$this->mObjectHandler->updateThemeList();
+		$this->mObjectHandler =& xoops_getmodulehandler('theme');
+		$this->mObjectHandler->updateThemeList();
 
-			$this->mThemes =& $this->mObjectHandler->getObjects();
-		}
+		$this->mThemes =& $this->mObjectHandler->getObjects();
 	}
 
 	function _setupActionForm()
 	{
-		if ($this->mActionForm == null) {
-			$this->mActionForm = new ThemeSelectForm();
-			$this->mActionForm->prepare();
-		}
+		$this->mActionForm =& new LegacyRender_ThemeSelectForm();
+		$this->mActionForm->prepare();
 	}
 	
 	function getDefaultView(&$controller, &$xoopsUser)
@@ -62,7 +73,6 @@
 		foreach ($this->mThemes as $theme) {
 			$this->mObjectHandler->insert($theme);
 		}
-		
 
 		//
 		// save selected theme.
@@ -96,7 +106,9 @@
 		$render->setTemplateName("theme_list.html");
 		$render->setAttribute("themes", $this->mThemes);
 		$render->setAttribute("actionForm", $this->mActionForm);
-		$render->setAttribute("currentThemeName", $controller->mRoot->getThemeName());
+		
+		$mainTheme =& $controller->getMainTheme();
+		$render->setAttribute("currentThemeName", $mainTheme);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Wed Jul 12 19:50:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 19:50:23 +0900
Subject: [xoops-cvslog 3551] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060712105023.F34262AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml
diff -u xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.1 xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.2
--- xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml:1.1.2.1	Thu Jan 19 21:05:08 2006
+++ xoops2jp/html/modules/user/admin/.xml/ranks_edit.xml	Wed Jul 12 19:50:23 2006
@@ -20,13 +20,19 @@
 			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="50" />
 		</field>
-		<field property="rank_min" depends="required">
+		<field property="rank_min" depends="required,min">
 			<arg0 key="const._AD_USER_LANG_RANK_MIN" />
 			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+			<arg1 name="min" key="${var:maxlength}" />
+			<msg name="min" key="const._AD_USER_ERROR_MIN" />
+			<var name="min" value="0" />
 		</field>
-		<field property="rank_max" depends="required">
+		<field property="rank_max" depends="required,min">
 			<arg0 key="const._AD_USER_LANG_RANK_MAX" />
 			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+			<arg1 name="min" key="${var:maxlength}" />
+			<msg name="min" key="const._AD_USER_ERROR_MIN" />
+			<var name="min" value="0" />
 		</field>
 	</form-validation>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Wed Jul 12 19:50:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 19:50:37 +0900
Subject: [xoops-cvslog 3552] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060712105037.D07832AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/RanksEditAction.class.php	Wed Jul 12 19:50:37 2006
@@ -9,7 +9,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['rank_id']) ? $_REQUEST['rank_id'] : 0;
+		return xoops_getrequest('rank_id');
 	}
 
 	function &_getHandler()
@@ -20,7 +20,7 @@
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new RanksAdminEditForm();
+		$this->mActionForm =& new User_RanksAdminEditForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -50,7 +50,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=RanksList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Wed Jul 12 19:50:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 19:50:48 +0900
Subject: [xoops-cvslog 3553] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060712105048.2168B2AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.3	Tue Apr 11 18:55:25 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php	Wed Jul 12 19:50:47 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: RanksFilterForm.class.php,v 1.1.2.4 2006/07/12 10:50:47 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,55 +13,34 @@
 define('RANKS_SORT_KEY_RANK_MIN', 3);
 define('RANKS_SORT_KEY_RANK_MAX', 4);
 define('RANKS_SORT_KEY_RANK_SPECIAL', 5);
-define('RANKS_SORT_KEY_RANK_IMAGE', 6);
-define('RANKS_SORT_KEY_MAXVALUE', 6);
+define('RANKS_SORT_KEY_MAXVALUE', 5);
 
 define('RANKS_SORT_KEY_DEFAULT', RANKS_SORT_KEY_RANK_ID);
 
 class User_RanksFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		RANKS_SORT_KEY_RANK_ID => 'rank_id',
 		RANKS_SORT_KEY_RANK_TITLE => 'rank_title',
 		RANKS_SORT_KEY_RANK_MIN => 'rank_min',
 		RANKS_SORT_KEY_RANK_MAX => 'rank_max',
-		RANKS_SORT_KEY_RANK_SPECIAL => 'rank_special',
-		RANKS_SORT_KEY_RANK_IMAGE => 'rank_image'
+		RANKS_SORT_KEY_RANK_SPECIAL => 'rank_special'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : RANKS_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > RANKS_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[$this->mSort])) {
 			$this->mSort = RANKS_SORT_KEY_DEFAULT;
 		}
 	
-		if (isset($_REQUEST['rank_id'])) {
-			$this->_mCriteria->add(new Criteria('rank_id', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_id'))));
-		}
-	
-		if (isset($_REQUEST['rank_title'])) {
-			$this->_mCriteria->add(new Criteria('rank_title', array(XOBJ_DTYPE_STRING, xoops_getrequest('rank_title'))));
-		}
-	
-		if (isset($_REQUEST['rank_min'])) {
-			$this->_mCriteria->add(new Criteria('rank_min', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_min'))));
-		}
-	
-		if (isset($_REQUEST['rank_max'])) {
-			$this->_mCriteria->add(new Criteria('rank_max', array(XOBJ_DTYPE_INT, xoops_getrequest('rank_max'))));
-		}
-	
 		if (isset($_REQUEST['rank_special'])) {
-			$this->_mCriteria->add(new Criteria('rank_special', array(XOBJ_DTYPE_BOOL, xoops_getrequest('rank_special'))));
-		}
-	
-		if (isset($_REQUEST['rank_image'])) {
-			$this->_mCriteria->add(new Criteria('rank_image', array(XOBJ_DTYPE_STRING, xoops_getrequest('rank_image'))));
+			$this->_mNavi->addExtra('rank_special', xoops_getrequest('rank_special'));
+			$this->_mCriteria->add(new Criteria('rank_special', xoops_getrequest('rank_special')));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php	Wed Jul 12 19:50:48 2006
@@ -7,7 +7,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class RanksAdminEditForm extends XCube_ActionForm
+class User_RanksAdminEditForm extends XCube_ActionForm
 {
 	var $mOldFileName = null;
 	var $_mIsNew = false;
@@ -15,7 +15,7 @@
 	
 	function getTokenName()
 	{
-		return "module.user.RanksAdminEditForm.TOKEN";
+		return "module.user.RanksAdminEditForm.TOKEN" . $this->get('rank_id');
 	}
 
 	function prepare()
@@ -44,12 +44,24 @@
 		$this->mFieldProperties['rank_title']->addVar('maxlength', 50);
 
 		$this->mFieldProperties['rank_min'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_min']->setDependsByArray(array('required'));
+		$this->mFieldProperties['rank_min']->setDependsByArray(array('required', 'min'));
 		$this->mFieldProperties['rank_min']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MIN);
+		$this->mFieldProperties['rank_min']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MIN, 0);
+		$this->mFieldProperties['rank_min']->addVar('min', 0);
 
 		$this->mFieldProperties['rank_max'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['rank_max']->setDependsByArray(array('required'));
+		$this->mFieldProperties['rank_max']->setDependsByArray(array('required', 'min'));
 		$this->mFieldProperties['rank_max']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK_MAX);
+		$this->mFieldProperties['rank_max']->addMessage('min', _AD_USER_ERROR_MIN, _AD_USER_LANG_RANK_MAX, 0);
+		$this->mFieldProperties['rank_max']->addVar('min', 0);
+	}
+	
+	function validateRank_max()
+	{
+		die();
+		if ($this->get('max') < $this->get('min')) {
+			$this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX);
+		}
 	}
 
 	function validateRank_image()

From minahito ＠ users.sourceforge.jp  Wed Jul 12 19:50:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 12 Jul 2006 19:50:56 +0900
Subject: [xoops-cvslog 3554] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060712105056.56B012AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.5	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_list.html	Wed Jul 12 19:50:56 2006
@@ -26,22 +26,20 @@
     <th><{$smarty.const._AD_USER_LANG_RANK_SPECIAL}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_SPECIAL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_SPECIAL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_USER_LANG_RANK_IMAGE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_IMAGE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_IMAGE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_RANK_IMAGE}></th>
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><{$obj->getVar('rank_id')}></td>
-      <td><{$obj->getVar('rank_title')}></td>
-      <td style="text-align:right;"><{$obj->getVar('rank_min')}></td>
-      <td style="text-align:right;"><{$obj->getVar('rank_max')}></td>
-      <td><{$obj->getVar('rank_special')}></td>
-      <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('rank_image')}>" alt="<{$obj->getVar('rank_title')}>" title="<{$obj->getVar('rank_title')}>" /></td>
+      <td><{$obj->getShow('rank_id')}></td>
+      <td><{$obj->getShow('rank_title')}></td>
+      <td style="text-align:right;"><{$obj->getShow('rank_min')}></td>
+      <td style="text-align:right;"><{$obj->getShow('rank_max')}></td>
+      <td><{$obj->getShow('rank_special')}></td>
+      <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('rank_image')}>" alt="<{$obj->getShow('rank_title')}>" title="<{$obj->getShow('rank_title')}>" /></td>
       <td>
-        <a href="index.php?action=RanksEdit&amp;rank_id=<{$obj->getVar('rank_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <a href="index.php?action=RanksDelete&amp;rank_id=<{$obj->getVar('rank_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="index.php?action=RanksEdit&amp;rank_id=<{$obj->getShow('rank_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="index.php?action=RanksDelete&amp;rank_id=<{$obj->getShow('rank_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
     </tr>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 14:15:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 14:15:05 +0900
Subject: [xoops-cvslog 3555] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713051505.C00762AC094@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php:1.1.2.3	Wed Jul 12 19:50:48 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminEditForm.class.php	Thu Jul 13 14:15:05 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: RanksAdminEditForm.class.php,v 1.1.2.4 2006/07/13 05:15:05 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -58,8 +62,7 @@
 	
 	function validateRank_max()
 	{
-		die();
-		if ($this->get('max') < $this->get('min')) {
+		if ($this->get('rank_max') < $this->get('rank_min')) {
 			$this->addErrorMessage(_AD_USER_ERROR_INJURY_MIN_MAX);
 		}
 	}

From minahito ＠ users.sourceforge.jp  Thu Jul 13 17:24:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 17:24:47 +0900
Subject: [xoops-cvslog 3556] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20060713082447.0A53B2AC0A6@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.3 xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.4
--- xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php:1.1.2.3	Sat Jul  1 13:20:24 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_dhtmltarea.php	Thu Jul 13 17:24:46 2006
@@ -10,7 +10,7 @@
  *    used. For format xoops_xxxx functions, we may change XoopsForm class
  *    group.
  * 
- * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.3 2006/07/01 04:20:24 minahito Exp $
+ * @version $Id: function.xoops_dhtmltarea.php,v 1.1.2.4 2006/07/13 08:24:46 minahito Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
 		//
 		$name = trim($params['name']);
 		$class = isset($params['class']) ? trim($params['class']) : null;
-		$cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_TEXTAREA_DEFAULT_COLS;
+		$cols = isset($params['cols']) ? intval($params['cols']) : XOOPS_DHTMLTAREA_DEFAULT_COLS;
 		$rows = isset($params['rows']) ? intval($params['rows']) : XOOPS_DHTMLTAREA_DEFAULT_ROWS;
 		$value = isset($params['value']) ? trim($params['value']) : null;
 		$id = isset($params['id']) ? trim($params['id']) : XOOPS_DHTMLTAREA_DEFID_PREFIX . $name;

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:41:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:41:21 +0900
Subject: [xoops-cvslog 3557] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060713104121.D32332AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/groups_edit.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/groups_edit.xml:1.1.2.1
--- /dev/null	Thu Jul 13 19:41:21 2006
+++ xoops2jp/html/modules/user/admin/.xml/groups_edit.xml	Thu Jul 13 19:41:21 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="GroupAdminEditForm" type="XCube_ActionForm">
+		<form-property name="groupid" type="Int" />
+		<form-property name="name" type="String" />
+		<form-property name="description" type="Text" />
+	</form-bean>
+	<form-validation>
+		<field property="groupid" depends="required">
+			<arg0 key="const._AD_USER_LANG_GROUPID" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+		</field>
+		<field property="name" depends="required,maxlength">
+			<arg0 key="const._AD_USER_LANG_GROUP_NAME" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:42:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:42:45 +0900
Subject: [xoops-cvslog 3558] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104245.9DDE12AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php:1.1.2.3	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/AvatarDeleteAction.class.php	Thu Jul 13 19:42:45 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarDeleteAction.class.php,v 1.1.2.4 2006/07/13 10:42:45 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['avatar_id']) ? $_REQUEST['avatar_id'] : 0;
+		return xoops_getrequest('avatar_id');
 	}
 
 	function &_getHandler()
@@ -20,7 +24,7 @@
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new AvatarAdminDeleteForm();
+		$this->mActionForm =& new User_AvatarAdminDeleteForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -68,7 +72,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=AvatarList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:42:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:42:57 +0900
Subject: [xoops-cvslog 3559] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104257.48EEC2AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php:1.1.2.4	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/AvatarEditAction.class.php	Thu Jul 13 19:42:57 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.5 2006/07/13 10:42:57 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,19 +13,18 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['avatar_id']) ? $_REQUEST['avatar_id'] : 0;
+		return xoops_getrequest('avatar_id');
 	}
 
 	function &_getHandler()
 	{
 		$handler =& xoops_getmodulehandler('avatar');
-		
 		return $handler;
 	}
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new AvatarAdminEditForm();
+		$this->mActionForm =& new User_AvatarAdminEditForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -74,7 +77,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=AvatarList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=AvatarList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:43:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:43:19 +0900
Subject: [xoops-cvslog 3560] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104319.4F93D2AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupDeleteAction.class.php	Thu Jul 13 19:43:19 2006
@@ -1,44 +1,48 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupDeleteAction.class.php,v 1.1.2.3 2006/07/13 10:43:19 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractDeleteAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/GroupAdminDeleteForm.class.php";
-require_once XOOPS_MODULE_PATH . "/user/admin/class/XoopsGroupEx.class.php";
 
 class User_GroupDeleteAction extends User_AbstractDeleteAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['groupid']) ? $_REQUEST['groupid'] : 0;
+		return xoops_getrequest('groupid');
 	}
 
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('group');
+		$handler =& xoops_getmodulehandler('groups');
 		return $handler;
 	}
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new GroupAdminDeleteForm();
+		$this->mActionForm =& new User_GroupAdminDeleteForm();
 		$this->mActionForm->prepare();
 	}
 	
 	function _doExecute()
 	{
+		$handler =& xoops_gethandler('group');
+		$group =& $handler->get($this->mObject->get('groupid'));
+		
 		$handler =& xoops_gethandler('member');
-		return $handler->delete($this->mObject) ? USER_FRAME_VIEW_SUCCESS
-		                                        : USER_FRAME_VIEW_ERROR;
+		return $handler->delete($group) ? USER_FRAME_VIEW_SUCCESS
+		                                : USER_FRAME_VIEW_ERROR;
 	}
 
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
-		$group =& new XoopsGroupEx($this->mObject);
-		
 		$render->setTemplateName("group_delete.html");
 		$render->setAttribute('actionForm', $this->mActionForm);
-		$render->setAttribute('object', $group);
+		$render->setAttribute('object', $this->mObject);
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
@@ -48,7 +52,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=GroupList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=GroupList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=GroupList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:43:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:43:31 +0900
Subject: [xoops-cvslog 3561] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104331.ABDE62AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php:1.1.2.3	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupEditAction.class.php	Thu Jul 13 19:43:31 2006
@@ -1,43 +1,52 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupEditAction.class.php,v 1.1.2.4 2006/07/13 10:43:31 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
-require_once XOOPS_MODULE_PATH . "/user/admin/forms/GroupEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/GroupAdminEditForm.class.php";
 
 class User_GroupEditAction extends User_AbstractEditAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['groupid']) ? intval($_REQUEST['groupid']) : 0;
+		return xoops_getrequest('groupid');
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('group');
+		$handler =& xoops_getmodulehandler('groups');
 		return $handler;
 	}
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new User_GroupEditForm();
+		$this->mActionForm =& new User_GroupAdminEditForm();
 		$this->mActionForm->prepare();
 	}
 
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
-		$renderSystem->setTemplateName("group_edit.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
+		$render->setTemplateName("group_edit.html");
+		$render->setAttribute("actionForm", $this->mActionForm);
 	}
 
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
 		$controller->executeForward("index.php?action=GroupList");
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("index.php?action=GroupList", 1, "*ERROR*");
+		$controller->executeRedirect("index.php?action=GroupList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("index.php?action=GroupList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:44:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:44:06 +0900
Subject: [xoops-cvslog 3562] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104406.000472AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupListAction.class.php	Thu Jul 13 19:44:06 2006
@@ -5,7 +5,6 @@
 require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractListAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/admin/forms/GroupFilterForm.class.php";
-require_once XOOPS_MODULE_PATH . "/user/admin/class/XoopsGroupEx.class.php";
 
 class User_GroupListAction extends User_AbstractListAction
 {
@@ -23,18 +22,13 @@
 
 	function _getBaseUrl()
 	{
-		return "./index.php?action=GroupsList";
+		return "./index.php?action=GroupList";
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
-		$groups = array();
-		foreach ($this->mObjects as $_group) {
-			$groups[] =& new XoopsGroupEx($_group);
-		}
-
 		$render->setTemplateName("group_list.html");
-		$render->setAttribute("objects", $groups);
+		$render->setAttribute("objects", $this->mObjects);
 		$render->setAttribute("pageNavi", $this->mNavi);
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:44:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:44:19 +0900
Subject: [xoops-cvslog 3563] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104419.292E72AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php:1.1.2.3	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupMemberAction.class.php	Thu Jul 13 19:44:19 2006
@@ -1,17 +1,27 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupMemberAction.class.php,v 1.1.2.4 2006/07/13 10:44:19 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH."/class/XCube_PageNavigator.class.php";
-require_once XOOPS_MODULE_PATH."/user/admin/class/XoopsGroupEx.class.php";
 require_once XOOPS_MODULE_PATH."/user/admin/forms/GroupMemberEditForm.class.php";
 
+define ('USER_GROUPMEMBER_DEFAULT_PERPAGE', 5);
+
 /**
- *
- * This function keeps difficult problems that this depens on the column's block of X2 theme format.
+ * This function keeps difficult problems that this depens on the column's
+ * block of X2 theme format.
  */
 class User_GroupMemberAction extends User_Action
 {
+	/**
+	 * Target group object
+	 * 
+	 * @var UserGroupsObject
+	 */
 	var $mGroup = null;
 	
 	/**
@@ -28,11 +38,6 @@
 	
 	var $mActionForm = null;
 
-	function isSecure()
-	{
-		return true;
-	}
-	
 	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		//
@@ -57,9 +62,9 @@
 		//
 		$total = $memberHandler->getUserCountByGroup($groupid);
 
-		$this->mPageNavi=new XCube_PageNavigator("./index.php?action=GroupMember", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=GroupMember", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
 		$this->mPageNavi->addExtra('groupid', $groupid);
-		$this->mPageNavi->setPerpage(5);
+		$this->mPageNavi->setPerpage(USER_GROUPMEMBER_DEFAULT_PERPAGE);
 
 		$this->mPageNavi->fetch();
 		
@@ -73,7 +78,7 @@
 		$this->mNoPageNavi=new XCube_PageNavigator("./index.php?action=GroupMember", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
 		$this->mNoPageNavi->addExtra('groupid', $groupid);
 		$this->mNoPageNavi->setPrefix("no");
-		$this->mNoPageNavi->setPerpage(5);
+		$this->mNoPageNavi->setPerpage(USER_GROUPMEMBER_DEFAULT_PERPAGE);
 
 		$this->mNoPageNavi->fetch();
 		
@@ -97,13 +102,18 @@
 		}
 
 		$memberHandler =& xoops_gethandler('member');
+		$userHandler =& xoops_getmodulehandler('users');
 		
 		foreach($this->mActionForm->get('uid') as $uid => $value) {
-			if ($value==1) {
-				$memberHandler->addUserToGroup($this->mGroup->getVar('groupid'), $uid);
-			}
-			elseif ($value==2) {
-				$memberHandler->removeUserFromGroup($this->mGroup->getVar('groupid'), $uid);
+			$user =& $userHandler->get($uid);
+			
+			if (is_object($user)) {
+				if ($value == 1) {
+					$memberHandler->addUserToGroup($this->mGroup->get('groupid'), $uid);
+				}
+				elseif ($value == 2) {
+					$memberHandler->removeUserFromGroup($this->mGroup->get('groupid'), $uid);
+				}
 			}
 		}
 		
@@ -113,28 +123,25 @@
 	function _loadGroup()
 	{
 		if (!is_object($this->mGroup)) {
-			$groupId = xoops_getrequest('groupid');
+			$id = xoops_getrequest('groupid');
 
-			$groupHandler =& xoops_gethandler('group');
-			$group =& $groupHandler->get($groupId);
-			if (is_object($group)) {
-				$this->mGroup =& new XoopsGroupEx($group);
-			}
+			$handler =& xoops_getmodulehandler('groups');
+			$this->mGroup =& $handler->get($id);
 		}
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("group_member.html");
-		$render->setAttribute("group",$this->mGroup);
+		$render->setAttribute("group", $this->mGroup);
 
-		$render->setAttribute("users",$this->mUsers);
-		$render->setAttribute("pageNavi",$this->mPageNavi);
+		$render->setAttribute("users", $this->mUsers);
+		$render->setAttribute("pageNavi", $this->mPageNavi);
 
-		$render->setAttribute("noUsers",$this->mNoUsers);
-		$render->setAttribute("noPageNavi",$this->mNoPageNavi);
+		$render->setAttribute("noUsers", $this->mNoUsers);
+		$render->setAttribute("noPageNavi", $this->mNoPageNavi);
 		
-		$render->setAttribute("actionForm",$this->mActionForm);
+		$render->setAttribute("actionForm", $this->mActionForm);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:44:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:44:51 +0900
Subject: [xoops-cvslog 3564] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104451.9F91C2AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.1	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php	Thu Jul 13 19:44:51 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobDeleteAction.class.php,v 1.1.2.2 2006/07/13 10:44:51 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['mailjob_id']) ? $_REQUEST['mailjob_id'] : 0;
+		return xoops_getrequest('mailjob_id');
 	}
 
 	function &_getHandler()
@@ -39,7 +43,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=MailjobList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:45:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:45:01 +0900
Subject: [xoops-cvslog 3565] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104501.3D68E2AC098@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.1	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php	Thu Jul 13 19:45:01 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobEditAction.class.php,v 1.1.2.2 2006/07/13 10:45:01 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -14,7 +18,7 @@
 	
 	function _getId()
 	{
-		return isset($_REQUEST['mailjob_id']) ? $_REQUEST['mailjob_id'] : 0;
+		return xoops_getrequest('mailjob_id');
 	}
 
 	function &_getHandler()
@@ -71,7 +75,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=MailjobList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:45:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:45:42 +0900
Subject: [xoops-cvslog 3566] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104542.5A4192AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.2	Wed May 24 18:44:11 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php	Thu Jul 13 19:45:42 2006
@@ -9,11 +9,7 @@
 	var $mMailjob = null;
 	var $mActionForm = null;
 	
-	function User_MailjobSendAction()
-	{
-	}
-
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		$id = intval(xoops_getrequest('mailjob_id'));
 		
@@ -35,7 +31,7 @@
 		}
 
 		//
-		//
+		// lazy load
 		//
 		$this->mMailjob->loadUser();
 		
@@ -57,11 +53,11 @@
 
 		$root =& XCube_Root::getSingleton();		
 		if ($this->mMailjob->get('is_pm')) {
-			$root->mEventManager->add("Module.User.Mailjob.Send", new XCube_InstanceDelegate($this, "sendPM"));
+			$this->mMailjob->mSend->add(array(&$this, "sendPM"));
 		}
 
 		if ($this->mMailjob->get('is_mail')) {
-			$root->mEventManager->add("Module.User.Mailjob.Send", new XCube_InstanceDelegate($this, "sendMail"));
+			$this->mMailjob->mSend->add(array(&$this, "sendMail"));
 		}
 
 		$this->mMailjob->send($xoopsUser);
@@ -78,11 +74,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader('./index.php?action=MailjobList', 1, _AD_USER_ERROR_MAILJOB_SEND_FAIL);
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
+		$controller->executeRedirect('./index.php?action=MailjobList', 1, _AD_USER_ERROR_MAILJOB_SEND_FAIL);
 	}
 
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
@@ -92,35 +84,26 @@
 		$render->setAttribute('actionForm', $this->mActionForm);
 	}
 
-	function sendPM(&$sender, &$eventArgs)
+	/**
+	 * [Notice]
+	 * Until private message will come to implement Service, we use pm object
+	 * directly.
+	 */
+	function sendPM(&$mailjob, &$to_user, &$from_user)
 	{
-		$root =& XCube_Root::getSingleton();
-		$serviceMgr =& $root->getServiceManager();
-		$pmService =& $serviceMgr->searchXCubeService('PrivateMessage');
+		$handler =& xoops_gethandler('privmessage');
 		
-		$pmClient =& new XCube_ServiceClient($pmService);
+		$pm =& $handler->create();
 		
-		//
-		// Convert body message.
-		//
-		$replaceEventArgs = array();
-		$replaceEventArgs['body'] = $eventArgs['mailjob']->get('body');
-		$replaceEventArgs['to_user'] =& $eventArgs['to_user'];
-		$replaceEventArgs['from_user'] =& $eventArgs['from_user'];
-		$replaceEventArgs['mailjob'] =& $eventArgs['mailjob'];
-		$root->mEventManager->raiseEvent('Module.User.Mailjob.ReplaceBody', $this, $replaceEventArgs);
+		$pm->set('subject', $mailjob->getReplaceTitle($to_user, $from_user));
+		$pm->set('msg_text', $mailjob->getReplaceBody($to_user, $from_user));
+		$pm->set('from_userid', $from_user->get('uid'));
+		$pm->set('to_userid', $to_user->get('uid'));
 		
-		$param = array(
-			'to_uid' => $eventArgs['to_user']->get('uid'),
-			'from_uid' => $eventArgs['from_user']->get('uid'),
-			'subject' => $eventArgs['mailjob']->get('title'),
-			'message' => $replaceEventArgs['body']
-		);
-		
-		$result =& $pmClient->call('send', $param);
+		$handler->insert($pm);
 	}
 
-	function sendMail(&$sender, &$eventArgs)
+	function sendMail(&$mailjob, $to_user, $from_user)
 	{
 		$xoopsMailer =& getMailer();
 		$xoopsMailer->useMail();
@@ -128,27 +111,16 @@
 		//
 		// Set To
 		//		
-		$xoopsMailer->setToUsers($eventArgs['to_user']);
+		$xoopsMailer->setToUsers($to_user);
 		
 		//
 		// Set From
 		//
-		$xoopsMailer->setFromEmail($eventArgs['mailjob']->get('from_email'));
-		$xoopsMailer->setFromName($eventArgs['mailjob']->get('from_name'));
+		$xoopsMailer->setFromEmail($mailjob->get('from_email'));
+		$xoopsMailer->setFromName($mailjob->get('from_name'));
 
-		//
-		// Convert body message.
-		//
-		$replaceEventArgs = array();
-		$replaceEventArgs['body'] = $eventArgs['mailjob']->get('body');
-		$replaceEventArgs['to_user'] =& $eventArgs['to_user'];
-		$replaceEventArgs['from_user'] =& $eventArgs['from_user'];
-		$replaceEventArgs['mailjob'] =& $eventArgs['mailjob'];
-		
-		$root =& XCube_Root::getSingleton();
-		$root->mEventManager->raiseEvent('Module.User.Mailjob.ReplaceBody', $this, $replaceEventArgs);
-		
-		$xoopsMailer->setBody($replaceEventArgs['body']);
+		$xoopsMailer->setSubject($mailjob->getReplaceTitle($to_user, $from_user));
+		$xoopsMailer->setBody($mailjob->getReplaceBody($to_user, $from_user));
 
 		//
 		// TODO Error handling.

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:45:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:45:54 +0900
Subject: [xoops-cvslog 3567] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104554.22A032AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/RanksDeleteAction.class.php	Thu Jul 13 19:45:54 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: RanksDeleteAction.class.php,v 1.1.2.3 2006/07/13 10:45:54 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['rank_id']) ? $_REQUEST['rank_id'] : 0;
+		return xoops_getrequest('rank_id');
 	}
 
 	function &_getHandler()
@@ -20,7 +24,7 @@
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new RanksAdminDeleteForm();
+		$this->mActionForm =& new User_RanksAdminDeleteForm();
 		$this->mActionForm->prepare();
 	}
 
@@ -38,7 +42,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=RanksList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=RanksList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:46:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:46:13 +0900
Subject: [xoops-cvslog 3568] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104613.398E62AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/UserDeleteAction.class.php	Thu Jul 13 19:46:13 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserDeleteAction.class.php,v 1.1.2.3 2006/07/13 10:46:13 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? $_REQUEST['uid'] : 0;
+		return xoops_getrequest('uid');
 	}
 
 	function &_getHandler()
@@ -20,10 +24,21 @@
 
 	function _setupActionForm()
 	{
-		$this->mActionForm =& new UserAdminDeleteForm();
+		$this->mActionForm =& new User_UserAdminDeleteForm();
 		$this->mActionForm->prepare();
 	}
 	
+	function _setupObject()
+	{
+		//
+		// It is not possible to delete the super administrator.
+		//
+		parent::_setupObject();
+		if (is_object($this->mObject) && $this->mObject->get('uid') == 1) {
+			$this->mObject = null;
+		}
+	}
+
 	function _doExecute()
 	{
 		$handler =& xoops_gethandler('member');
@@ -45,7 +60,12 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=UserList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=UserList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=UserList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:46:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:46:33 +0900
Subject: [xoops-cvslog 3569] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104633.142672AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.3	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php	Thu Jul 13 19:46:32 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserEditAction.class.php,v 1.1.2.4 2006/07/13 10:46:32 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+		return xoops_getrequest('uid');
 	}
 	
 	function &_getHandler()
@@ -24,10 +28,10 @@
 		$this->mActionForm->prepare();
 	}
 
-	function executeViewInput(&$controller,&$xoopsUser,&$render)
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("user_edit.html");
-		$render->setAttribute("actionForm",$this->mActionForm);
+		$render->setAttribute("actionForm", $this->mActionForm);
 
 		//
 		// Get some objects for input form.
@@ -38,7 +42,7 @@
 		$render->setAttribute('timezones', $timezones);
 
 		$rankHandler =& xoops_getmodulehandler('ranks');
-		$ranks =& $rankHandler->getObjects(new Criteria('rank_special',1));
+		$ranks =& $rankHandler->getObjects(new Criteria('rank_special', 1));
 
 		$render->setAttribute('ranks', $ranks);
 		
@@ -64,12 +68,13 @@
 		$uorderOptions = array(0 => _OLDESTFIRST, 1 => _NEWESTFIRST);
 		$render->setAttribute('uorderOptions', $uorderOptions);
 
-
 		//
 		// notify option
 		//
 
-		// Because abstract message catalog style is not decided, we load directly.
+		//
+		// TODO Because abstract message catalog style is not decided, we load directly.
+		//
 		$root =& XCube_Root::getSingleton();
 		require_once XOOPS_ROOT_PATH . "/language/" . $root->mController->getConfig('language') . "/notification.php";
 		require_once XOOPS_ROOT_PATH . "/include/notification_constants.php";
@@ -87,14 +92,19 @@
 		$render->setAttribute('notify_modeOptions', $modeOptions);
 	}
 
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
 		$controller->executeForward("./index.php?action=UserList");
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("index.php", 1, "*ERROR*");
+		$controller->executeRedirect("index.php", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=UserList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:47:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:47:17 +0900
Subject: [xoops-cvslog 3570] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104717.E3A552AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/UserListAction.class.php:1.1.2.3	Sat Jul  1 13:22:31 2006
+++ xoops2jp/html/modules/user/admin/actions/UserListAction.class.php	Thu Jul 13 19:47:17 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserListAction.class.php,v 1.1.2.4 2006/07/13 10:47:17 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -10,7 +14,7 @@
 {
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('user');
+		$handler =& xoops_getmodulehandler('users');
 		return $handler;
 	}
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:48:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:48:04 +0900
Subject: [xoops-cvslog 3571] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060713104804.841EE2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php:1.1.2.1	Tue Apr 11 18:16:26 2006
+++ xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php	Thu Jul 13 19:48:04 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserSearchAction.class.php,v 1.1.2.2 2006/07/13 10:48:04 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -21,33 +25,11 @@
 		return USER_FRAME_VIEW_INPUT;
 	}
 	
-	function execute(&$controller, &$xoopsUser)
-	{
-		$this->mActionForm->fetch();
-		$this->mActionForm->validate();
-		
-		if ($this->mActionForm->hasError()) {
-			return $this->getDefaultView();
-		}
-		
-		return USER_FRAME_VIEW_SUCCESS;
-	}
-	
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("user_search.html");
 		$render->setAttribute("actionForm", $this->mActionForm);
 	}
-
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		$controller->executeForward("./index.php?action=UserSearchList");
-	}
-
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
-	{
-		XCube_Utils::redirectHeader("index.php", 1, "*ERROR*");
-	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:48:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:48:19 +0900
Subject: [xoops-cvslog 3572] CVS update: xoops2jp/html/modules/user/admin/class
Message-ID: <20060713104819.345692AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php
diff -u xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:removed
--- xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php:1.1.2.3	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/admin/class/XoopsGroupEx.class.php	Thu Jul 13 19:48:19 2006
@@ -1,32 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * This extends XoopsGroup to that user group list can get count of users.
- */
-class XoopsGroupEx extends XoopsGroup
-{
-	/**
-	 * $group is used for initialize. This class is no adapter pattern.
-	 * @param $group XoopsGroup
-	 */
-	function XoopsGroupEx($group = null)
-	{
-		parent::XoopsGroup();
-		$this->initVar('user_count', XOBJ_DTYPE_INT, null, false);
-
-		$this->setVar('groupid', $group->get('groupid'));
-		$this->setVar('name', $group->get('name'));
-		$this->setVar('description', $group->get('description'));
-		$this->setVar('group_type', $group->get('group_type'));
-
-		if (is_object($group)) {
-			$memberHandler =& xoops_gethandler('member');
-
-			$this->setVar('user_count', $memberHandler->getUserCountByGroup($this->get('groupid')));
-		}
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:48:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:48:38 +0900
Subject: [xoops-cvslog 3573] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104838.43C742AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php:1.1.2.3	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/AvatarAdminDeleteForm.class.php	Thu Jul 13 19:48:38 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarAdminDeleteForm.class.php,v 1.1.2.4 2006/07/13 10:48:38 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,11 +11,11 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class AvatarAdminDeleteForm extends XCube_ActionForm
+class User_AvatarAdminDeleteForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.user.AvatarAdminDeleteForm.TOKEN";
+		return "module.user.AvatarAdminDeleteForm.TOKEN" . $this->get('avatar_id');
 	}
 
 	function prepare()

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:48:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:48:48 +0900
Subject: [xoops-cvslog 3574] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104848.CF2092AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php:1.1.2.3	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/AvatarAdminEditForm.class.php	Thu Jul 13 19:48:48 2006
@@ -7,7 +7,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class AvatarAdminEditForm extends XCube_ActionForm
+class User_AvatarAdminEditForm extends XCube_ActionForm
 {
 	var $mOldFileName = null;
 	var $_mIsNew = false;
@@ -15,7 +15,7 @@
 	
 	function getTokenName()
 	{
-		return "module.user.AvatarAdminEditForm.TOKEN";
+		return "module.user.AvatarAdminEditForm.TOKEN" . $this->get('avatar_id');
 	}
 
 	function prepare()

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:48:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:48:57 +0900
Subject: [xoops-cvslog 3575] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104857.963562AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/AvatarFilterForm.class.php	Thu Jul 13 19:48:57 2006
@@ -1,10 +1,13 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarFilterForm.class.php,v 1.1.2.3 2006/07/13 10:48:57 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
 
-define('AVATAR_SORT_KEY_DEFAULT', 0);
 define('AVATAR_SORT_KEY_AVATAR_ID', 1);
 define('AVATAR_SORT_KEY_AVATAR_FILE', 2);
 define('AVATAR_SORT_KEY_AVATAR_NAME', 3);
@@ -15,11 +18,11 @@
 define('AVATAR_SORT_KEY_AVATAR_TYPE', 8);
 define('AVATAR_SORT_KEY_MAXVALUE', 8);
 
+define('AVATAR_SORT_KEY_DEFAULT', AVATAR_SORT_KEY_AVATAR_ID);
+
 class User_AvatarFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
-		AVATAR_SORT_KEY_DEFAULT => 'avatar_id',
+	var $mSortKeys = array(
 		AVATAR_SORT_KEY_AVATAR_ID => 'avatar_id',
 		AVATAR_SORT_KEY_AVATAR_FILE => 'avatar_file',
 		AVATAR_SORT_KEY_AVATAR_NAME => 'avatar_name',
@@ -29,47 +32,26 @@
 		AVATAR_SORT_KEY_AVATAR_WEIGHT => 'avatar_weight',
 		AVATAR_SORT_KEY_AVATAR_TYPE => 'avatar_type'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
 	
-		if ($this->mSort > AVATAR_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)]) {
 			$this->mSort = AVATAR_SORT_KEY_DEFAULT;
 		}
 	
-		if (isset($_REQUEST['avatar_id'])) {
-			$this->_mCriteria->add(new Criteria('avatar_id', array(XOBJ_DTYPE_INT, xoops_getrequest('avatar_id'))));
-		}
-	
-		if (isset($_REQUEST['avatar_file'])) {
-			$this->_mCriteria->add(new Criteria('avatar_file', array(XOBJ_DTYPE_STRING, xoops_getrequest('avatar_file'))));
-		}
-	
-		if (isset($_REQUEST['avatar_name'])) {
-			$this->_mCriteria->add(new Criteria('avatar_name', array(XOBJ_DTYPE_STRING, xoops_getrequest('avatar_name'))));
-		}
-	
-		if (isset($_REQUEST['avatar_mimetype'])) {
-			$this->_mCriteria->add(new Criteria('avatar_mimetype', array(XOBJ_DTYPE_STRING, xoops_getrequest('avatar_mimetype'))));
-		}
-	
-		if (isset($_REQUEST['avatar_created'])) {
-			$this->_mCriteria->add(new Criteria('avatar_created', array(XOBJ_DTYPE_INT, xoops_getrequest('avatar_created'))));
-		}
-	
 		if (isset($_REQUEST['avatar_display'])) {
+			$this->_mNavi->addExtra('avatar_display', xoops_getrequest('avatar_display'));
 			$this->_mCriteria->add(new Criteria('avatar_display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('avatar_display'))));
 		}
 	
-		if (isset($_REQUEST['avatar_weight'])) {
-			$this->_mCriteria->add(new Criteria('avatar_weight', array(XOBJ_DTYPE_INT, xoops_getrequest('avatar_weight'))));
-		}
-	
 		if (isset($_REQUEST['avatar_type'])) {
+			$this->_mNavi->addExtra('avatar_type', xoops_getrequest('avatar_type'));
 			$this->_mCriteria->add(new Criteria('avatar_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('avatar_type'))));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:49:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:49:06 +0900
Subject: [xoops-cvslog 3576] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104906.D1CB12AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php:1.1.2.3	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupAdminDeleteForm.class.php	Thu Jul 13 19:49:06 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupAdminDeleteForm.class.php,v 1.1.2.4 2006/07/13 10:49:06 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,11 +11,11 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class GroupAdminDeleteForm extends XCube_ActionForm
+class User_GroupAdminDeleteForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.user.GroupAdminDeleteForm.TOKEN";
+		return "module.user.GroupAdminDeleteForm.TOKEN" . $this->get('group_id');
 	}
 
 	function prepare()

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:49:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:49:15 +0900
Subject: [xoops-cvslog 3577] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104915.C1A902AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php:1.1.2.1
--- /dev/null	Thu Jul 13 19:49:15 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupAdminEditForm.class.php	Thu Jul 13 19:49:15 2006
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package user
+ * @version $Id: GroupAdminEditForm.class.php,v 1.1.2.1 2006/07/13 10:49:15 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+
+class User_GroupAdminEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.GroupAdminEditForm.TOKEN" . $this->get('groupid');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['groupid'] =& new XCube_IntProperty('groupid');
+		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
+		$this->mFormProperties['description'] =& new XCube_TextProperty('description');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['groupid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['groupid']->setDependsByArray(array('required'));
+		$this->mFieldProperties['groupid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUPID);
+	
+		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['name']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_GROUP_NAME, '50');
+		$this->mFieldProperties['name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_GROUP_NAME, '50');
+		$this->mFieldProperties['name']->addVar('maxlength', '50');
+	}
+
+	function load(&$obj)
+	{
+		$this->set('groupid', $obj->get('groupid'));
+		$this->set('name', $obj->get('name'));
+		$this->set('description', $obj->get('description'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('groupid', $this->get('groupid'));
+		$obj->set('name', $this->get('name'));
+		$obj->set('description', $this->get('description'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:49:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:49:22 +0900
Subject: [xoops-cvslog 3578] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713104923.018F02AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php:1.1.2.5	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupEditForm.class.php	Thu Jul 13 19:49:22 2006
@@ -1,49 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
-
-/**
- * This class is generated by makeActionForm tool.
- * @auchor makeActionForm
- */
-class User_GroupEditForm extends XCube_ActionForm 
-{
-	function getTokenName()
-	{
-		return "module.user.GroupEditForm.TOKEN";
-	}
-
-	function prepare()
-	{
-		// set properties
-		$this->mFormProperties['groupid']=new XCube_IntProperty('groupid');
-		$this->mFormProperties['name']=new XCube_StringProperty('name');
-		$this->mFormProperties['description']=new XCube_TextProperty('description');
-
-		// set fields
-		$this->mFieldProperties['name']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['name']->addMessage("required",_AD_USER_ERROR_REQUIRED,_AD_USER_LANG_NAME,"100");
-		$this->mFieldProperties['name']->addMessage("maxlength",_AD_USER_ERROR_MAXLENGTH,_AD_USER_LANG_NAME,"100");
-		$this->mFieldProperties['name']->addVar("maxlength",100);
-
-	}
-
-	function load(&$group)
-	{
-		$this->set('groupid', $group->get('groupid'));
-		$this->set('name', $group->get('name'));
-		$this->set('description', $group->get('description'));
-	}
-
-	function update(&$group)
-	{
-		$group->setVar('groupid', $this->get('groupid'));
-		$group->setVar('name', $this->get('name'));
-		$group->setVar('description', $this->get('description'));
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:50:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:50:06 +0900
Subject: [xoops-cvslog 3579] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105006.3865D2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.3	Tue Apr 11 18:55:25 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php	Thu Jul 13 19:50:06 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupFilterForm.class.php,v 1.1.2.4 2006/07/13 10:50:06 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -14,35 +18,38 @@
 
 class User_GroupFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		GROUP_SORT_KEY_DEFAULT => 'groupid',
 		GROUP_SORT_KEY_GROUPID => 'groupid',
 		GROUP_SORT_KEY_NAME => 'name',
 		GROUP_SORT_KEY_DESCRIPTION => 'description',
 		GROUP_SORT_KEY_GROUP_TYPE => 'group_type'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : GROUP_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > GROUP_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = GROUP_SORT_KEY_DEFAULT;
 		}
 	
 		if (isset($_REQUEST['groupid'])) {
-			$this->_mCriteria->add(new Criteria('groupid', array(XOBJ_DTYPE_INT, xoops_getrequest('groupid'))));
+			$this->_mNavi->addExtra('groupid', xoops_getrequest('groupid'));
+			$this->_mCriteria->add(new Criteria('groupid', xoops_getrequest('groupid')));
 		}
 	
 		if (isset($_REQUEST['name'])) {
-			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+			$this->_mNavi->addExtra('name', xoops_getrequest('name'));
+			$this->_mCriteria->add(new Criteria('name', xoops_getrequest('name')));
 		}
 	
 		if (isset($_REQUEST['group_type'])) {
-			$this->_mCriteria->add(new Criteria('group_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('group_type'))));
+			$this->_mNavi->addExtra('group_type', xoops_getrequest('group_type'));
+			$this->_mCriteria->add(new Criteria('group_type', xoops_getrequest('group_type')));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:50:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:50:22 +0900
Subject: [xoops-cvslog 3580] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105022.436522AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.1	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php	Thu Jul 13 19:50:22 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobAdminDeleteForm.class.php,v 1.1.2.2 2006/07/13 10:50:22 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.user.MailjobAdminDeleteForm.TOKEN";
+		return "module.user.MailjobAdminDeleteForm.TOKEN" . $this->get('mailjob_id');
 	}
 
 	function prepare()
@@ -22,7 +26,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['mailjob_id']->setDependsByArray(array('required'));
 		$this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID);

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:50:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:50:32 +0900
Subject: [xoops-cvslog 3581] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105032.5DFA12AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.1	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php	Thu Jul 13 19:50:32 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobAdminEditForm.class.php,v 1.1.2.2 2006/07/13 10:50:32 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -28,7 +32,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['mailjob_id']->setDependsByArray(array('required'));
 		$this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID);

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:50:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:50:40 +0900
Subject: [xoops-cvslog 3582] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105040.EE38D2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.1	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php	Thu Jul 13 19:50:40 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobAdminSendForm.class.php,v 1.1.2.2 2006/07/13 10:50:40 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,7 +13,7 @@
 {
 	function getTokenName()
 	{
-		return "module.user.MailjobAdminSendForm.TOKEN";
+		return "module.user.MailjobAdminSendForm.TOKEN" . $this->get('mailjob_id');
 	}
 
 	function prepare()
@@ -22,7 +26,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['mailjob_id'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['mailjob_id']->setDependsByArray(array('required'));
 		$this->mFieldProperties['mailjob_id']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_MAILJOB_ID);

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:50:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:50:53 +0900
Subject: [xoops-cvslog 3583] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105053.880592AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.3	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php	Thu Jul 13 19:50:53 2006
@@ -18,7 +18,6 @@
 
 class User_MailjobFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
 	var $mSortKeys = array(
 		MAILJOB_SORT_KEY_MAILJOB_ID => 'mailjob_id',
 		MAILJOB_SORT_KEY_TITLE => 'title',
@@ -29,13 +28,12 @@
 		MAILJOB_SORT_KEY_IS_MAIL => 'is_mail',
 		MAILJOB_SORT_KEY_CREATE_UNIXTIME => 'create_unixtime'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : MAILJOB_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > MAILJOB_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = MAILJOB_SORT_KEY_DEFAULT;
 		}
 	
@@ -49,12 +47,12 @@
 	
 		if (isset($_REQUEST['is_pm'])) {
 			$this->_mNavi->addExtra('is_pm', xoops_getrequest('is_pm'));
-			$this->_mCriteria->add(new Criteria('is_pm', array(XOBJ_DTYPE_BOOL, xoops_getrequest('is_pm'))));
+			$this->_mCriteria->add(new Criteria('is_pm', xoops_getrequest('is_pm')));
 		}
 	
 		if (isset($_REQUEST['is_mail'])) {
 			$this->_mNavi->addExtra('is_mail', xoops_getrequest('is_mail'));
-			$this->_mCriteria->add(new Criteria('is_mail', array(XOBJ_DTYPE_BOOL, xoops_getrequest('is_mail'))));
+			$this->_mCriteria->add(new Criteria('is_mail', xoops_getrequest('is_mail')));
 		}
 		
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:51:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:51:00 +0900
Subject: [xoops-cvslog 3584] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105100.486C82AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RankActionFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RankActionFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/RankActionFilterForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/RankActionFilterForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RankActionFilterForm.class.php	Thu Jul 13 19:51:00 2006
@@ -1,56 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-define("RANK_SORT_KEY_DEFAULT",  0);
-define("RANK_SORT_KEY_ID",       1);
-define("RANK_SORT_KEY_TITLE",    2);
-define("RANK_SORT_KEY_MIN",      3);
-define("RANK_SORT_KEY_MAX",      4);
-define("RANK_SORT_KEY_SPECIAL",  5);
-define("RANK_SORT_KEY_IMAGE",    6);
-
-define("RANK_SORT_KEY_MAXVALUE", 6);
-
-/**
- *
- */
-class RankActionFilterForm
-{
-	var $mSpecial=null;
-
-	var $mSortKey=0;
-
-	var $_mSortKeys=array(
-		RANK_SORT_KEY_DEFAULT    => "rank_id",
-		RANK_SORT_KEY_ID         => "rank_id",
-		RANK_SORT_KEY_TITLE      => "rank_title",
-		RANK_SORT_KEY_MIN        => "rank_min",
-		RANK_SORT_KEY_MAX        => "rank_max",
-		RANK_SORT_KEY_SPECIAL    => "rank_special",
-		RANK_SORT_KEY_IMAGE      => "rank_image"
-	);
-
-	function fetch()
-	{
-		$this->mSpecial=isset($_REQUEST['special']) ? intval($_REQUEST['special']) : null;
-
-		$this->mSortKey=isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-
-		if($this->mSortKey>RANK_SORT_KEY_MAXVALUE)
-			$this->mSortKey=0;
-	}
-
-	function getSort()
-	{
-		$sortkey=abs($this->mSortKey);
-		return $this->_mSortKeys[$sortkey];
-	}
-	
-	function getOrder()
-	{
-		return ($this->mSortKey < 0) ? "DESC" : "ASC";
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:51:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:51:16 +0900
Subject: [xoops-cvslog 3585] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105116.4724E2AC062@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php:1.1.2.3	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksAdminDeleteForm.class.php	Thu Jul 13 19:51:16 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: RanksAdminDeleteForm.class.php,v 1.1.2.4 2006/07/13 10:51:16 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,11 +11,11 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class RanksAdminDeleteForm extends XCube_ActionForm
+class User_RanksAdminDeleteForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.user.RanksAdminDeleteForm.TOKEN";
+		return "module.user.RanksAdminDeleteForm.TOKEN" . $this->get('rank_id');
 	}
 
 	function prepare()

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:51:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:51:28 +0900
Subject: [xoops-cvslog 3586] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105128.3FF322AC071@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.4	Wed Jul 12 19:50:47 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php	Thu Jul 13 19:51:28 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacyRender
- * @version $Id: RanksFilterForm.class.php,v 1.1.2.4 2006/07/12 10:50:47 minahito Exp $
+ * @version $Id: RanksFilterForm.class.php,v 1.1.2.5 2006/07/13 10:51:28 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -31,7 +31,7 @@
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : RANKS_SORT_KEY_DEFAULT;
 	
-		if (!isset($this->mSortKeys[$this->mSort])) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = RANKS_SORT_KEY_DEFAULT;
 		}
 	

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:51:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:51:34 +0900
Subject: [xoops-cvslog 3587] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105134.66BD02AC071@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserActionFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserActionFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/UserActionFilterForm.class.php:removed
--- xoops2jp/html/modules/user/admin/forms/UserActionFilterForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/UserActionFilterForm.class.php	Thu Jul 13 19:51:34 2006
@@ -1,54 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-define("USER_SORT_KEY_DEFAULT",  0);
-define("USER_SORT_KEY_UID",      1);
-define("USER_SORT_KEY_UNAME",    2);
-define("USER_SORT_KEY_NAME",     3);
-define("USER_SORT_KEY_REGDATE",  4);
-define("USER_SORT_KEY_LASTLOGIN",5);
-define("USER_SORT_KEY_POSTS",    6);
-define("USER_SORT_KEY_LEVEL",    7);
-
-define("USER_SORT_KEY_MAXVALUE", 7);
-
-/**
- *
- */
-class UserActionFilterForm
-{
-	var $mSortKey=0;
-
-	var $_mSortKeys=array(
-		USER_SORT_KEY_DEFAULT    => "uid",
-		USER_SORT_KEY_UID        => "uid",
-		USER_SORT_KEY_UNAME      => "uname",
-		USER_SORT_KEY_NAME       => "name",
-		USER_SORT_KEY_REGDATE    => "user_regdate",
-		USER_SORT_KEY_LASTLOGIN  => "last_login",
-		USER_SORT_KEY_POSTS      => "posts",
-		USER_SORT_KEY_LEVEL      => "level"
-	);
-
-	function fetch()
-	{
-		$this->mSortKey=isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-
-		if($this->mSortKey>USER_SORT_KEY_MAXVALUE)
-			$this->mSortKey=0;
-	}
-
-	function getSort()
-	{
-		$sortkey=abs($this->mSortKey);
-		return $this->_mSortKeys[$sortkey];
-	}
-	
-	function getOrder()
-	{
-		return ($this->mSortKey < 0) ? "DESC" : "ASC";
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:51:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:51:43 +0900
Subject: [xoops-cvslog 3588] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105143.380772AC098@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.3 xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php:1.1.2.3	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminDeleteForm.class.php	Thu Jul 13 19:51:43 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserAdminDeleteForm.class.php,v 1.1.2.4 2006/07/13 10:51:43 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,11 +11,11 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class UserAdminDeleteForm extends XCube_ActionForm
+class User_UserAdminDeleteForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
-		return "module.user.UserAdminDeleteForm.TOKEN";
+		return "module.user.UserAdminDeleteForm.TOKEN" . $this->get('uid');
 	}
 
 	function prepare()

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:52:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:52:08 +0900
Subject: [xoops-cvslog 3589] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105208.4247F2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.8 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.9
--- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.8	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php	Thu Jul 13 19:52:08 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserAdminEditForm.class.php,v 1.1.2.9 2006/07/13 10:52:08 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -6,6 +10,8 @@
 
 /**
  * This class is generated by makeActionForm tool.
+ * 
+ * TODO We may have to check the format of URL.
  */
 class User_UserAdminEditForm extends XCube_ActionForm
 {
@@ -13,7 +19,7 @@
 	
 	function getTokenName()
 	{
-		return "module.user.UserAdminEditForm.Token";
+		return "module.user.UserAdminEditForm.Token" . $this->get('uid');
 	}
 	
 	function prepare()
@@ -89,13 +95,6 @@
 		$this->mFieldProperties['user_from']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_FROM, '100');
 		$this->mFieldProperties['user_from']->addVar('maxlength', 100);
 
-		$this->mFieldProperties['user_sig'] =& new XCube_FieldProperty($this);
-//		$this->mFieldProperties['user_sig']->setDependsByArray(array(''));
-//		$this->mFieldProperties['user_sig']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_USER_SIG);
-
-		$this->mFieldProperties['user_viewemail'] =& new XCube_FieldProperty($this);
-//		$this->mFieldProperties['user_viewemail']->setDependsByArray(array(''));
-
 		$this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['user_aim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_AIM, '18');
@@ -125,9 +124,6 @@
 		$this->mFieldProperties['posts']->setDependsByArray(array('required'));
 		$this->mFieldProperties['posts']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_POSTS);
 
-		$this->mFieldProperties['attachsig'] =& new XCube_FieldProperty($this);
-//		$this->mFieldProperties['attachsig']->setDependsByArray(array(''));
-
 		$this->mFieldProperties['rank'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['rank']->setDependsByArray(array('required'));
 		$this->mFieldProperties['rank']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_RANK);
@@ -170,16 +166,10 @@
 		$this->mFieldProperties['user_occ']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_OCC, '100');
 		$this->mFieldProperties['user_occ']->addVar('maxlength', 100);
 
-		$this->mFieldProperties['bio'] =& new XCube_FieldProperty($this);
-//		$this->mFieldProperties['bio']->setDependsByArray(array(''));
-
 		$this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['user_intrest']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_INTREST, '150');
 		$this->mFieldProperties['user_intrest']->addVar('maxlength', 150);
-
-		$this->mFieldProperties['user_mailok'] =& new XCube_FieldProperty($this);
-//		$this->mFieldProperties['user_mailok']->setDependsByArray(array(''));
 	}
 	
 	function validateUname()
@@ -196,6 +186,16 @@
 		}
 	}
 	
+	function validateUrl()
+	{
+		$t_url = $this->get('url');
+		if (strlen($t_url) > 0) {
+			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$', $t_url)) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_URL));
+			}
+		}
+	}
+	
 	function validateGroups()
 	{
 		$groupHandler =& xoops_gethandler('group');
@@ -221,6 +221,23 @@
 		}
 	}
 	
+	function validateRank()
+	{
+		$t_rank = $this->get('rank');
+		
+		if ($t_rank > 0) {
+			$handler =& xoops_getmodulehandler('ranks', 'user');
+			$rank =& $handler->get($t_rank);
+			
+			if (!is_object($rank)) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
+			}
+			elseif ($rank->get('rank_special') != 1) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_RANK));
+			}
+		}
+	}
+	
 	function validateUmode()
 	{
 		if (!in_array($this->get('umode'), array('nest', 'flat', 'thread'))) {
@@ -268,37 +285,36 @@
 
 	function update(&$obj)
 	{
-		$obj->setVar('uid', $this->get('uid'));
-		$obj->setVar('name', $this->get('name'));
-		$obj->setVar('uname', $this->get('uname'));
-		$obj->setVar('email', $this->get('email'));
-		$obj->setVar('url', $this->get('url'));
-		$obj->setVar('user_icq', $this->get('user_icq'));
-		$obj->setVar('user_from', $this->get('user_from'));
-		$obj->setVar('user_sig', $this->get('user_sig'));
-		$obj->setVar('user_viewemail', $this->get('user_viewemail'));
-		$obj->setVar('user_aim', $this->get('user_aim'));
-		$obj->setVar('user_yim', $this->get('user_yim'));
-		$obj->setVar('user_msnm', $this->get('user_msnm'));
+		$obj->set('uid', $this->get('uid'));
+		$obj->set('name', $this->get('name'));
+		$obj->set('uname', $this->get('uname'));
+		$obj->set('email', $this->get('email'));
+		$obj->set('url', $this->get('url'));
+		$obj->set('user_icq', $this->get('user_icq'));
+		$obj->set('user_from', $this->get('user_from'));
+		$obj->set('user_sig', $this->get('user_sig'));
+		$obj->set('user_viewemail', $this->get('user_viewemail'));
+		$obj->set('user_aim', $this->get('user_aim'));
+		$obj->set('user_yim', $this->get('user_yim'));
+		$obj->set('user_msnm', $this->get('user_msnm'));
 
 		if (strlen($this->get('pass'))) {
 			$obj->set('pass', md5($this->get('pass')));
 		}
 
-		$obj->setVar('posts', $this->get('posts'));
-		$obj->setVar('attachsig', $this->get('attachsig'));
-		$obj->setVar('rank', $this->get('rank'));
-		$obj->setVar('level', $this->get('level'));
-		$obj->setVar('timezone_offset', $this->get('timezone_offset'));
-		$obj->setVar('umode', $this->get('umode'));
-		$obj->setVar('uorder', $this->get('uorder'));
-		$obj->setVar('notify_method', $this->get('notify_method'));
-		$obj->setVar('notify_mode', $this->get('notify_mode'));
-		$obj->setVar('user_occ', $this->get('user_occ'));
-		$obj->setVar('bio', $this->get('bio'));
-		$obj->setVar('user_intrest', $this->get('user_intrest'));
-		$obj->setVar('user_mailok', $this->get('user_mailok'));
-//		$obj->setVar('groups', $this->get('groups'));
+		$obj->set('posts', $this->get('posts'));
+		$obj->set('attachsig', $this->get('attachsig'));
+		$obj->set('rank', $this->get('rank'));
+		$obj->set('level', $this->get('level'));
+		$obj->set('timezone_offset', $this->get('timezone_offset'));
+		$obj->set('umode', $this->get('umode'));
+		$obj->set('uorder', $this->get('uorder'));
+		$obj->set('notify_method', $this->get('notify_method'));
+		$obj->set('notify_mode', $this->get('notify_mode'));
+		$obj->set('user_occ', $this->get('user_occ'));
+		$obj->set('bio', $this->get('bio'));
+		$obj->set('user_intrest', $this->get('user_intrest'));
+		$obj->set('user_mailok', $this->get('user_mailok'));
 		
 		$obj->Groups = array();
 		$groups = $this->get('groups');

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:52:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:52:22 +0900
Subject: [xoops-cvslog 3590] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105222.AD7AB2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.4	Sun May 28 14:42:40 2006
+++ xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php	Thu Jul 13 19:52:22 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserFilterForm.class.php,v 1.1.2.5 2006/07/13 10:52:22 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -39,9 +43,12 @@
 
 define('USER_SORT_KEY_DEFAULT', USER_SORT_KEY_UID);
 
+/**
+ * [Notice]
+ * We should have our policy about filtering items.
+ */
 class User_UserFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
 	var $mSortKeys = array(
 		USER_SORT_KEY_UID => 'uid',
 		USER_SORT_KEY_NAME => 'name',
@@ -75,130 +82,48 @@
 		USER_SORT_KEY_USER_INTREST => 'user_intrest',
 		USER_SORT_KEY_USER_MAILOK => 'user_mailok'
 	);
-	var $_mCriteria = null;
 
 	function fetch()
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKeys[abs($this->mSort)])) {
 			$this->mSort = USER_SORT_KEY_DEFAULT;
 		}
 	
 		if (isset($_REQUEST['uid'])) {
-			$this->_mCriteria->add(new Criteria('uid', array(XOBJ_DTYPE_INT, xoops_getrequest('uid'))));
+			$this->_mNavi->addExtra('uid', xoops_getrequest('uid'));
+			$this->_mCriteria->add(new Criteria('uid', xoops_getrequest('uid')));
 		}
-	
-		if (isset($_REQUEST['name'])) {
-			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
-		}
-	
-		if (isset($_REQUEST['uname'])) {
-			$this->_mCriteria->add(new Criteria('uname', array(XOBJ_DTYPE_STRING, xoops_getrequest('uname'))));
-		}
-	
+
 		if (isset($_REQUEST['email'])) {
-			$this->_mCriteria->add(new Criteria('email', array(XOBJ_DTYPE_STRING, xoops_getrequest('email'))));
-		}
-	
-		if (isset($_REQUEST['url'])) {
-			$this->_mCriteria->add(new Criteria('url', array(XOBJ_DTYPE_STRING, xoops_getrequest('url'))));
-		}
-	
-		if (isset($_REQUEST['user_avatar'])) {
-			$this->_mCriteria->add(new Criteria('user_avatar', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_avatar'))));
-		}
-	
-		if (isset($_REQUEST['user_regdate'])) {
-			$this->_mCriteria->add(new Criteria('user_regdate', array(XOBJ_DTYPE_INT, xoops_getrequest('user_regdate'))));
-		}
-	
-		if (isset($_REQUEST['user_icq'])) {
-			$this->_mCriteria->add(new Criteria('user_icq', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_icq'))));
-		}
-	
-		if (isset($_REQUEST['user_from'])) {
-			$this->_mCriteria->add(new Criteria('user_from', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_from'))));
-		}
-	
-		if (isset($_REQUEST['user_viewemail'])) {
-			$this->_mCriteria->add(new Criteria('user_viewemail', array(XOBJ_DTYPE_BOOL, xoops_getrequest('user_viewemail'))));
-		}
-	
-		if (isset($_REQUEST['actkey'])) {
-			$this->_mCriteria->add(new Criteria('actkey', array(XOBJ_DTYPE_STRING, xoops_getrequest('actkey'))));
-		}
-	
-		if (isset($_REQUEST['user_aim'])) {
-			$this->_mCriteria->add(new Criteria('user_aim', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_aim'))));
-		}
-	
-		if (isset($_REQUEST['user_yim'])) {
-			$this->_mCriteria->add(new Criteria('user_yim', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_yim'))));
-		}
-	
-		if (isset($_REQUEST['user_msnm'])) {
-			$this->_mCriteria->add(new Criteria('user_msnm', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_msnm'))));
-		}
-	
-		if (isset($_REQUEST['pass'])) {
-			$this->_mCriteria->add(new Criteria('pass', array(XOBJ_DTYPE_STRING, xoops_getrequest('pass'))));
-		}
-	
-		if (isset($_REQUEST['posts'])) {
-			$this->_mCriteria->add(new Criteria('posts', array(XOBJ_DTYPE_INT, xoops_getrequest('posts'))));
+			$this->_mNavi->addExtra('email', xoops_getrequest('email'));
+			$this->_mCriteria->add(new Criteria('email', xoops_getrequest('email')));
 		}
 	
 		if (isset($_REQUEST['attachsig'])) {
-			$this->_mCriteria->add(new Criteria('attachsig', array(XOBJ_DTYPE_BOOL, xoops_getrequest('attachsig'))));
+			$this->_mNavi->addExtra('attachsig', xoops_getrequest('attachsig'));
+			$this->_mCriteria->add(new Criteria('attachsig', xoops_getrequest('attachsig')));
 		}
 	
 		if (isset($_REQUEST['rank'])) {
-			$this->_mCriteria->add(new Criteria('rank', array(XOBJ_DTYPE_INT, xoops_getrequest('rank'))));
+			$this->_mNavi->addExtra('rank', xoops_getrequest('rank'));
+			$this->_mCriteria->add(new Criteria('rank', xoops_getrequest('rank')));
 		}
 	
 		if (isset($_REQUEST['level'])) {
-			$this->_mCriteria->add(new Criteria('level', array(XOBJ_DTYPE_INT, xoops_getrequest('level'))));
-		}
-	
-		if (isset($_REQUEST['theme'])) {
-			$this->_mCriteria->add(new Criteria('theme', array(XOBJ_DTYPE_STRING, xoops_getrequest('theme'))));
+			$this->_mNavi->addExtra('level', xoops_getrequest('level'));
+			$this->_mCriteria->add(new Criteria('level', xoops_getrequest('level')));
 		}
 	
 		if (isset($_REQUEST['timezone_offset'])) {
-			$this->_mCriteria->add(new Criteria('timezone_offset', array(XOBJ_DTYPE_FLOAT, xoops_getrequest('timezone_offset'))));
-		}
-	
-		if (isset($_REQUEST['last_login'])) {
-			$this->_mCriteria->add(new Criteria('last_login', array(XOBJ_DTYPE_INT, xoops_getrequest('last_login'))));
-		}
-	
-		if (isset($_REQUEST['umode'])) {
-			$this->_mCriteria->add(new Criteria('umode', array(XOBJ_DTYPE_STRING, xoops_getrequest('umode'))));
-		}
-	
-		if (isset($_REQUEST['uorder'])) {
-			$this->_mCriteria->add(new Criteria('uorder', array(XOBJ_DTYPE_BOOL, xoops_getrequest('uorder'))));
-		}
-	
-		if (isset($_REQUEST['notify_method'])) {
-			$this->_mCriteria->add(new Criteria('notify_method', array(XOBJ_DTYPE_BOOL, xoops_getrequest('notify_method'))));
-		}
-	
-		if (isset($_REQUEST['notify_mode'])) {
-			$this->_mCriteria->add(new Criteria('notify_mode', array(XOBJ_DTYPE_BOOL, xoops_getrequest('notify_mode'))));
-		}
-	
-		if (isset($_REQUEST['user_occ'])) {
-			$this->_mCriteria->add(new Criteria('user_occ', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_occ'))));
-		}
-	
-		if (isset($_REQUEST['user_intrest'])) {
-			$this->_mCriteria->add(new Criteria('user_intrest', array(XOBJ_DTYPE_STRING, xoops_getrequest('user_intrest'))));
+			$this->_mNavi->addExtra('timezone_offset', xoops_getrequest('timezone_offset'));
+			$this->_mCriteria->add(new Criteria('timezone_offset', xoops_getrequest('timezone_offset')));
 		}
 	
 		if (isset($_REQUEST['user_mailok'])) {
-			$this->_mCriteria->add(new Criteria('user_mailok', array(XOBJ_DTYPE_BOOL, xoops_getrequest('user_mailok'))));
+			$this->_mNavi->addExtra('user_mailok', xoops_getrequest('user_mailok'));
+			$this->_mCriteria->add(new Criteria('user_mailok', xoops_getrequest('user_mailok')));
 		}
 		
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:52:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:52:34 +0900
Subject: [xoops-cvslog 3591] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105234.31FC42AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.1	Tue Apr 11 18:16:37 2006
+++ xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php	Thu Jul 13 19:52:34 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserSearchFilterForm.class.php,v 1.1.2.2 2006/07/13 10:52:34 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -42,8 +46,7 @@
 
 class User_UserSearchFilterForm extends User_AbstractFilterForm
 {
-	var $mSort = 0;
-	var $_mSortKeys = array(
+	var $mSortKeys = array(
 		USER_SORT_KEY_UID => 'uid',
 		USER_SORT_KEY_NAME => 'name',
 		USER_SORT_KEY_UNAME => 'uname',
@@ -76,7 +79,6 @@
 		USER_SORT_KEY_USER_INTREST => 'user_intrest',
 		USER_SORT_KEY_USER_MAILOK => 'user_mailok'
 	);
-	var $_mCriteria = null;
 
 	var $_mMatchFields = array ("uname", "name", "email", "user_icq", "user_aim", "user_yim", "user_msnm",
 	                            "url", "user_from", "user_occ", "user_intrest");
@@ -85,7 +87,7 @@
 	{
 		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
 	
-		if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
+		if (!isset($this->mSortKey[abs($this->mSort)])) {
 			$this->mSort = USER_SORT_KEY_DEFAULT;
 		}
 
@@ -101,12 +103,12 @@
 		
 		foreach ($this->_mMatchFields as $field) {
 			if (strlen($form->get($field)) > 0) {
-				$this->mNavi->addExtra($field, $form->get($field));
+				$this->_mNavi->addExtra($field, $form->get($field));
 				$this->_mCriteria->add(new Criteria($field, '%' . $form->get($field) . '%', 'LIKE'));
 			}
 		}
 		
-		$this->mNavi->addExtra('mail_condition', $form->get('mail_condition'));
+		$this->_mNavi->addExtra('mail_condition', $form->get('mail_condition'));
 		switch ($form->get('mail_condition')) {
 			case 1:
 				$this->_mCriteria->add(new Criteria('user_mailok', 1));
@@ -117,7 +119,7 @@
 				break;
 		}
 
-		$this->mNavi->addExtra('user_level', $form->get('user_level'));
+		$this->_mNavi->addExtra('user_level', $form->get('user_level'));
 		switch ($form->get('user_level')) {
 			case 1:
 				$this->_mCriteria->add(new Criteria('level', 0, '>'));
@@ -129,35 +131,35 @@
 		}
 		
 		if (strlen($form->get('over_posts')) > 0) {
-			$this->mNavi->addExtra('over_posts', $form->get('over_posts'));
+			$this->_mNavi->addExtra('over_posts', $form->get('over_posts'));
 			$this->_mCriteria->add(new Criteria('posts', $form->get('over_posts'), '>='));
 		}
 
 		if (strlen($form->get('under_posts')) > 0) {
-			$this->mNavi->addExtra('under_posts', $form->get('under_posts'));
+			$this->_mNavi->addExtra('under_posts', $form->get('under_posts'));
 			$this->_mCriteria->add(new Criteria('posts', $form->get('under_posts'), '<='));
 		}
 
 		if (strlen($form->get('lastlog_more')) > 0) {
-			$this->mNavi->addExtra('lastlog_more', $form->get('lastlog_more'));
+			$this->_mNavi->addExtra('lastlog_more', $form->get('lastlog_more'));
 			$time = time() - $form->get('lastlog_more') * 86400;
 			$this->_mCriteria->add(new Criteria('last_login', $time, '<='));
 		}
 
 		if (strlen($form->get('lastlog_less')) > 0) {
-			$this->mNavi->addExtra('lastlog_less', $form->get('lastlog_less'));
+			$this->_mNavi->addExtra('lastlog_less', $form->get('lastlog_less'));
 			$time = time() - $form->get('lastlog_more') * 86400;
 			$this->_mCriteria->add(new Criteria('last_login', $time, '>='));
 		}
 
 		if (strlen($form->get('regdate_more')) > 0) {
-			$this->mNavi->addExtra('regdate_more', $form->get('regdate_more'));
+			$this->_mNavi->addExtra('regdate_more', $form->get('regdate_more'));
 			$time = time() - $form->get('regdate_more') * 86400;
 			$this->_mCriteria->add(new Criteria('user_regdate', $time, '<='));
 		}
 
 		if (strlen($form->get('regdate_less')) > 0) {
-			$this->mNavi->addExtra('regdate_less', $form->get('regdate_less'));
+			$this->_mNavi->addExtra('regdate_less', $form->get('regdate_less'));
 			$time = time() - $form->get('regdate_less') * 86400;
 			$this->_mCriteria->add(new Criteria('user_regdate', $time, '>='));
 		}

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:52:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:52:53 +0900
Subject: [xoops-cvslog 3592] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060713105253.53DE02AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.1	Tue Apr 11 18:16:37 2006
+++ xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php	Thu Jul 13 19:52:53 2006
@@ -35,7 +35,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['uname'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['uname']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['uname']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_UNAME, '25');

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:53:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:53:25 +0900
Subject: [xoops-cvslog 3593] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060713105325.52BAB2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.11
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.10	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Jul 13 19:53:25 2006
@@ -7,7 +7,7 @@
 <h3><{$smarty.const._AD_USER_LANG_GROUP_DELETE}></h3>
 
 <div class="confirm">
-  <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getVar('name')}><br />
+  <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE|replace:"_%s_":$object->getShow('name')}><br />
   <{$smarty.const._AD_USER_LANG_GROUP_DELETE_ADVICE2}>
 </div>
 
@@ -23,35 +23,35 @@
 
 <form action="?action=GroupDelete" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=groupid value=$object->getVar('groupid')}>
+  <{xoops_input type=hidden name=groupid value=$object->get('groupid')}>
 <table class="outer">
   <tr>
     <th colspan="2"><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}></th>
   </tr>
   <tr>
     <td class="head" style="width:30%;"><{$smarty.const._AD_USER_LANG_GROUP_GID}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('groupid')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('groupid')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_NAME}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('name')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('name')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_DESC}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('description')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('description')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_TYPE}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('group_type')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('group_type')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_GROUP_AMMO}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('user_count')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getUserCount()|escape}></td>
   </tr>
   <tr>
     <td class="foot" colspan="2">
-      <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
   </tr>
 </table>
 </form>
Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.10 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.11
--- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.10	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Thu Jul 13 19:53:25 2006
@@ -4,7 +4,7 @@
   &raquo;&raquo; <{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>
 </div>
 
-<h3><{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}> ( <{$group->getVar('name')}> )</h3>
+<h3><{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}> ( <{$group->getShow('name')}> )</h3>
 
 <table class="outer">
   <tr>
@@ -18,19 +18,19 @@
   </tr>
   <tr class="odd" style="text-align:center;">
     <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td>
-    <td><{$group->getVar('groupid')}></td>
-    <td><b><{$group->getVar('name')}></b></td>
-    <td><{$group->getVar('description')}></td>
-    <td><{$group->getVar('group_type')}></td>
-    <td><{$group->getVar('user_count')}></td>
+    <td><{$group->getShow('groupid')}></td>
+    <td><b><{$group->getShow('name')}></b></td>
+    <td><{$group->getShow('description')}></td>
+    <td><{$group->getShow('group_type')}></td>
+    <td><{$group->getUserCount()|escape}></td>
     <td>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-      <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
-        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+      <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
+        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       <{/if}>
-      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
-      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
-      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
+      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
+      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
+      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
     </td>
   </tr>
 </table>
@@ -72,19 +72,19 @@
   </tr>
   <{foreach from=$noUsers item=user }>
     <tr class="<{cycle values="odd,even"}>">
-      <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getVar('uid')}>]" value="1" /></td>
+      <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getShow('uid')}>]" value="1" /></td>
       <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
-      <td style="text-align:center;"><{$user->getVar('uid')}></td>
-      <td><b><{$user->getVar('uname')}></b></td>
-      <td><{$user->getVar('name')}></td>
-      <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td>
-      <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td>
-      <td style="text-align:right;"><{$user->getVar('posts')}></td>
-      <td style="text-align:right;"><{$user->getVar('level')}></td>
+      <td style="text-align:center;"><{$user->getShow('uid')}></td>
+      <td><b><{$user->getShow('uname')}></b></td>
+      <td><{$user->getShow('name')}></td>
+      <td><{$user->get('user_regdate')|xoops_formattimestamp}></td>
+      <td><{$user->get('last_login')|xoops_formattimestamp:l}></td>
+      <td style="text-align:right;"><{$user->getShow('posts')}></td>
+      <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td style="text-align:center;">
-        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <{if $user->getVar('uid') != 1 }>
-          <a href="index.php?action=UserDelete&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <{if $user->get('uid') != 1 }>
+          <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>
@@ -123,19 +123,19 @@
   </tr>
   <{foreach from=$users item=user }>
     <tr class="<{cycle values="odd,even"}>">
-      <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getVar('uid')}>]" value="2" /></td>
+      <td style="text-align:center;"><input type="checkbox" name="uid[<{$user->getShow('uid')}>]" value="2" /></td>
       <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
-      <td style="text-align:center;"><{$user->getVar('uid')}></td>
-      <td><b><{$user->getVar('uname')}></b></td>
-      <td><{$user->getVar('name')}></td>
-      <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td>
-      <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td>
-      <td style="text-align:right;"><{$user->getVar('posts')}></td>
-      <td style="text-align:right;"><{$user->getVar('level')}></td>
+      <td style="text-align:center;"><{$user->getShow('uid')}></td>
+      <td><b><{$user->getShow('uname')}></b></td>
+      <td><{$user->getShow('name')}></td>
+      <td><{$user->get('user_regdate')|xoops_formattimestamp}></td>
+      <td><{$user->get('last_login')|xoops_formattimestamp:l}></td>
+      <td style="text-align:right;"><{$user->getShow('posts')}></td>
+      <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td style="text-align:center;">
-        <a href="<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user->getVar('uid')}>&amp;op=modifyUser"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> 
-        <{if $user->getVar('uid') != 1 }>
-          <a href="index.php?action=UserDelete&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="<{$xoops_url}>/modules/system/admin.php?fct=users&amp;uid=<{$user->getShow('uid')}>&amp;op=modifyUser"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> 
+        <{if $user->get('uid') != 1 }>
+          <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/user_list.html
diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.13
--- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.12	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/user_list.html	Thu Jul 13 19:53:25 2006
@@ -38,17 +38,17 @@
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
-      <td style="text-align:center;"><{$user->getVar('uid')}></td>
-      <td><{$user->getVar('uname')}></td>
-      <td><{$user->getVar('name')}></td>
-      <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td>
-      <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td>
-      <td style="text-align:right;"><{$user->getVar('posts')}></td>
-      <td style="text-align:right;"><{$user->getVar('level')}></td>
+      <td style="text-align:center;"><{$user->getShow('uid')}></td>
+      <td><{$user->getShow('uname')}></td>
+      <td><{$user->getShow('name')}></td>
+      <td><{$user->get('user_regdate')|xoops_formattimestamp}></td>
+      <td><{$user->get('last_login')|xoops_formattimestamp:l}></td>
+      <td style="text-align:right;"><{$user->getShow('posts')}></td>
+      <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td style="text-align:center;">
-        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <{if $user->getVar('uid') != 1 }>
-          <a href="index.php?action=UserDelete&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <{if $user->get('uid') != 1 }>
+          <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/user_search_list.html
diff -u xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.6	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Thu Jul 13 19:53:25 2006
@@ -40,17 +40,17 @@
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
-      <td style="text-align:center;"><{$user->getVar('uid')}></td>
-      <td><{$user->getVar('uname')}></td>
-      <td><{$user->getVar('name')}></td>
-      <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td>
-      <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td>
-      <td style="text-align:right;"><{$user->getVar('posts')}></td>
-      <td style="text-align:right;"><{$user->getVar('level')}></td>
+      <td style="text-align:center;"><{$user->getShow('uid')}></td>
+      <td><{$user->getShow('uname')}></td>
+      <td><{$user->getShow('name')}></td>
+      <td><{$user->get('user_regdate')|xoops_formattimestamp}></td>
+      <td><{$user->get('last_login')|xoops_formattimestamp:l}></td>
+      <td style="text-align:right;"><{$user->getShow('posts')}></td>
+      <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td style="text-align:center;">
-        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <{if $user->getVar('uid') != 1 }>
-          <a href="index.php?action=UserDelete&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <{if $user->get('uid') != 1 }>
+          <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/group_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/group_edit.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/group_edit.html	Thu Jul 13 19:53:25 2006
@@ -52,8 +52,8 @@
     </tr>
     <tr>
       <td colspan="2" class="foot">
-        <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.4	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_delete.html	Thu Jul 13 19:53:25 2006
@@ -17,31 +17,31 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('mailjob_id')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_TITLE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('title')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('body')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_FROM_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_email')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_IS_PM}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_pm')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_IS_MAIL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_mail')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></td>
@@ -49,8 +49,8 @@
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/group_list.html
diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.10
--- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.9	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/group_list.html	Thu Jul 13 19:53:25 2006
@@ -12,29 +12,37 @@
 <table class="outer">
   <tr>
     <th>&nbsp;</th>
-    <th><{$smarty.const._AD_USER_LANG_GROUP_GID}></th>
-    <th><{$smarty.const._AD_USER_LANG_GROUP_NAME}></th>
-    <th><{$smarty.const._AD_USER_LANG_GROUP_DESC}></th>
-    <th><{$smarty.const._AD_USER_LANG_GROUP_TYPE}></th>
+    <th><{$smarty.const._AD_USER_LANG_GROUP_GID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.GROUP_SORT_KEY_GROUPID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.GROUP_SORT_KEY_GROUPID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_GROUP_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.GROUP_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.GROUP_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_GROUP_DESC}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.GROUP_SORT_KEY_DESCRIPTION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.GROUP_SORT_KEY_DESCRIPTION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_GROUP_TYPE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.GROUP_SORT_KEY_GROUP_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.GROUP_SORT_KEY_GROUP_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_GROUP_AMMO}></th>
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=group from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
       <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td>
-      <td><{$group->getVar('groupid')}></td>
-      <td><b><{$group->getVar('name')}></b></td>
-      <td><{$group->getVar('description')}></td>
-      <td><{$group->getVar('group_type')}></td>
-      <td><{$group->getVar('user_count')}></td>
+      <td><{$group->getShow('groupid')}></td>
+      <td><b><{$group->getShow('name')}></b></td>
+      <td><{$group->getShow('description')}></td>
+      <td><{$group->getShow('group_type')}></td>
+      <td><{$group->getUserCount()|escape}></td>
       <td>
-        <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
-          <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
+          <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
-        <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
-        <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
-        <a href="index.php?action=GroupMember&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
+        <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
+        <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
+        <a href="index.php?action=GroupMember&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/user/admin/templates/avatar_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.6	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_delete.html	Thu Jul 13 19:53:25 2006
@@ -19,48 +19,49 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('avatar_id')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('avatar_id')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_FILE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('avatar_file')}>" alt="<{$object->getVar('avatar_name')}>" title="<{$object->getVar('avatar_name')}>" />
-        <br /><{$object->getVar('avatar_file')}>
+        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('avatar_file')}>" alt="<{$object->getShow('avatar_name')}>" title="<{$object->getShow('avatar_name')}>" />
+        <br /><{$object->getShow('avatar_file')}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_MIMETYPE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_mimetype')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_mimetype')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_CREATED}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_created')|xoops_formattimestamp:l}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('avatar_created')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_DISPLAY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{if $object->getVar('avatar_display') == 1 }>
+        <{if $object->get('avatar_display') == 1 }>
           <{$smarty.const._YES}>
-        <{elseif $object->getVar('avatar_display') == 0 }>
+        <{elseif $object->get('avatar_display') == 0 }>
           <{$smarty.const._NO}>
         <{/if}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_WEIGHT}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_weight')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_weight')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_AVATAR_TYPE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('avatar_type')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('avatar_type')}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/avatar_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/avatar_edit.html:1.1.2.5	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_edit.html	Thu Jul 13 19:53:25 2006
@@ -72,6 +72,7 @@
     <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/group_property.html
diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.8	Thu May 18 01:42:32 2006
+++ xoops2jp/html/modules/user/admin/templates/group_property.html	Thu Jul 13 19:53:25 2006
@@ -4,7 +4,7 @@
   &raquo;&raquo; <{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>
 </div>
 
-<h3><{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}> ( <{$group->getVar('name')}> )</h3>
+<h3><{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}> ( <{$group->getShow('name')}> )</h3>
 
 <table class="outer">
   <tr>
@@ -18,19 +18,19 @@
   </tr>
   <tr class="odd" style="text-align:center;">
     <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td>
-    <td><{$group->getVar('groupid')}></td>
-    <td><b><{$group->getVar('name')}></b></td>
-    <td><{$group->getVar('description')}></td>
-    <td><{$group->getVar('group_type')}></td>
-    <td><{$group->getVar('user_count')}></td>
+    <td><{$group->getShow('groupid')}></td>
+    <td><b><{$group->getShow('name')}></b></td>
+    <td><{$group->getShow('description')}></td>
+    <td><{$group->getShow('group_type')}></td>
+    <td><{$group->getUserCount()|escape}></td>
     <td>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-      <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
-        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+      <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
+        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       <{/if}>
-      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
-      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
-      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
+      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
+      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
+      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
     </td>
   </tr>
 </table>
@@ -53,17 +53,17 @@
   <{foreach from=$users item=user }>
     <tr class="<{cycle values="odd,even"}>" style="text-align:center;">
       <td><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
-      <td><{$user->getVar('uid')}></td>
-      <td><b><{$user->getVar('uname')}></b></td>
-      <td><{$user->getVar('name')}></td>
-      <td><{$user->getVar('user_regdate')|xoops_formattimestamp}></td>
-      <td><{$user->getVar('last_login')|xoops_formattimestamp:l}></td>
-      <td style="text-align:right;"><{$user->getVar('posts')}></td>
-      <td style="text-align:right;"><{$user->getVar('level')}></td>
+      <td><{$user->getShow('uid')}></td>
+      <td><b><{$user->getShow('uname')}></b></td>
+      <td><{$user->getShow('name')}></td>
+      <td><{$user->getShow('user_regdate')|xoops_formattimestamp}></td>
+      <td><{$user->getShow('last_login')|xoops_formattimestamp:l}></td>
+      <td style="text-align:right;"><{$user->getShow('posts')}></td>
+      <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td>
-        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> 
-        <{if $user->getVar('uid') != 1 }>
-          <a href="index.php?action=UserDelete&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a> 
+        <{if $user->get('uid') != 1 }>
+          <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/avatar_list.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.7	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_list.html	Thu Jul 13 19:53:25 2006
@@ -40,18 +40,18 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><{$obj->getVar('avatar_id')}></td>
-      <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" alt="<{$obj->getVar('avatar_name')}>" title="<{$obj->getVar('avatar_name')}>" /></td>
-      <td><{$obj->getVar('avatar_name')}></td>
-      <td><{$obj->getVar('avatar_mimetype')}></td>
-      <td><{$obj->getVar('avatar_created')|xoops_formattimestamp:l}></td>
-      <td><{$obj->getVar('avatar_display')}></td>
-      <td><{$obj->getVar('avatar_weight')}></td>
-      <td><{$obj->getVar('avatar_type')}></td>
-      <td><{$obj->getUsingCount()}></td>
+      <td><{$obj->getShow('avatar_id')}></td>
+      <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>" /></td>
+      <td><{$obj->getShow('avatar_name')}></td>
+      <td><{$obj->getShow('avatar_mimetype')}></td>
+      <td><{$obj->get('avatar_created')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getShow('avatar_display')}></td>
+      <td><{$obj->getShow('avatar_weight')}></td>
+      <td><{$obj->getShow('avatar_type')}></td>
+      <td><{$obj->getUsingCount()|escape}></td>
       <td>
-        <a href="index.php?action=AvatarEdit&amp;avatar_id=<{$obj->getVar('avatar_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <a href="index.php?action=AvatarDelete&amp;avatar_id=<{$obj->getVar('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="index.php?action=AvatarEdit&amp;avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="index.php?action=AvatarDelete&amp;avatar_id=<{$obj->getShow('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.12 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.13
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.12	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Thu Jul 13 19:53:25 2006
@@ -4,7 +4,7 @@
   &raquo;&raquo; <{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>
 </div>
 
-<h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getVar('name')}> )</h3>
+<h3><{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}> ( <{$group->getShow('name')}> )</h3>
 
 <table class="outer">
   <tr>
@@ -18,19 +18,19 @@
   </tr>
   <tr class="odd" style="text-align:center;">
     <td><img src="<{"icons/group.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP}>" title="<{$smarty.const._AD_USER_LANG_GROUP}>" /></td>
-    <td><{$group->getVar('groupid')}></td>
-    <td><b><{$group->getVar('name')}></b></td>
-    <td><{$group->getVar('description')}></td>
-    <td><{$group->getVar('group_type')}></td>
-    <td><{$group->getVar('user_count')}></td>
+    <td><{$group->getShow('groupid')}></td>
+    <td><b><{$group->getShow('name')}></b></td>
+    <td><{$group->getShow('description')}></td>
+    <td><{$group->getShow('group_type')}></td>
+    <td><{$group->getUserCount()|escape}></td>
     <td>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-      <{if $group->getVar('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
-        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+      <{if $group->get('groupid') > $smarty.const.XOOPS_GROUP_ANONYMOUS }>
+        <a href="index.php?action=GroupDelete&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       <{/if}>
-      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
-      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
-      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
+      <a href="index.php?action=GroupProperty&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PROPERTY}>" /></a>
+      <a href="index.php?action=GroupPerm&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/permission.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" title="<{$smarty.const._AD_USER_LANG_GROUP_PERMISSION}>" /></a>
+      <a href="index.php?action=GroupMember&amp;groupid=<{$group->getShow('groupid')}>"><img src="<{"icons/members.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" title="<{$smarty.const._AD_USER_LANG_GROUP_ASSIGN}>" /></a>
     </td>
   </tr>
 </table>
@@ -125,7 +125,7 @@
 <{/foreach}>
 
 <div style="text-align:center;">
-<input type="hidden" name="groupid" value="<{$group->getVar('groupid')}>" />
+<{xoops_input type=hidden name=groupid value=$group->get('groupid')}>
 <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
 <input type="reset" value="<{$smarty.const._CANCEL}>" class="formButton" />
 </div>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.5	Mon Jun 12 02:03:51 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html	Thu Jul 13 19:53:25 2006
@@ -31,11 +31,11 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
-      <td><{$obj->getVar('mailjob_id')}></td>
-      <td><a href="./index.php?action=MailjobSend&amp;mailjob_id=<{$obj->getVar('mailjob_id')}>"><{$obj->getVar('title')}></a></td>
-      <td><{$obj->getVar('is_pm')}></td>
-      <td><{$obj->getVar('is_mail')}></td>
-      <td><{$obj->getVar('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}></td>
+      <td><{$obj->getShow('mailjob_id')}></td>
+      <td><a href="./index.php?action=MailjobSend&amp;mailjob_id=<{$obj->getShow('mailjob_id')}>"><{$obj->getShow('title')}></a></td>
+      <td><{$obj->getShow('is_pm')}></td>
+      <td><{$obj->getShow('is_mail')}></td>
+      <td><{$obj->get('create_unixtime')|date_format:"%Y/%m/%d %H:%M"}></td>
       <td>
         <{if $obj->mUserCount > 0}>
           <span style='color:red;'><{$obj->mUserCount|escape}></span>
@@ -44,8 +44,8 @@
         <{/if}>
       </td>
       <td>
-        <a href="./index.php?action=MailjobEdit&amp;mailjob_id=<{$obj->getVar('mailjob_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
-        <a href="./index.php?action=MailjobDelete&amp;mailjob_id=<{$obj->getVar('mailjob_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=MailjobEdit&amp;mailjob_id=<{$obj->getShow('mailjob_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=MailjobDelete&amp;mailjob_id=<{$obj->getShow('mailjob_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.14 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.15
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.14	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Thu Jul 13 19:53:25 2006
@@ -69,9 +69,7 @@
       <td class="head"><{$smarty.const._AD_USER_LANG_TIMEZONE_OFFSET}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="timezone_offset">
-        <{foreach item=timezone from=$timezones}>
-          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
-        <{/foreach}>
+          <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
         </select>
       </td>
     </tr>
@@ -120,7 +118,7 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_USER_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=user_sig value=$actionForm->get('user_sig')}>
+        <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}>
         <br />
         <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}>
         <{$smarty.const._AD_USER_LANG_ATTACHSIG}>
@@ -160,10 +158,8 @@
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="rank">
-        <option value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option>
-        <{foreach item=rank from=$ranks}>
-          <option value="<{$rank->getVar('rank_id')}>" <{if $rank->get('rank_id') == $actionForm->get('rank')}>selected<{/if}>><{$rank->getVar('rank_title')}></option>
-        <{/foreach}>
+          <option value="0"><{$smarty.const._AD_USER_LANG_NO_SPECIAL_RANK}></option>
+          <{xoops_optionsArray value=rank_id label=rank_title from=$ranks default=$actionForm->get('rank')}>
         </select>
       </td>
     </tr>
@@ -211,7 +207,7 @@
     <tr>
       <td colspan="2"  class="foot">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_send.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.2 xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.2	Fri May 12 00:26:03 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_send.html	Thu Jul 13 19:53:25 2006
@@ -19,31 +19,31 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('mailjob_id')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_TITLE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('title')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('body')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_FROM_NAME}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('from_email')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_IS_PM}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_pm')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_IS_MAIL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('is_mail')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></td>
@@ -51,8 +51,8 @@
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._SEND}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._SEND}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/ranks_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/ranks_edit.html:1.1.2.6	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_edit.html	Thu Jul 13 19:53:25 2006
@@ -71,8 +71,8 @@
     </tr>
     <tr>
       <td colspan="2" class="foot">
-        <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.7	Tue Jul 11 12:43:27 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html	Thu Jul 13 19:53:25 2006
@@ -17,34 +17,34 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_id')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_id')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_TITLE}></td>
-      <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('rank_title')}></b></td>
+      <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('rank_title')}></b></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MIN}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_min')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_min')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_MAX}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_max')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_max')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_SPECIAL}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('rank_special')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('rank_special')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_RANK_IMAGE}></td>
     <td class="odd">
-      <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('rank_image')}>" alt="<{$object->getVar('rank_title')}>" title="<{$object->getVar('rank_title')}>" />
+      <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('rank_image')}>" alt="<{$object->getShow('rank_title')}>" title="<{$object->getShow('rank_title')}>" />
     </td>
     </tr>
     <tr>
       <td class="foot" colspan="2">
-        <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/user_search.html
diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.4	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search.html	Thu Jul 13 19:53:25 2006
@@ -142,7 +142,6 @@
     <tr>
       <td colspan="2"  class="foot">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/user/admin/templates/user_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/user_delete.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/user_delete.html	Thu Jul 13 19:53:25 2006
@@ -6,7 +6,7 @@
 
 <h3><{$smarty.const._AD_USER_LANG_USER_DELETE}></h3>
 
-<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getVar('uname')}></div>
+<div class="confirm"><{$smarty.const._AD_USER_LANG_USER_DELETE_ADVICE|replace:"_%s_":$object->getShow('uname')}></div>
 
 <{if $actionForm->hasError()}>
 <div class="error">
@@ -20,43 +20,43 @@
 
 <form action="?action=UserDelete" method="post">
 <{xoops_token form=$actionForm}>
-<{xoops_input type=hidden name=uid value=$object->getVar('uid')}>
+<{xoops_input type=hidden name=uid value=$object->get('uid')}>
 <table class="outer">
   <tr>
     <th colspan="2"><{$smarty.const._AD_USER_LANG_USER_DELETE}></th>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_UID}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('uid')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('uid')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_UNAME}></td>
-    <td class="<{cycle values="odd,even"}>"><b><{$object->getVar('uname')}></b></td>
+    <td class="<{cycle values="odd,even"}>"><b><{$object->getShow('uname')}></b></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_NAME}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('name')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_REGDATE}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('user_regdate')|xoops_formattimestamp}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->get('user_regdate')|xoops_formattimestamp}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_LASTLOGIN}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_login')|xoops_formattimestamp:l}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->get('last_login')|xoops_formattimestamp:l}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_POSTS}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('posts')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('posts')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._AD_USER_LANG_LEVEL}></td>
-    <td class="<{cycle values="odd,even"}>"><{$object->getVar('level')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getShow('level')}></td>
   </tr>
   <tr>
     <td colspan="2" class="foot">
-      <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.7	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html	Thu Jul 13 19:53:25 2006
@@ -47,7 +47,7 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_BODY}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=body value=$actionForm->get('body') rows=10}>
+        <{xoops_dhtmltarea type=text name=body value=$actionForm->get('body') cols=50 rows=10}>
 <{*        <{xoops_textarea type=text name=body value=$actionForm->get('body') cols=50 rows=10}> *}>
       </td>
     </tr>
@@ -78,7 +78,7 @@
     <tr class="foot">
       <td colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
-        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
       </td>
     </tr>
   </table>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:53:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:53:42 +0900
Subject: [xoops-cvslog 3594] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105342.BC2AA2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.5 xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.5	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/AbstractEditAction.class.php	Thu Jul 13 19:53:42 2006
@@ -64,6 +64,10 @@
 			return USER_FRAME_VIEW_ERROR;
 		}
 	
+		if (xoops_getrequest('_form_control_cancel') != null) {
+			return USER_FRAME_VIEW_CANCEL;
+		}
+
 		$this->mActionForm->load($this->mObject);
 		
 		$this->mActionForm->fetch();

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:53:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:53:55 +0900
Subject: [xoops-cvslog 3595] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105355.69C712AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/AbstractFilterForm.class.php:1.1.2.3	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/AbstractFilterForm.class.php	Thu Jul 13 19:53:55 2006
@@ -11,7 +11,7 @@
 
 	function User_AbstractFilterForm(&$navi)
 	{
-		$this->mNavi =& $navi;
+		$this->_mNavi =& $navi;
 		$this->_mCriteria =& new CriteriaCompo();
 	}
 
@@ -37,9 +37,6 @@
 		$criteria->setStart($start);
 		$criteria->setLimit($limit);
 		
-		$criteria->setSort($this->getSort());
-		$criteria->setOrder($this->getOrder());
-		
 		return $criteria;
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:54:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:54:03 +0900
Subject: [xoops-cvslog 3596] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105403.B19442AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.7 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.8
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.7	Fri Jun 23 10:30:14 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Thu Jul 13 19:54:03 2006
@@ -13,6 +13,8 @@
 define ("USER_FRAME_VIEW_ERROR", 3);
 define ("USER_FRAME_VIEW_INDEX", 4);
 define ("USER_FRAME_VIEW_INPUT", 5);
+define ("USER_FRAME_VIEW_PREVIEW", 6);
+define ("USER_FRAME_VIEW_CANCEL", 7);
 
 class User_ActionFrame extends XCube_ActionStrategy
 {
@@ -72,7 +74,7 @@
 		
 		$this->mAction->prepare($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig);
 	
-		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
+		if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
 			//
 			// error
 			//
@@ -103,6 +105,14 @@
 			case USER_FRAME_VIEW_INPUT:
 				$this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
 				break;
+				
+			case USER_FRAME_VIEW_PREVIEW:
+				$this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+				
+			case USER_FRAME_VIEW_CANCEL:
+				$this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
 		}
 	}
 }
@@ -118,7 +128,7 @@
 		return false;
 	}
 	
-	function hasPerm(&$controller, &$xoopsUser)
+	function hasPermission(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		return true;
 	}
@@ -152,6 +162,14 @@
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 	}
+
+	function executeViewPreview(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:54:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:54:30 +0900
Subject: [xoops-cvslog 3597] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105430.94F292AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/groups.php
diff -u xoops2jp/html/modules/user/class/groups.php:1.1.2.2 xoops2jp/html/modules/user/class/groups.php:1.1.2.3
--- xoops2jp/html/modules/user/class/groups.php:1.1.2.2	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/groups.php	Thu Jul 13 19:54:30 2006
@@ -6,11 +6,17 @@
 {
 	function UserGroupsObject()
 	{
-		$this->initVar('groupid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('groupid', XOBJ_DTYPE_INT, 0, true);
 		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 50);
 		$this->initVar('description', XOBJ_DTYPE_TEXT, '', true);
 		$this->initVar('group_type', XOBJ_DTYPE_STRING, '', true, 10);
 	}
+	
+	function getUserCount()
+	{
+		$handler =& xoops_gethandler('member');
+		return $handler->getUserCountByGroup($this->get('groupid'));
+	}
 }
 
 class UserGroupsHandler extends XoopsObjectGenericHandler

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:54:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:54:47 +0900
Subject: [xoops-cvslog 3598] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105447.6C2FA2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/mailjob.php
diff -u xoops2jp/html/modules/user/class/mailjob.php:1.1.2.5 xoops2jp/html/modules/user/class/mailjob.php:1.1.2.6
--- xoops2jp/html/modules/user/class/mailjob.php:1.1.2.5	Wed May 24 18:43:53 2006
+++ xoops2jp/html/modules/user/class/mailjob.php	Thu Jul 13 19:54:47 2006
@@ -8,6 +8,21 @@
 	var $_mUsersLoadedFlag = false;
 	var $mUserCount = 0;
 	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mGetReplaceTitle = null;
+
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mGetReplaceBody = null;
+
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mSend = null;
+	
 	function UserMailjobObject()
 	{
 		$this->initVar('mailjob_id', XOBJ_DTYPE_INT, '', false);
@@ -18,6 +33,15 @@
 		$this->initVar('is_pm', XOBJ_DTYPE_BOOL, '0', true);
 		$this->initVar('is_mail', XOBJ_DTYPE_BOOL, '0', true);
 		$this->initVar('create_unixtime', XOBJ_DTYPE_INT, time(), true);
+		
+		$this->mGetReplaceTitle =& new XCube_NewDelegate();
+		$this->mGetReplaceTitle->register('UserMailjobObject.GetReplaceTitle');
+		
+		$this->mGetReplaceBody =& new XCube_NewDelegate();
+		$this->mGetReplaceBody->register('UserMailjobObject.GetReplaceBody');
+		
+		$this->mSend =& new XCube_NewDelegate();
+		$this->mSend->register('UserMailjobObject.Send');
 	}
 
 	/**
@@ -45,8 +69,6 @@
 	{
 		$root =& XCube_Root::getSingleton();
 		
-		$root->mEventManager->add("Module.User.Mailjob.ReplaceBody", new XCube_InstanceDelegate($this, "getReplaceBody"));
-
 		$this->loadUser();
 		$handler =& xoops_getmodulehandler('mailjob_link', 'user');
 
@@ -56,28 +78,32 @@
 			$to_user =& $userHandler->get($link->get('uid'));
 			
 			if (is_object($to_user)) {
-				$eventArgs = array();
-				$eventArgs['from_user'] =& $from_user;
-				$eventArgs['to_user'] =& $to_user;
-				$eventArgs['mailjob'] =& $this;
-			
-				$root->mEventManager->raiseEvent('Module.User.Mailjob.Send', $this, $eventArgs);
+				$this->mSend->call(new XCube_Ref($this), $to_user, $from_user);
 			}
 			
 			$handler->delete($link);
 		}
 	}
 	
-	function getReplaceBody(&$sender, &$eventArgs)
+	function getReplaceTitle(&$to_user, &$from_user)
 	{
+		return $this->get('title');
+	}
+	
+	function getReplaceBody(&$to_user, &$from_user)
+	{
+		$t_body = $this->get('body');
+		
 		//
-		// TODO Replace subject, too. (We wait new delegate class)
-		//
-		$eventArgs['body'] = str_replace('{X_UID}', $eventArgs['to_user']->get('uid'), $eventArgs['body']);
-		$eventArgs['body'] = str_replace('{X_UNAME}', $eventArgs['to_user']->get('uname'), $eventArgs['body']);
-		$eventArgs['body'] = str_replace('{X_UEMAIL}', $eventArgs['to_user']->get('email'), $eventArgs['body']);
-		$eventArgs['body'] = str_replace('{X_UEMAIL}', $eventArgs['to_user']->get('email'), $eventArgs['body']);
 		// TODO {X_UACTLINK}
+		//
+		$t_body = str_replace('{X_UID}', $to_user->get('uid'), $t_body);
+		$t_body = str_replace('{X_UNAME}', $to_user->get('uname'), $t_body);
+		$t_body = str_replace('{X_UEMAIL}', $to_user->get('email'), $t_body);
+
+		$this->mGetReplaceBody->call(new XCube_Ref($t_body), $to_user, $from_user);
+		
+		return $t_body;
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:55:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:55:29 +0900
Subject: [xoops-cvslog 3599] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060713105529.DB7D62AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/users.php
diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.3 xoops2jp/html/modules/user/class/users.php:1.1.2.4
--- xoops2jp/html/modules/user/class/users.php:1.1.2.3	Thu Apr 27 19:26:39 2006
+++ xoops2jp/html/modules/user/class/users.php	Thu Jul 13 19:55:29 2006
@@ -4,6 +4,9 @@
 
 class UserUsersObject extends XoopsSimpleObject
 {
+	//
+	// TODO naming rule
+	//
 	var $Groups = array();
 	
 	function UserUsersObject()
@@ -45,6 +48,19 @@
 	{
 		return $this->Groups;
 	}
+	
+	//
+	// TODO naming rule
+	//
+	function _loadGroups()
+	{
+		$handler =& xoops_getmodulehandler('groups_users_link');
+		$links =& $handler->getObjects(new Criteria('uid', $this->get('uid')));
+		foreach ($links as $link) {
+			$this->Groups[] = $link->get('groupid');
+		}
+	}
+
 }
 
 class UserUsersHandler extends XoopsObjectGenericHandler
@@ -58,28 +74,32 @@
 		$obj =& parent::get($id);
 		
 		if (is_object($obj)) {
-			$this->_loadGroups($obj);
+			$obj->_loadGroups();
 		}
 		
 		return $obj;
 	}
 	
-	function &getObjects($criteria = null, $param1 = false, $param2 = false, $param3 = false)
+	function &getObjects($criteria = null, $limit = null, $start = null, $id_as_key = false)
 	{
-		$objects =& parent::getObjects($criteria, $param1, $param2, $param3);
+		$objects =& parent::getObjects($criteria, $limit, $start, $id_as_key);
 
 		if (count($objects)) {
 			foreach (array_keys($objects) as $key) {
-				$this->_loadGroups($objects[$key]);
+				$objects[$key]->_loadGroups();
 			}
 		}
+		
+		return $objects;
 	}
 
 	/**
-	 * Return the array which consists of an integer as the uid. This member function is more speedy than getObjects().
+	 * Return the array which consists of an integer as the uid. This member
+	 * function is more speedy than getObjects().
+	 * 
 	 * @return Array
 	 */
-	function &getUids($criteria = null, $param1 = false, $param2 = false, $param3 = false)
+	function &getUids($criteria = null, $limit = null, $start = null, $id_as_key = false)
 	{
 		$ret = array();
 
@@ -92,7 +112,7 @@
 			$where = $this->_makeCriteria4sql($criteria);
 			
 			if (trim($where)) {
-				$sql .= " WHERE ".$where;
+				$sql .= " WHERE " . $where;
 			}
 			
 			$sorts = array();
@@ -106,7 +126,7 @@
 			$limit=$criteria->getLimit();
 			$start=$criteria->getStart();
 			
-			$ret =& $this->_getObjects($sql, $limit, $start, $param1);
+			$ret =& $this->getObjects($sql, $limit, $start, $param1);
 		}
 		else {
 			$limit = $param1;
@@ -149,15 +169,6 @@
 		
 		return false;
 	}
-	
-	function _loadGroups(&$user)
-	{
-		$handler =& xoops_getmodulehandler('groups_users_link');
-		$links =& $handler->getObjects(new Criteria('uid', $user->get('uid')));
-		foreach ($links as $link) {
-			$user->Groups[] = $link->get('groupid');
-		}
-	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:55:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:55:49 +0900
Subject: [xoops-cvslog 3600] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060713105549.61B8F2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.16 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.17
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.16	Thu Apr 27 19:26:53 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Thu Jul 13 19:55:49 2006
@@ -50,6 +50,7 @@
 define('_AD_USER_LANG_CREATE_UNIXTIME', "create unixtime");
 define('_AD_USER_LANG_CUSTOM_AVATAR', "Custom avatar");
 define('_AD_USER_LANG_DELETE_RANK', "Delete a rank");
+define('_AD_USER_LANG_DESCRIPTION', "description");
 define('_AD_USER_LANG_DISPLAY_USER_LEVEL', "Display user level");
 define('_AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION', "Display user mail condition");
 define('_AD_USER_LANG_EDIT', "Edit");

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:55:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:55:55 +0900
Subject: [xoops-cvslog 3601] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060713105555.6BC9A2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.25 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.26
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.25	Thu Apr 27 19:27:02 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Thu Jul 13 19:55:55 2006
@@ -1,171 +1,172 @@
-<?php
-
-define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
-define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
-define('_AD_USER_ERROR_EMAIL', "入力された{0}を電子メールの形式として正しく認識できません");
-define('_AD_USER_ERROR_GROUP_VALUE', "指定されたグループの値が不正です");
-define('_AD_USER_ERROR_IMAGE_REQUIRED', "イメージ画像を必ず指定して下さい");
-define('_AD_USER_ERROR_INJURY', "{0}に指定された値が不正です");
-define('_AD_USER_ERROR_INJURY_MIN_MAX', "最低値と最高値の関係が不正です");
-define('_AD_USER_ERROR_INJURY_SPECIAL', "特別ランクの値が不正です");
-define('_AD_USER_ERROR_INTRANGE', "{0}の入力値が不正です");
-define('_AD_USER_ERROR_MAILJOB_SEND_ERROR', "最低ひとつの送信方法を指定してください");
-define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "メール・プライベートメッセージの送信に失敗しました");
-define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "最低ひとつの送信方法を指定してください");
-define('_AD_USER_ERROR_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
-define('_AD_USER_ERROR_MIN', "{0}は最低でも{1}以上の値を入力して下さい");
-define('_AD_USER_ERROR_NO_UPLOAD_FILE', "このランクのための画像ファイルをアップロードして下さい");
-define('_AD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません");
-define('_AD_USER_ERROR_PASSWORD_REQUIRED', "パスワードは必ず入力して下さい");
-define('_AD_USER_ERROR_RAISE_ERROR', "エラーが発生しました");
-define('_AD_USER_ERROR_REQUEST_IS_WRONG', "不正なリクエストです");
-define('_AD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_AD_USER_ERROR_UMODE', "コメントの並び順に指定した値が不正です");
-define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "ユーザー名が重複しています。変更して下さい。");
-define('_AD_USER_ERROR_WRONG_FORMAT', "不正なフォーマットです");
-define('_AD_USER_LANG_ACTIVEUSER', "アクティブユーザー");
-define('_AD_USER_LANG_ACTKEY', "アクティベートキー");
-define('_AD_USER_LANG_ALL_OF_USERS', "すべてのユーザー");
-define('_AD_USER_LANG_APPROVE_USERS_ONLY', "承認済みユーザーのみ");
-define('_AD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する");
-define('_AD_USER_LANG_AVATAR_CREATED', "作成日時");
-define('_AD_USER_LANG_AVATAR_DELETE', "アバター削除");
-define('_AD_USER_LANG_AVATAR_DISPLAY', "表示");
-define('_AD_USER_LANG_AVATAR_EDIT', "アバター編集");
-define('_AD_USER_LANG_AVATAR_FILE', "画像ファイル名");
-define('_AD_USER_LANG_AVATAR_ID', "ID");
-define('_AD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
-define('_AD_USER_LANG_AVATAR_NAME', "画像名");
-define('_AD_USER_LANG_AVATAR_NEW', "アバター新規追加");
-define('_AD_USER_LANG_AVATAR_TYPE', "タイプ");
-define('_AD_USER_LANG_AVATAR_USING_COUNT', "使用数");
-define('_AD_USER_LANG_AVATAR_WEIGHT', "優先度");
-define('_AD_USER_LANG_BIO', "その他");
-define('_AD_USER_LANG_BODY', "本文");
-define('_AD_USER_LANG_BY_EMAIL', "Ｅメールで送信");
-define('_AD_USER_LANG_BY_PM', "PMで送信");
-define('_AD_USER_LANG_COMPLETED', "完了");
-define('_AD_USER_LANG_CONTROL', "操作");
-define('_AD_USER_LANG_CREATE_NEW', "新規作成");
-define('_AD_USER_LANG_CREATE_UNIXTIME', "作成日");
-define('_AD_USER_LANG_CUSTOM_AVATAR', "カスタムアバター");
-define('_AD_USER_LANG_DELETE_RANK', "ユーザーランクの削除");
-define('_AD_USER_LANG_DISPLAY_USER_LEVEL', "表示するユーザの種類");
-define('_AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION', "表示するユーザのメール設定");
-define('_AD_USER_LANG_EDIT', "編集");
-define('_AD_USER_LANG_EMAIL', "メールアドレス");
-define('_AD_USER_LANG_FROM_EMAIL', "送信元メールアドレス");
-define('_AD_USER_LANG_FROM_NAME', "送信者名");
-define('_AD_USER_LANG_GROUP', "グループ");
-define('_AD_USER_LANG_GROUP_AMMO', "メンバー数");
-define('_AD_USER_LANG_GROUP_ASSIGN', "メンバーの登録");
-define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "このグループに登録されているユーザー一覧");
-define('_AD_USER_LANG_GROUP_DELETE', "ユーザーグループの削除");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "<b>_%s_</b> のユーザーグループを削除します。よろしいですか？");
-define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "グループを削除してもユーザーは削除されません");
-define('_AD_USER_LANG_GROUP_DESC', "説明");
-define('_AD_USER_LANG_GROUP_EDIT', "ユーザーグループ編集");
-define('_AD_USER_LANG_GROUP_GID', "GID");
-define('_AD_USER_LANG_GROUP_LIST', "ユーザーグループ管理");
-define('_AD_USER_LANG_GROUP_NAME', "名前");
-define('_AD_USER_LANG_GROUP_NEW', "ユーザーグループ新規追加");
-define('_AD_USER_LANG_GROUP_NOASSIN_MEMBERS', "このグループに登録されていないユーザー一覧");
-define('_AD_USER_LANG_GROUP_PERMISSION', "パーミッション");
-define('_AD_USER_LANG_GROUP_PROPERTY', "プロパティ");
-define('_AD_USER_LANG_GROUP_TYPE', "タイプ");
-define('_AD_USER_LANG_GROUPID', "グループID");
-define('_AD_USER_LANG_ID', "ID");
-define('_AD_USER_LANG_IS_MAIL', "メール送信");
-define('_AD_USER_LANG_IS_PM', "ＰＭ送信");
-define('_AD_USER_LANG_LAST_LOGIN', "最終ログイン");
-define('_AD_USER_LANG_LASTLOG_LESS', "<strong>X</strong>日以内にログインしている");
-define('_AD_USER_LANG_LASTLOG_MORE', "<strong>X</strong>日以上ログインしていない");
-define('_AD_USER_LANG_LASTLOGIN', "最終ログイン");
-define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
-define('_AD_USER_LANG_LEFT_TARGET_USER', "残送信数");
-define('_AD_USER_LANG_LEVEL', "レベル");
-define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
-define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
-define('_AD_USER_LANG_MAILJOB_DELETE', "メールジョブ削除");
-define('_AD_USER_LANG_MAILJOB_EDIT', "メールジョブ編集");
-define('_AD_USER_LANG_MAILJOB_ID', "ジョブID");
-define('_AD_USER_LANG_MAILJOB_LIST', "メールジョブ一覧");
-define('_AD_USER_LANG_MAILJOB_NEW', "メールジョブ新規登録");
-define('_AD_USER_LANG_MAILJOB_SEND', "一斉メールの送信");
-define('_AD_USER_LANG_MAILOK', "当サイトの新着情報などをメールで受け取る");
-define('_AD_USER_LANG_NAME', "本名");
-define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
-define('_AD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
-define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
-define('_AD_USER_LANG_OFF', "オフ");
-define('_AD_USER_LANG_ON', "オン");
-define('_AD_USER_LANG_OVER_POSTS', "投稿数が<strong>X</strong>件以上");
-define('_AD_USER_LANG_PASS', "パスワード");
-define('_AD_USER_LANG_PENDING_USERS_ONLY', "承認が済んでいないユーザのみ");
-define('_AD_USER_LANG_PERM_ACCESS', "アクセス");
-define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限");
-define('_AD_USER_LANG_PERM_ADMIN', "管理");
-define('_AD_USER_LANG_PERM_BLOCK_ACCESS', "ブロック アクセス権限");
-define('_AD_USER_LANG_PERM_GROUP_PERM_BLOCK', "ブロック管理");
-define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "モジュール管理");
-define('_AD_USER_LANG_PERM_MODULE_ACCESS', "システム/モジュール管理権限");
-define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "システム管理");
-define('_AD_USER_LANG_POSTS', "投稿数");
-define('_AD_USER_LANG_RANK', "ランク");
-define('_AD_USER_LANG_RANK_EDIT', "ユーザーランク編集");
-define('_AD_USER_LANG_RANK_ID', "ID");
-define('_AD_USER_LANG_RANK_IMAGE', "画像");
-define('_AD_USER_LANG_RANK_LIST', "ユーザーランク管理");
-define('_AD_USER_LANG_RANK_MAX', "最高投稿数");
-define('_AD_USER_LANG_RANK_MIN', "最低投稿数");
-define('_AD_USER_LANG_RANK_NEW', "ユーザーランク新規登録");
-define('_AD_USER_LANG_RANK_SPECIAL', "特別ランク");
-define('_AD_USER_LANG_RANK_TITLE', "ランク名");
-define('_AD_USER_LANG_REGDATE', "登録日");
-define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時が<strong>X</strong>日以内");
-define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時が<strong>X</strong>日以上前");
-define('_AD_USER_LANG_REGISTDATE', "登録日時");
-define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
-define('_AD_USER_LANG_SEARCH_AGAIN', "条件を修正して再検索");
-define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信");
-define('_AD_USER_LANG_SENDER', "送信者");
-define('_AD_USER_LANG_SUBJECT', "件名");
-define('_AD_USER_LANG_SUBMIT', "送信");
-define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
-define('_AD_USER_LANG_THEME', "テーマ");
-define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
-define('_AD_USER_LANG_TITLE', "タイトル");
-define('_AD_USER_LANG_UID', "UID");
-define('_AD_USER_LANG_UMODE', "コメント表示モード");
-define('_AD_USER_LANG_UNAME', "ユーザー名");
-define('_AD_USER_LANG_UNDER_POSTS', "投稿数が<strong>X</strong>件以下");
-define('_AD_USER_LANG_UORDER', "コメントの並び順");
-define('_AD_USER_LANG_URL', "ホームページ");
-define('_AD_USER_LANG_USER', "ユーザー");
-define('_AD_USER_LANG_USER_AIM', "AIM");
-define('_AD_USER_LANG_USER_AVATAR', "アバター");
-define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除");
-define('_AD_USER_LANG_USER_DELETE_ADVICE', "<b>_%s_</b> のユーザーを削除します。よろしいですか？");
-define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集");
-define('_AD_USER_LANG_USER_FROM', "居住地");
-define('_AD_USER_LANG_USER_ICQ', "ICQ");
-define('_AD_USER_LANG_USER_INTREST', "趣味");
-define('_AD_USER_LANG_USER_LIST', "ユーザー管理");
-define('_AD_USER_LANG_USER_MAILOK', "当サイトの新着情報などをメールで受け取る");
-define('_AD_USER_LANG_USER_MSNM', "MSNM");
-define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録");
-define('_AD_USER_LANG_USER_OCC', "職業");
-define('_AD_USER_LANG_USER_REGDATE', "登録日時");
-define('_AD_USER_LANG_USER_SEARCH_LIST', "ユーザー検索結果");
-define('_AD_USER_LANG_USER_SIG', "署名");
-define('_AD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する");
-define('_AD_USER_LANG_USER_YIM', "YIM");
-define('_AD_USER_LANG_VPASS', "パスワード確認");
-define('_AD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか？");
-define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "このユーザーランクを本当に削除しますか？");
-define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "指定ユーザーランクを削除しました");
-define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "ユーザーランクを保存しました");
-define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
-define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース（真っ白になるなど）があります。<br/>その場合はブラウザでリロード（再読込）操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。");
-
-?>
+<?php
+
+define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
+define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
+define('_AD_USER_ERROR_EMAIL', "入力された{0}を電子メールの形式として正しく認識できません");
+define('_AD_USER_ERROR_GROUP_VALUE', "指定されたグループの値が不正です");
+define('_AD_USER_ERROR_IMAGE_REQUIRED', "イメージ画像を必ず指定して下さい");
+define('_AD_USER_ERROR_INJURY', "{0}に指定された値が不正です");
+define('_AD_USER_ERROR_INJURY_MIN_MAX', "最低値と最高値の関係が不正です");
+define('_AD_USER_ERROR_INJURY_SPECIAL', "特別ランクの値が不正です");
+define('_AD_USER_ERROR_INTRANGE', "{0}の入力値が不正です");
+define('_AD_USER_ERROR_MAILJOB_SEND_ERROR', "最低ひとつの送信方法を指定してください");
+define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "メール・プライベートメッセージの送信に失敗しました");
+define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "最低ひとつの送信方法を指定してください");
+define('_AD_USER_ERROR_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
+define('_AD_USER_ERROR_MIN', "{0}は最低でも{1}以上の値を入力して下さい");
+define('_AD_USER_ERROR_NO_UPLOAD_FILE', "このランクのための画像ファイルをアップロードして下さい");
+define('_AD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません");
+define('_AD_USER_ERROR_PASSWORD_REQUIRED', "パスワードは必ず入力して下さい");
+define('_AD_USER_ERROR_RAISE_ERROR', "エラーが発生しました");
+define('_AD_USER_ERROR_REQUEST_IS_WRONG', "不正なリクエストです");
+define('_AD_USER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+define('_AD_USER_ERROR_UMODE', "コメントの並び順に指定した値が不正です");
+define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "ユーザー名が重複しています。変更して下さい。");
+define('_AD_USER_ERROR_WRONG_FORMAT', "不正なフォーマットです");
+define('_AD_USER_LANG_ACTIVEUSER', "アクティブユーザー");
+define('_AD_USER_LANG_ACTKEY', "アクティベートキー");
+define('_AD_USER_LANG_ALL_OF_USERS', "すべてのユーザー");
+define('_AD_USER_LANG_APPROVE_USERS_ONLY', "承認済みユーザーのみ");
+define('_AD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する");
+define('_AD_USER_LANG_AVATAR_CREATED', "作成日時");
+define('_AD_USER_LANG_AVATAR_DELETE', "アバター削除");
+define('_AD_USER_LANG_AVATAR_DISPLAY', "表示");
+define('_AD_USER_LANG_AVATAR_EDIT', "アバター編集");
+define('_AD_USER_LANG_AVATAR_FILE', "画像ファイル名");
+define('_AD_USER_LANG_AVATAR_ID', "ID");
+define('_AD_USER_LANG_AVATAR_MIMETYPE', "MimeType");
+define('_AD_USER_LANG_AVATAR_NAME', "画像名");
+define('_AD_USER_LANG_AVATAR_NEW', "アバター新規追加");
+define('_AD_USER_LANG_AVATAR_TYPE', "タイプ");
+define('_AD_USER_LANG_AVATAR_USING_COUNT', "使用数");
+define('_AD_USER_LANG_AVATAR_WEIGHT', "優先度");
+define('_AD_USER_LANG_BIO', "その他");
+define('_AD_USER_LANG_BODY', "本文");
+define('_AD_USER_LANG_BY_EMAIL', "Ｅメールで送信");
+define('_AD_USER_LANG_BY_PM', "PMで送信");
+define('_AD_USER_LANG_COMPLETED', "完了");
+define('_AD_USER_LANG_CONTROL', "操作");
+define('_AD_USER_LANG_CREATE_NEW', "新規作成");
+define('_AD_USER_LANG_CREATE_UNIXTIME', "作成日");
+define('_AD_USER_LANG_CUSTOM_AVATAR', "カスタムアバター");
+define('_AD_USER_LANG_DELETE_RANK', "ユーザーランクの削除");
+define('_AD_USER_LANG_DESCRIPTION', "description");
+define('_AD_USER_LANG_DISPLAY_USER_LEVEL', "表示するユーザの種類");
+define('_AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION', "表示するユーザのメール設定");
+define('_AD_USER_LANG_EDIT', "編集");
+define('_AD_USER_LANG_EMAIL', "メールアドレス");
+define('_AD_USER_LANG_FROM_EMAIL', "送信元メールアドレス");
+define('_AD_USER_LANG_FROM_NAME', "送信者名");
+define('_AD_USER_LANG_GROUP', "グループ");
+define('_AD_USER_LANG_GROUP_AMMO', "メンバー数");
+define('_AD_USER_LANG_GROUP_ASSIGN', "メンバーの登録");
+define('_AD_USER_LANG_GROUP_ASSIN_MEMBERS', "このグループに登録されているユーザー一覧");
+define('_AD_USER_LANG_GROUP_DELETE', "ユーザーグループの削除");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE', "<b>_%s_</b> のユーザーグループを削除します。よろしいですか？");
+define('_AD_USER_LANG_GROUP_DELETE_ADVICE2', "グループを削除してもユーザーは削除されません");
+define('_AD_USER_LANG_GROUP_DESC', "説明");
+define('_AD_USER_LANG_GROUP_EDIT', "ユーザーグループ編集");
+define('_AD_USER_LANG_GROUP_GID', "GID");
+define('_AD_USER_LANG_GROUP_LIST', "ユーザーグループ管理");
+define('_AD_USER_LANG_GROUP_NAME', "名前");
+define('_AD_USER_LANG_GROUP_NEW', "ユーザーグループ新規追加");
+define('_AD_USER_LANG_GROUP_NOASSIN_MEMBERS', "このグループに登録されていないユーザー一覧");
+define('_AD_USER_LANG_GROUP_PERMISSION', "パーミッション");
+define('_AD_USER_LANG_GROUP_PROPERTY', "プロパティ");
+define('_AD_USER_LANG_GROUP_TYPE', "タイプ");
+define('_AD_USER_LANG_GROUPID', "グループID");
+define('_AD_USER_LANG_ID', "ID");
+define('_AD_USER_LANG_IS_MAIL', "メール送信");
+define('_AD_USER_LANG_IS_PM', "ＰＭ送信");
+define('_AD_USER_LANG_LAST_LOGIN', "最終ログイン");
+define('_AD_USER_LANG_LASTLOG_LESS', "<strong>X</strong>日以内にログインしている");
+define('_AD_USER_LANG_LASTLOG_MORE', "<strong>X</strong>日以上ログインしていない");
+define('_AD_USER_LANG_LASTLOGIN', "最終ログイン");
+define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
+define('_AD_USER_LANG_LEFT_TARGET_USER', "残送信数");
+define('_AD_USER_LANG_LEVEL', "レベル");
+define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
+define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
+define('_AD_USER_LANG_MAILJOB_DELETE', "メールジョブ削除");
+define('_AD_USER_LANG_MAILJOB_EDIT', "メールジョブ編集");
+define('_AD_USER_LANG_MAILJOB_ID', "ジョブID");
+define('_AD_USER_LANG_MAILJOB_LIST', "メールジョブ一覧");
+define('_AD_USER_LANG_MAILJOB_NEW', "メールジョブ新規登録");
+define('_AD_USER_LANG_MAILJOB_SEND', "一斉メールの送信");
+define('_AD_USER_LANG_MAILOK', "当サイトの新着情報などをメールで受け取る");
+define('_AD_USER_LANG_NAME', "本名");
+define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
+define('_AD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
+define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
+define('_AD_USER_LANG_OFF', "オフ");
+define('_AD_USER_LANG_ON', "オン");
+define('_AD_USER_LANG_OVER_POSTS', "投稿数が<strong>X</strong>件以上");
+define('_AD_USER_LANG_PASS', "パスワード");
+define('_AD_USER_LANG_PENDING_USERS_ONLY', "承認が済んでいないユーザのみ");
+define('_AD_USER_LANG_PERM_ACCESS', "アクセス");
+define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限");
+define('_AD_USER_LANG_PERM_ADMIN', "管理");
+define('_AD_USER_LANG_PERM_BLOCK_ACCESS', "ブロック アクセス権限");
+define('_AD_USER_LANG_PERM_GROUP_PERM_BLOCK', "ブロック管理");
+define('_AD_USER_LANG_PERM_GROUP_PERM_MODULE', "モジュール管理");
+define('_AD_USER_LANG_PERM_MODULE_ACCESS', "システム/モジュール管理権限");
+define('_AD_USER_LANG_PERM_SYSTEM_PERM_MODULE', "システム管理");
+define('_AD_USER_LANG_POSTS', "投稿数");
+define('_AD_USER_LANG_RANK', "ランク");
+define('_AD_USER_LANG_RANK_EDIT', "ユーザーランク編集");
+define('_AD_USER_LANG_RANK_ID', "ID");
+define('_AD_USER_LANG_RANK_IMAGE', "画像");
+define('_AD_USER_LANG_RANK_LIST', "ユーザーランク管理");
+define('_AD_USER_LANG_RANK_MAX', "最高投稿数");
+define('_AD_USER_LANG_RANK_MIN', "最低投稿数");
+define('_AD_USER_LANG_RANK_NEW', "ユーザーランク新規登録");
+define('_AD_USER_LANG_RANK_SPECIAL', "特別ランク");
+define('_AD_USER_LANG_RANK_TITLE', "ランク名");
+define('_AD_USER_LANG_REGDATE', "登録日");
+define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時が<strong>X</strong>日以内");
+define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時が<strong>X</strong>日以上前");
+define('_AD_USER_LANG_REGISTDATE', "登録日時");
+define('_AD_USER_LANG_REGISTDATE_FLAG', "registdate_flag");
+define('_AD_USER_LANG_SEARCH_AGAIN', "条件を修正して再検索");
+define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "この条件でメールを送信");
+define('_AD_USER_LANG_SENDER', "送信者");
+define('_AD_USER_LANG_SUBJECT', "件名");
+define('_AD_USER_LANG_SUBMIT', "送信");
+define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
+define('_AD_USER_LANG_THEME', "テーマ");
+define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
+define('_AD_USER_LANG_TITLE', "タイトル");
+define('_AD_USER_LANG_UID', "UID");
+define('_AD_USER_LANG_UMODE', "コメント表示モード");
+define('_AD_USER_LANG_UNAME', "ユーザー名");
+define('_AD_USER_LANG_UNDER_POSTS', "投稿数が<strong>X</strong>件以下");
+define('_AD_USER_LANG_UORDER', "コメントの並び順");
+define('_AD_USER_LANG_URL', "ホームページ");
+define('_AD_USER_LANG_USER', "ユーザー");
+define('_AD_USER_LANG_USER_AIM', "AIM");
+define('_AD_USER_LANG_USER_AVATAR', "アバター");
+define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除");
+define('_AD_USER_LANG_USER_DELETE_ADVICE', "<b>_%s_</b> のユーザーを削除します。よろしいですか？");
+define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集");
+define('_AD_USER_LANG_USER_FROM', "居住地");
+define('_AD_USER_LANG_USER_ICQ', "ICQ");
+define('_AD_USER_LANG_USER_INTREST', "趣味");
+define('_AD_USER_LANG_USER_LIST', "ユーザー管理");
+define('_AD_USER_LANG_USER_MAILOK', "当サイトの新着情報などをメールで受け取る");
+define('_AD_USER_LANG_USER_MSNM', "MSNM");
+define('_AD_USER_LANG_USER_NEW', "ユーザー新規登録");
+define('_AD_USER_LANG_USER_OCC', "職業");
+define('_AD_USER_LANG_USER_REGDATE', "登録日時");
+define('_AD_USER_LANG_USER_SEARCH_LIST', "ユーザー検索結果");
+define('_AD_USER_LANG_USER_SIG', "署名");
+define('_AD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する");
+define('_AD_USER_LANG_USER_YIM', "YIM");
+define('_AD_USER_LANG_VPASS', "パスワード確認");
+define('_AD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか？");
+define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "このユーザーランクを本当に削除しますか？");
+define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "指定ユーザーランクを削除しました");
+define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "ユーザーランクを保存しました");
+define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
+define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース（真っ白になるなど）があります。<br/>その場合はブラウザでリロード（再読込）操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。");
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:58:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:58:25 +0900
Subject: [xoops-cvslog 3602] CVS update: xoops2jp/html/kernel
Message-ID: <20060713105825.DE2522AC03A@users.sourceforge.jp>

Index: xoops2jp/html/kernel/privmessage.php
diff -u xoops2jp/html/kernel/privmessage.php:1.2.8.6 xoops2jp/html/kernel/privmessage.php:1.2.8.7
--- xoops2jp/html/kernel/privmessage.php:1.2.8.6	Fri Jul  7 11:52:24 2006
+++ xoops2jp/html/kernel/privmessage.php	Thu Jul 13 19:58:25 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: privmessage.php,v 1.2.8.6 2006/07/07 02:52:24 minahito Exp $
+// $Id: privmessage.php,v 1.2.8.7 2006/07/13 10:58:25 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -39,7 +39,7 @@
  * @author		Kazumi Ono	<onokazu ＠ xoops.org>
  * @copyright	copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org)
  *
- * @version		$Revision: 1.2.8.6 $ - $Date: 2006/07/07 02:52:24 $
+ * @version		$Revision: 1.2.8.7 $ - $Date: 2006/07/13 10:58:25 $
  */
 class XoopsPrivmessage extends XoopsObject
 {
@@ -55,7 +55,7 @@
         $this->initVar('subject', XOBJ_DTYPE_TXTBOX, null, true, 255);
         $this->initVar('from_userid', XOBJ_DTYPE_INT, null, true);
         $this->initVar('to_userid', XOBJ_DTYPE_INT, null, true);
-        $this->initVar('msg_time', XOBJ_DTYPE_OTHER, null, false);
+        $this->initVar('msg_time', XOBJ_DTYPE_OTHER, time(), false);
         $this->initVar('msg_text', XOBJ_DTYPE_TXTAREA, null, true);
         $this->initVar('read_msg', XOBJ_DTYPE_INT, 0, false);
     }
@@ -84,7 +84,7 @@
  * @author		Kazumi Ono	<onokazu ＠ xoops.org>
  * @copyright	copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org)
  *
- * @version		$Revision: 1.2.8.6 $ - $Date: 2006/07/07 02:52:24 $
+ * @version		$Revision: 1.2.8.7 $ - $Date: 2006/07/13 10:58:25 $
  */
 class XoopsPrivmessageHandler extends XoopsObjectHandler
 {

From minahito ＠ users.sourceforge.jp  Thu Jul 13 19:59:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 13 Jul 2006 19:59:24 +0900
Subject: [xoops-cvslog 3603] CVS update: xoops2jp/html/include
Message-ID: <20060713105924.27AAF2AC03A@users.sourceforge.jp>

Index: xoops2jp/html/include/common.php
diff -u xoops2jp/html/include/common.php:1.4.8.13 xoops2jp/html/include/common.php:1.4.8.14
--- xoops2jp/html/include/common.php:1.4.8.13	Wed Nov 30 13:30:09 2005
+++ xoops2jp/html/include/common.php	Thu Jul 13 19:59:24 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: common.php,v 1.4.8.13 2005/11/30 04:30:09 minahito Exp $
+// $Id: common.php,v 1.4.8.14 2006/07/13 10:59:24 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
@@ -28,24 +28,25 @@
 //
 // Prohibition of a direct kick
 //
-if (!defined("XOOPS_MAINFILE_INCLUDED"))
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
 	die();
+}
 
-require_once XOOPS_ROOT_PATH."/kernel/XCube_Root.class.php";
-require_once XOOPS_ROOT_PATH."/kernel/XCube_Controller.class.php";
+require_once XOOPS_ROOT_PATH . "/kernel/XCube_Root.class.php";
+require_once XOOPS_ROOT_PATH . "/kernel/XCube_Controller.class.php";
 
 //
 // TODO We have to move the following lines to an appropriate place.
 //      (We may not need the following constants)
 //
-define("XCUBE_SITE_SETTING_FILE",XOOPS_ROOT_PATH."/settings/site_default.ini.php");
-define("XCUBE_SITE_CUSTOM_FILE",XOOPS_ROOT_PATH."/settings/site_custom.ini.php");
+define("XCUBE_SITE_SETTING_FILE", XOOPS_ROOT_PATH . "/settings/site_default.ini.php");
+define("XCUBE_SITE_CUSTOM_FILE", XOOPS_ROOT_PATH . "/settings/site_custom.ini.php");
 
 //
 //@todo How does the system decide the main controller?
 //
 $root=&XCube_Root::getSingleton();
-$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE,XCUBE_SITE_CUSTOM_FILE);
+$root->loadSiteConfig(XCUBE_SITE_SETTING_FILE, XCUBE_SITE_CUSTOM_FILE);
 $root->setupController();
 
 $xoopsController=&$root->getController();

From nobunobu ＠ users.sourceforge.jp  Thu Jul 13 22:12:42 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 13 Jul 2006 22:12:42 +0900
Subject: [xoops-cvslog 3604] CVS update: xoops2jp/html/class
Message-ID: <20060713131242.EB7F62AC0A8@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_Service.class.php
diff -u xoops2jp/html/class/XCube_Service.class.php:1.1.2.4 xoops2jp/html/class/XCube_Service.class.php:1.1.2.5
--- xoops2jp/html/class/XCube_Service.class.php:1.1.2.4	Wed Jun 28 14:44:14 2006
+++ xoops2jp/html/class/XCube_Service.class.php	Thu Jul 13 22:12:42 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Service.class.php,v 1.1.2.4 2006/06/28 05:44:14 minahito Exp $
+ * @version $Id: XCube_Service.class.php,v 1.1.2.5 2006/07/13 13:12:42 nobunobu Exp $
  */
 
 /**
@@ -92,7 +92,7 @@
 	}
 }
 
-class XCube_ServiceClienet extends XCube_AbstractServiceClient
+class XCube_ServiceClient extends XCube_AbstractServiceClient
 {
 	function call()
 	{

From minahito ＠ users.sourceforge.jp  Fri Jul 14 14:24:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Jul 2006 14:24:18 +0900
Subject: [xoops-cvslog 3605] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060714052418.66E042AC0C0@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.6 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.7
--- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.6	Thu May 18 23:04:04 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php	Fri Jul 14 14:24:18 2006
@@ -1,14 +1,18 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupPropertyAction.class.php,v 1.1.2.7 2006/07/14 05:24:18 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_ROOT_PATH."/class/XCube_PageNavigator.class.php";
 require_once XOOPS_MODULE_PATH."/user/admin/class/Permission.class.php";
-require_once XOOPS_MODULE_PATH."/user/admin/class/XoopsGroupEx.class.php";
 
 /**
  *
- * This function keeps difficult problems that this depens on the column's block of X2 theme format.
+ * This function keeps difficult problems that this depens on the column's
+ * block of X2 theme format.
  */
 class User_GroupPropertyAction extends User_Action
 {
@@ -20,11 +24,6 @@
 	var $mUsers;
 	var $mPageNavi;
 
-	function isSecure()
-	{
-		return true;
-	}
-
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$this->_loadGroup();
@@ -43,7 +42,7 @@
 		$memberHandler =& xoops_gethandler('member');
 
 		$total = $memberHandler->getUserCountByGroup($this->mGroup->getVar('groupid'));
-		$this->mPageNavi=new XCube_PageNavigator("./index.php?action=RankList",$total,XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
+		$this->mPageNavi =& new XCube_PageNavigator("./index.php?action=RankList", $total, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);	// TODO get controller->getUrl() ?
 
 		$this->mPageNavi->fetch();
 		
@@ -54,7 +53,7 @@
 		// Get...
 		//
 		if (file_exists(XOOPS_ROOT_PATH . "/modules/system/constants.php")) {
-		    if($moduleHandler->getByDirname('system')) {
+		    if ($moduleHandler->getByDirname('system')) {
         		require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
         		$fileHandler = opendir(XOOPS_ROOT_PATH . "/modules/system/admin");
         		while ($file = readdir($fileHandler)) {
@@ -111,24 +110,21 @@
 
 	function _loadGroup()
 	{
-		$groupId = isset($_REQUEST['groupid']) ? intval($_REQUEST['groupid']) : 0;
+		$id = xoops_getrequest('groupid');
 
-		$groupHandler =& xoops_gethandler('group');
-		$group =& $groupHandler->get($groupId);
-		if (is_object($group)) {
-			$this->mGroup =& new XoopsGroupEx($group);
-		}
+		$handler =& xoops_getmodulehandler('groups');
+		$this->mGroup =& $handler->get($id);
 	}
 
 	function executeViewIndex(&$controller,&$xoopsUser,&$render)
 	{
 		$render->setTemplateName("group_property.html");
-		$render->setAttribute("group",$this->mGroup);
-		$render->setAttribute("modulePermissions",$this->mPermissions);
-		$render->setAttribute("blockPermissions",$this->mBlockPermissions);
-		$render->setAttribute("systemPermissions",$this->mSystemPermissions);
-		$render->setAttribute("users",$this->mUsers);
-		$render->setAttribute("pageNavi",$this->mPageNavi);
+		$render->setAttribute("group", $this->mGroup);
+		$render->setAttribute("modulePermissions", $this->mPermissions);
+		$render->setAttribute("blockPermissions", $this->mBlockPermissions);
+		$render->setAttribute("systemPermissions", $this->mSystemPermissions);
+		$render->setAttribute("users", $this->mUsers);
+		$render->setAttribute("pageNavi", $this->mPageNavi);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Jul 14 17:37:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Jul 2006 17:37:24 +0900
Subject: [xoops-cvslog 3606] CVS update: xoops2jp/html/preload
Message-ID: <20060714083724.591452AC038@users.sourceforge.jp>

Index: xoops2jp/html/preload/IndexRedirector.class.php
diff -u xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.2 xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.3
--- xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.2	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/preload/IndexRedirector.class.php	Fri Jul 14 17:37:24 2006
@@ -1,4 +1,7 @@
 <?php
+/**
+ * @version $Id$
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -6,16 +9,17 @@
 {
 	function preBlockFilter()
 	{
-		$delegate=new XCube_Delegate("IndexRedirector", "redirect");
+		$delegate =& new XCube_Delegate("IndexRedirector", "redirect");
 		$this->mController->mRoot->mEventManager->add("Legacypage.Top.Access", $delegate);
 	}
 
 	function redirect(&$controller, &$eventArgs)
 	{
 		$startPage = $controller->getConfig('startpage');
-		if ($startPage != null && $startPage != "--") {
-			header('Location: ' . XOOPS_URL . '/modules/' . $startPage . '/');
-			exit();
+		$handler =& xoops_gethandler('module');
+		$module =& $handler->get($startPage);
+		if ($startPage != null && $startPage != "--" && !is_object($module)) {
+			$controller->executeForward(XOOPS_URL . '/modules/' . $module->getShow('dirname') . '/');
 		}
 	}
 }

From minahito ＠ users.sourceforge.jp  Fri Jul 14 17:51:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Jul 2006 17:51:13 +0900
Subject: [xoops-cvslog 3607] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060714085113.4E5252AC038@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.1	Tue Jul  4 18:47:23 2006
+++ xoops2jp/html/modules/pm/actions/DeleteAction.class.php	Fri Jul 14 17:51:13 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Pm
- * @version $Id: DeleteAction.class.php,v 1.1.2.1 2006/07/04 09:47:23 minahito Exp $
+ * @version $Id: DeleteAction.class.php,v 1.1.2.2 2006/07/14 08:51:13 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -51,12 +51,12 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("./index.php", 1, _PM_DELETED);
+		$controller->executeRedirect("./index.php", 1, _PM_DELETED);
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("./index.php", 1, _MD_PM_ERROR_ACCESS);
+		$controller->executeRedirect("./index.php", 1, _MD_PM_ERROR_ACCESS);
 	}
 }
 
Index: xoops2jp/html/modules/pm/actions/PmliteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/PmliteAction.class.php:1.1.2.1 xoops2jp/html/modules/pm/actions/PmliteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/actions/PmliteAction.class.php:1.1.2.1	Tue Jul  4 18:47:51 2006
+++ xoops2jp/html/modules/pm/actions/PmliteAction.class.php	Fri Jul 14 17:51:13 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Pm
- * @version $Id: PmliteAction.class.php,v 1.1.2.1 2006/07/04 09:47:51 minahito Exp $
+ * @version $Id: PmliteAction.class.php,v 1.1.2.2 2006/07/14 08:51:13 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -86,7 +86,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("pmlite.php", 3, _MD_PM_ERROR_MESSAGE_SEND);
+		$controller->executeRedirect("pmlite.php", 3, _MD_PM_ERROR_MESSAGE_SEND);
 	}
 }
 
Index: xoops2jp/html/modules/pm/actions/ReadAction.class.php
diff -u xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.1 xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.1	Tue Jul  4 18:48:05 2006
+++ xoops2jp/html/modules/pm/actions/ReadAction.class.php	Fri Jul 14 17:51:13 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package Pm
- * @version $Id: ReadAction.class.php,v 1.1.2.1 2006/07/04 09:48:05 minahito Exp $
+ * @version $Id: ReadAction.class.php,v 1.1.2.2 2006/07/14 08:51:13 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -107,7 +107,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader("./index.php", 1, _MD_PM_ERROR_ACCESS);
+		$controller->executeRedirect("./index.php", 1, _MD_PM_ERROR_ACCESS);
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Sun Jul 16 15:41:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 16 Jul 2006 15:41:33 +0900
Subject: [xoops-cvslog 3608] CVS update: xoops2jp/html/kernel
Message-ID: <20060716064133.92AED2AC0EA@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.11 xoops2jp/html/kernel/module.php:1.2.8.12
--- xoops2jp/html/kernel/module.php:1.2.8.11	Thu May 18 23:04:04 2006
+++ xoops2jp/html/kernel/module.php	Sun Jul 16 15:41:33 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.11 2006/05/18 14:04:04 nobunobu Exp $
+// $Id: module.php,v 1.2.8.12 2006/07/16 06:41:33 minahito 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 * $this->modinfo['version']));
+        $this->setVar('version', round(100 * floatval($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;
@@ -210,7 +210,12 @@
             }
             return;
         }
+		
         $this->modinfo =& $modversion;
+		
+		if (!isset($this->modinfo['version'])) {
+			$this->modinfo['version'] = floatval($this->modinfo['version']);
+		}
     }
 
     /**

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:17:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:17:35 +0900
Subject: [xoops-cvslog 3609] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060719101735.1899D2AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_ContentManager.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_ContentManager.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_ContentManager.class.php:removed
--- xoops2jp/html/modules/base/kernel/Legacy_ContentManager.class.php:1.1.2.2	Tue Mar 28 22:30:15 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_ContentManager.class.php	Wed Jul 19 19:17:35 2006
@@ -1,77 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/kernel/XCube_Content.class.php";
-
-/**
- * WARNING : THIS IS TEST CLASS
- *
- * @see XCube_ContentObjectManager
- */
-class Legacy_ContentManager extends XCube_ContentObjectManager
-{
-	function fetchContent($modId,$className,$dataId)
-	{
-		$db=&$this->mRoot->mController->getDB();
-
-		$table=$db->prefix("legacy_contents");
-		
-		$strFlag=false;
-
-		if(is_int($dataId)) {
-			$sql="SELECT * FROM ${table} WHERE mod_id=? AND class_name=? AND data_id=?";
-			$db->prepare($sql);
-			$db->bind_param("isi",$modId,$className,$dataId);
-		}
-		else {
-			$sql="SELECT * FROM ${table} WHERE mod_id=? AND class_name=? AND data_str_id=?";
-			$db->prepare($sql);
-			$db->bind_param("iss",$modId,$className,$dataId);
-			$strFlag=true;
-		}
-
-		$result=$db->execute();
-		if(!$result) {
-			die("You can not access to content manage data resource.");
-		}
-
-		if($row=$db->fetchArray($result)) {
-			if($strFlag) {
-				$ret=new XCube_ContentObject($row['id'],$row['mod_id'],$row['class_name'],$row['data_str_id']);
-			}
-			else {
-				$ret=new XCube_ContentObject($row['id'],$row['mod_id'],$row['class_name'],$row['data_id']);
-			}
-
-			return $ret;
-		}
-
-		//
-		// Because we can't get content id, we have to register this parameter
-		// to object manager. 
-		//
-		// TODO the follow process depends on mysql database.
-		//
-
-		if($strFlag) {
-			$db->prepare("INSERT INTO ${table} ( mod_id, class_name, data_str_id ) VALUES ( ?, ?, ? )");
-			$db->bind_param("iss",$modId,$className,$dataId);
-		}
-		else {
-			$db->prepare("INSERT INTO ${table} ( mod_id, class_name, data_id ) VALUES ( ?, ?, ? )");
-			$db->bind_param("isi",$modId,$className,$dataId);
-		}
-
-		$result=$db->executeF();
-		if(!$result) {
-			die("OH MY GOD");
-		}
-
-		$ret = new XCube_ContentObject($db->getInsertId(),$modId,$className,$dataId);
-
-		return $ret;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:18:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:18:27 +0900
Subject: [xoops-cvslog 3610] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060719101827.778262AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.47 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.48
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.47	Tue Jul 11 19:06:48 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Wed Jul 19 19:18:27 2006
@@ -1,9 +1,12 @@
 <?php
+/**
+ * @package legacy
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-define("LEGACY_CONTROLLER_STATE_PUBLIC",1);
-define("LEGACY_CONTROLLER_STATE_ADMIN",2);
+define("LEGACY_CONTROLLER_STATE_PUBLIC", 1);
+define("LEGACY_CONTROLLER_STATE_ADMIN", 2);
 
 /**
  * This class is a virtual controller that has the compatibility with XOOPS 2.0.x.
@@ -21,10 +24,10 @@
 {
 	var $mXoopsUser;
 
-	var $_mAdminModeFlag=false;
-	var $_mControllerState=null;
+	var $_mAdminModeFlag = false;
+	var $_mControllerState = null;
 	
-	var $mDialogMode=false;
+	var $mDialogMode = false;
 	
 	/**
 	 * @todo Rename this with "mModule"
@@ -46,6 +49,16 @@
 	 */
 	var $mGetPMInboxUrl = null;
 	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mCheckLogin = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mLogout = null;
+	
 	function Legacy_Controller()
 	{
 		//
@@ -56,6 +69,12 @@
 		
 		$this->mGetCountUnreadPM =& new XCube_NewDelegate();
 		$this->mGetPMInboxUrl =& new XCube_NewDelegate();
+		
+		$this->mCheckLogin =& new XCube_NewDelegate();
+		$this->mCheckLogin->register("Site.CheckLogin");
+		
+		$this->mLogout =& new XCube_NewDelegate();
+		$this->mLogout->register("Site.Logout");
 				
 		set_magic_quotes_runtime(0);	// ^^;
 		
@@ -372,22 +391,33 @@
 		$GLOBALS['xoopsDB']=&$this->mDB;
 	}
 	
+	/**
+	 * Create a instance of Legacy_LanguageManager by the specified language,
+	 * and set it to member properties.
+	 * 
+	 * [Notice]
+	 * Now, this member function sets a string to the member property without
+	 * language manager.
+	 */
 	function _setupLanguage()
 	{
 	    if (!$this->mLanguage) {
-            $configHandler=&xoops_gethandler('config');
-            $criteria =& new CriteriaCompo(new Criteria('conf_modid',0));
-            $criteria->add(new Criteria('conf_catid',XOOPS_CONF));
-            $criteria->add(new Criteria('conf_name','language'));
+            $configHandler =& xoops_gethandler('config');
+            $criteria =& new CriteriaCompo(new Criteria('conf_modid', 0));
+            $criteria->add(new Criteria('conf_catid', XOOPS_CONF));
+            $criteria->add(new Criteria('conf_name', 'language'));
             $configs =& $configHandler->getConfigs($criteria);
             if (count($configs)) {
-                $this->mLanguage = $configs[0]->getVar('conf_value');
+                $this->mLanguage = $configs[0]->getVar('conf_value', 'none');
             }
         }
+		
+		//
+		// Load the additional file to control DB.
 	    if ($this->mLanguage) {
-	        $fname = XOOPS_MODULE_PATH .'/base/language/' .$this->mLanguage .'/charset_'.XOOPS_DB_TYPE.'.php';
-	        if (file_exists($fname)) {
-	            require_once($fname);
+	        $filename = XOOPS_MODULE_PATH . '/base/language/' . $this->mLanguage . '/charset_' . XOOPS_DB_TYPE . '.php';
+	        if (file_exists($filename)) {
+	            require_once($filename);
 	        }
 	    }
     }
@@ -668,9 +698,6 @@
 		$manager->setAnchorDelegate("Legacypage.Backend.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToBackend"));
 		$manager->setAnchorDelegate("Legacypage.Search.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToSearch"));
 
-		$manager->setAnchorDelegate("Site.CheckLogin", new XCube_InstanceDelegate($this, "eventCheckLogin"));
-		$manager->setAnchorDelegate("Site.Logout", new XCube_InstanceDelegate($this, "eventLogout"));
-
 		return $manager;
 	}
 	
@@ -685,39 +712,81 @@
 
 		return $manager;
 	}
-
-	function eventCheckLogin(&$sender,&$eventArgs)
+	
+	/**
+	 * Check the login request through delegates, and set XoopsObject to member
+	 * property if the login is success.
+	 * 
+	 * @access public
+	 */
+	function checkLogin()
 	{
-		if($eventArgs->isSuccess()) {
-			// RMV-NOTIFY
-			// Perform some maintenance of notification records
-			// $notification_handler =& xoops_gethandler('notification');
-			// $notification_handler->doLoginMaintenance($user->getVar('uid'));
-
-			$successEventArgs=array();
-			$successEventArgs['user']=&$eventArgs->getUser();
-			$successEventArgs['xoopsUser']=&$eventArgs->getXoopsUser();
-
-			$this->mRoot->mEventManager->raiseEvent("Site.CheckLogin.Success",$this,$successEventArgs);
-
-			$xoopsUser=&$eventArgs->getXoopsUser();
-			if($xoopsUser!=null) {
-				$message=sprintf(_US_LOGGINGU,$xoopsUser->getVar('uname'));
+		if (!is_object($this->mXoopsUser)) {
+			$this->mCheckLogin->call(new XCube_Ref($this->mXoopsUser));
+
+			if(is_object($this->mXoopsUser)) {
+				// RMV-NOTIFY
+				// Perform some maintenance of notification records
+				// $notification_handler =& xoops_gethandler('notification');
+				// $notification_handler->doLoginMaintenance($user->getVar('uid'));
+
+				XCube_DelegateUtils::call("Site.CheckLogin.Success", new XCube_Ref($this->mXoopsUser));
+
+				//
+				// Fall back process for login success.
+				//
+				$url = XOOPS_URL;
+				if (!empty($_POST['xoops_redirect']) && !strpos(xoops_getrequest('xoops_redirect'), 'register')) {
+					$parsed = parse_url(XOOPS_URL);
+					$url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
+					
+					if (isset($parsed['host'])) {
+						$url .= isset($parsed['port']) ? $parsed['host'] . ':' . $parsed['port'] . trim(xoops_getrequest('xoops_redirect')): $parsed['host'] . trim(xoops_getrequest('xoops_redirect'));
+					} else {
+						$url .= xoops_getenv('HTTP_HOST') . trim(xoops_getrequest('xoops_redirect'));
+					}
+				}
+				
+				$this->mRoot->mLanguageManager->loadModuleLanguage('base');
+
+				$this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_BASE_MESSAGE_LOGIN_SUCCESS, $this->mXoopsUser->get('uname')));
+			}
+			else {
+				XCube_DelegateUtils::call("Site.CheckLogin.Fail", new XCube_Ref($this->mXoopsUser));
+				
+				//
+				// Fall back process for login fail.
+				//
+				$this->executeRedirect(XOOPS_ROOT_PATH . "/user.php", 1, _US_INCORRECTLOGIN);
 			}
-			XCube_Utils::redirectHeader($eventArgs->getRedirectUrl(),1,$message);
 		}
 		else {
-			XCube_Utils::redirectHeader($eventArgs->getRedirectUrl(),1,$eventArgs->getRedirectMessage());
+			$this->executeFoward(XOOPS_URL);
 		}
 	}
 	
-	function eventLogout(&$sender,&$eventArgs)
+	/**
+	 * The current user logout.
+	 * 
+	 * @access public
+	 */
+	function logout()
 	{
-		if($eventArgs['successFlag']) {
-			//
-			// TODO : We depends on a message catalog of user module, yet.
-			//
-			XCube_Utils::redirectHeader(XOOPS_URL,1,_US_LOGGEDOUT.'<br />'._US_THANKYOUFORVISIT);
+		$successFlag = false;
+		$xoopsUser =& $this->getXoopsUser();
+		
+		if (is_object($xoopsUser)) {
+			$this->mLogout->call(new XCube_Ref($successFlag), $xoopsUser);
+			if ($successFlag) {
+				XCube_DelegateUtils::call("Site.Logout.Success");
+				$this->executeRedirect(XOOPS_URL, 1, array(_US_LOGGEDOUT, _US_THANKYOUFORVISIT));
+			}
+			else {
+				XCube_DelegateUtils::call("Site.Logout.Fail");
+			}
+		}
+		else {
+			$this->executeForward(XOOPS_URL);
 		}
 	}
 
@@ -837,8 +906,8 @@
 		
 		$displayMessage = "";
 		if (is_array($message)) {
-			foreach (array_keys($message) as $id) {
-				$message[$id] = htmlspecialchars($message, ENT_QUOTES);
+			foreach (array_keys($message) as $key) {
+				$message[$key] = htmlspecialchars($message[$key], ENT_QUOTES);
 			}
 			$displayMessage = implode("<br/>", $message);
 		}

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:19:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:19:42 +0900
Subject: [xoops-cvslog 3611] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060719101942.2F53A2AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.16 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.17
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.16	Sun May 28 14:06:50 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Wed Jul 19 19:19:42 2006
@@ -71,6 +71,7 @@
 define('_MD_BASE_LANG_VISIBLE', "visible");
 define('_MD_BASE_LANG_WEIGHT', "weight");
 define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MD_BASE_MESSAGE_LOGIN_SUCCESS', "{0}さん、ようこそ。ログイン処理中です");
 define('_MSC_AVAVATARS', "アバター一覧");
 define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
 define('_MSC_CODE', "顔文字");

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:19:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:19:46 +0900
Subject: [xoops-cvslog 3612] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060719101946.652D52AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.15 xoops2jp/html/modules/base/language/english/main.php:1.1.2.16
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.15	Sun May 28 14:06:50 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Wed Jul 19 19:19:46 2006
@@ -69,6 +69,7 @@
 define('_MD_BASE_LANG_VISIBLE', "visible");
 define('_MD_BASE_LANG_WEIGHT', "weight");
 define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MD_BASE_MESSAGE_LOGIN_SUCCESS', "Login success");
 define('_MSC_AVAVATARS', "Available Avatars");
 define('_MSC_CLICKASMILIE', "Click a smilie to insert it into your message.");
 define('_MSC_CODE', "Code");

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:20:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:20:33 +0900
Subject: [xoops-cvslog 3613] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060719102033.758CF2AC09F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.8 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.9
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.8	Tue Apr 11 19:03:53 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,26 +1,39 @@
 <?php
+/**
+ * @package user
+ * @version $Id: EditUserAction.class.php,v 1.1.2.9 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
 require_once XOOPS_MODULE_PATH . "/user/forms/EditUserForm.class.php";
 
+/**
+ * @see User_EditUserForm
+ */
 class User_EditUserAction extends User_AbstractEditAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('user');
+		$handler =& xoops_getmodulehandler('users');
 		return $handler;
 	}
 
+	/**
+	 * Because editable fields are decided by the module config, this member
+	 * function hands the config to the constructor of the action form.
+	 * 
+	 * @see User_AbstractUserEditForm
+	 */
 	function _setupActionForm()
 	{
-		$this->mActionForm=new EditUserForm();
+		$this->mActionForm =& new User_EditUserForm($this->mConfig);
 		$this->mActionForm->prepare();
 	}
 	
@@ -34,7 +47,13 @@
 		return true;
 	}
 	
-	function hasPerm(&$controller, &$xoopsUser, &$moduleConfig)
+	/**
+	 * Allow Conditions:
+	 * 
+	 * 1) The current user is the target user.
+	 * 2) The current user is administrators.
+	 */
+	function hasPerm(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		if ($this->mObject != null) {
 			return ($this->mObject->get('uid') == $xoopsUser->get('uid') || $xoopsUser->isAdmin());
@@ -43,22 +62,62 @@
 		return false;
 	}
 
-	function executeViewInput(&$controller,&$xoopsUser,&$render)
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("user_edituser.html");
-		$render->setAttribute("actionForm",$this->mActionForm);
-		$render->setAttribute("thisUser",$this->mObject);
-		$render->setAttribute("currentUser",$xoopsUser);
+		$render->setAttribute("actionForm", $this->mActionForm);
+		$render->setAttribute("thisUser", $this->mObject);
+		$render->setAttribute("currentUser", $xoopsUser);
+		$render->setAttribute("allow_chgmail", $this->mConfig['allow_chgmail']);
+		
+		$handler =& xoops_gethandler('timezone');
+		$timezoneArr =& $handler->getObjects();
+		$render->setAttribute('timezones', $timezoneArr);
+		
+		//
+		// umode option
+		//
+		$umodeOptions = array("nest" => _NESTED, "flat" => _FLAT, "thread" => _THREADED);
+		$render->setAttribute('umodeOptions', $umodeOptions);
+
+		//		
+		// uorder option
+		//
+		$uorderOptions = array(0 => _OLDESTFIRST, 1 => _NEWESTFIRST);
+		$render->setAttribute('uorderOptions', $uorderOptions);
+
+		//
+		// notify option
+		//
+
+		//
+		// TODO Because abstract message catalog style is not decided, we load directly.
+		//
+		$root =& XCube_Root::getSingleton();
+		require_once XOOPS_ROOT_PATH . "/language/" . $root->mController->getConfig('language') . "/notification.php";
+		require_once XOOPS_ROOT_PATH . "/include/notification_constants.php";
+
+		$methodOptions = array(XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
+		                         XOOPS_NOTIFICATION_METHOD_PM => _NOT_METHOD_PM,
+		                         XOOPS_NOTIFICATION_METHOD_EMAIL => _NOT_METHOD_EMAIL
+		                   );
+		$render->setAttribute('notify_methodOptions', $methodOptions);
+		
+		$modeOptions = array(XOOPS_NOTIFICATION_MODE_SENDALWAYS => _NOT_MODE_SENDALWAYS,
+		                       XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE => _NOT_MODE_SENDONCE,
+		                       XOOPS_NOTIFICATION_MODE_SENDONCETHENWAIT => _NOT_MODE_SENDONCEPERLOGIN
+		                 );
+		$render->setAttribute('notify_modeOptions', $modeOptions);
 	}
 
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewSuccess(&$controller,&$xoopsUser,&$render)
 	{
 		$controller->executeForward('./index.php?action=UserInfo&uid=' . $this->mObject->get('uid'));
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header(XOOPS_URL, 1, _MD_USER_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect(XOOPS_URL, 1, _MD_USER_ERROR_DBUPDATE_FAILED);
 	}
 }
 
Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.5	Tue Apr 11 19:03:53 2006
+++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarSelectAction.class.php,v 1.1.2.6 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -8,6 +12,8 @@
 /**
  *  When the request is POST, this class fetches avatar_id and set it to user
  * object. This class always kicks out GET request.
+ * 
+ * @see User_AvatarSelectForm
  */
 class User_AvatarSelectAction extends User_AbstractEditAction
 {
@@ -27,12 +33,12 @@
 	
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('user');
+		$handler =& xoops_getmodulehandler('user');
 		return $handler;
 	}
 
@@ -122,7 +128,6 @@
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		$controller->executeForward("./index.php?action=AvatarUpload&uid=" . $this->mObject->get('uid'));
-		return USER_FRAME_VIEW_NONE;
 	}
 	
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
@@ -132,7 +137,7 @@
 
 	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
 	{
-		redirect_header("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
 	}
 }
 
Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.5 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.5	Tue Apr 11 19:03:53 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarEditAction.class.php,v 1.1.2.6 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -9,20 +13,52 @@
 require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
 
 /**
- *  When the request is GET, shows two forms to changing a avatar for specified
- * user. One of form shows upload-form. Other form shows the list of preset
- * avatar (system avatar) and its page navigator. 
+ * This action handles the uploaded avatar image file.
+ * 
+ * Users who are allowed to upload, can upload custom avatars and select system
+ * avatars. So this action has to implement both of uploading and selecting.
+ * In the case of GET request, this action shows two forms to changing a avatar
+ * for specified user. One of form shows upload-form. Anther form shows the list
+ * of system avatars and the page navigator of the list.
+ * 
+ * @see User_AvatarEditForm
+ * @see User_AvatarSelectForm
  */
 class User_AvatarEditAction extends User_AbstractEditAction
 {
+	/**
+	 * @var int
+	 */
 	var $mAvatarWidth = 0;
+	
+	/**
+	 * @var int
+	 */
 	var $mAvatarHeight = 0;
+	
+	/**
+	 * @var int
+	 */
 	var $mAvatarMaxfilesize = 0;
 	
+	/**
+	 * @var int
+	 */
 	var $_mMinPost = 0;
+	
+	/**
+	 * @var bool
+	 */
 	var $_mAllowUpload = false;
 	
+	/**
+	 * @var User_PageNavigator
+	 */
 	var $mNavi;
+	
+	/**
+	 * @var User_AvatarFilterForm
+	 */
 	var $mFilter;
 
 	/**
@@ -32,14 +68,18 @@
 	
 	/**
 	 * Other action form for AvatarSelect.
+	 * @var User_AvatarSelectForm
 	 */
 	var $mAvatarSelectForm = null;
 	
 	/**
-	 *  Set up own properties by $moduleConfig. We must know uploading conditions
-	 * and control user upload by it. The limit may be not completed, yet.
+	 * Fetch conditions from $moduleConfig and set these to member properties.
+	 * And, by the member property mConfig of the base class, any member
+	 * functions of this class can access $moduleConfig.
+	 * 
+	 * @todo The limit may be not completed, yet.
 	 */
-	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		$this->mAvatarWidth = $moduleConfig['avatar_width'];
 		$this->mAvatarHeight = $moduleConfig['avatar_height'];
@@ -53,38 +93,34 @@
 
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('user');
+		$handler =& xoops_getmodulehandler('users');
 		return $handler;
 	}
 
 	/**
-	 *  This class uses AvatarUploadForm class. It requests three condition which
-	 * are width limit, height limit and filesize limit. We send own properties to 
-	 * AvatarUploadForm::prepare()
+	 * This class uses AvatarUploadForm class. It requests three condition
+	 * which are width limit, height limit and filesize limit.
+	 * 
+	 * @todo We may have to hand three parameters to constructor.
 	 */
 	function _setupActionForm()
 	{
-		$this->mActionForm=new User_AvatarEditForm();
+		$this->mActionForm =& new User_AvatarEditForm();
 		$this->mActionForm->prepare($this->mAvatarWidth, $this->mAvatarHeight, $this->mAvatarMaxfilesize);
 	}
 	
-	/**
-	 *  Return false.
-	 *  If a user requests dummy uid, kick out him!
-	 */
 	function isEnableCreate()
 	{
 		return false;
 	}
 
 	/**
-	 *  Return true.
-	 *  This action should not be used by a guest user.
+	 *  Return true. This action should not be used by a guest user.
 	 */
 	function isSecure()
 	{
@@ -92,7 +128,7 @@
 	}
 	
 	/**
-	 *  Check whether a current user can access this action.
+	 * Check whether a current user can access this action.
 	 * 1) A specified user has to exist.
 	 * 2) A current user has to equal the specified user, or a current user has
 	 *    to be a administrator.
@@ -114,7 +150,7 @@
 	}
 
 	/**
-	 *  This override method looks like the same method of ListAction, and tries
+	 * This override method looks like the same method of ListAction, and tries
 	 * to get system avatars. After, it will call base class.
 	 */
 	function getDefaultView(&$controller, &$xoopsUser)
@@ -190,27 +226,27 @@
 	function executeViewInput(&$controller,&$xoopsUser,&$render)
 	{
 		$render->setTemplateName("user_avatar_edit.html");
-		$render->setAttribute("actionForm",$this->mActionForm);
-		$render->setAttribute("thisUser",$this->mObject);
+		$render->setAttribute("actionForm", $this->mActionForm);
+		$render->setAttribute("thisUser", $this->mObject);
 
 		$render->setAttribute("allowUpload", $this->_mAllowUpload);
-		$render->setAttribute("avatarWidth",$this->mAvatarWidth);
-		$render->setAttribute("avatarHeight",$this->mAvatarHeight);
-		$render->setAttribute("avatarMaxfilesize",$this->mAvatarMaxfilesize);
+		$render->setAttribute("avatarWidth", $this->mAvatarWidth);
+		$render->setAttribute("avatarHeight", $this->mAvatarHeight);
+		$render->setAttribute("avatarMaxfilesize", $this->mAvatarMaxfilesize);
 
 		$render->setAttribute("pageNavi", $this->mNavi);
 		$render->setAttribute("systemAvatars", $this->mSystemAvatars);
 		$render->setAttribute("avatarSelectForm", $this->mAvatarSelectForm);
 	}
 	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewSuccess(&$controller, &$xoopsUser, $render)
 	{
 		$controller->executeForward("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'));
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewError(&$controller,&$xoopsUser,&$render)
 	{
-		redirect_header("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=UserInfo&uid=" . $this->mActionForm->get('uid'), 1, _MD_ERROR_DBUPDATE_FAILED);
 	}
 }
 
Index: xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.8
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.7	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,51 +1,62 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.8 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH."/user/forms/UserConfirmForm.class.php";
-require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
-require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
-
+require_once XOOPS_MODULE_PATH . "/user/forms/UserConfirmForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/forms/UserRegisterEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/class/RegistMailBuilder.class.php";
+
+/**
+ * This action uses the special technic to realize confirming. It gets the
+ * register action form which has been inputted in UserRegister, through
+ * unserialize(). And, it uses a simple action form to confirm lastly.
+ */
 class User_UserRegister_confirmAction extends User_Action
 {
-	var $mActionForm=null;
-	var $mRegistForm=null;
-	var $mConfig=array();
+	var $mActionForm = null;
+	var $mRegistForm = null;
+	var $mConfig = null;
 	
-	var $mNewUser=null;
+	var $mNewUser = null;
 	
-	var $mRedirectMessage=null;
+	var $mRedirectMessage = null;
 
-	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	/**
+	 * TODO this member function uses the old style delegate.
+	 */
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mConfig=&$moduleConfig;
+		$this->mConfig = $moduleConfig;
 
 		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",
-												new XCube_InstanceDelegate($this,"eventNotifyMail"));
+												new XCube_InstanceDelegate($this, "eventNotifyMail"));
+												
+		$this->_getRegistForm($controller);
+		$this->_processActionForm();
 	}
 
-	function execute(&$controller,&$xoopsUser)
+	function execute(&$controller, &$xoopsUser)
 	{
-		// confirmForm
-		$this->_getRegistForm($controller);
-		$this->_processActionForm($controller);
-		
-		$memberHandler=&xoops_gethandler('member');
-		$this->mNewUser=&$memberHandler->createUser();
+		$memberHandler =& xoops_gethandler('member');
+		$this->mNewUser =& $memberHandler->createUser();
 		$this->mRegistForm->update($this->mNewUser);
-		$this->mNewUser->setVar('uorder',$controller->getConfig('com_order'),true);
-		$this->mNewUser->setVar('umode',$controller->getConfig('com_mode'),true);
-		if($this->mConfig['activation_type'] == 1) {
-			$this->mNewUser->setVar('level',1,true);
+		$this->mNewUser->set('uorder', $controller->getConfig('com_order'), true);
+		$this->mNewUser->set('umode', $controller->getConfig('com_mode'), true);
+		if ($this->mConfig['activation_type'] == 1) {
+			$this->mNewUser->setVar('level', 1, true);
 		}
 
-		if(!$memberHandler->insertUser($this->mNewUser)) {
-			$this->mRedirectMessage=_US_REGISTERNG;
+		if (!$memberHandler->insertUser($this->mNewUser)) {
+			$this->mRedirectMessage = _US_REGISTERNG;
 			return USER_FRAME_VIEW_ERROR;
 		}
 
-        if(!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS,$this->mNewUser->getVar('uid'))) {
-			$this->mRedirectMessage=_US_REGISTERNG;
+        if (!$memberHandler->addUserToGroup(XOOPS_GROUP_USERS, $this->mNewUser->get('uid'))) {
+			$this->mRedirectMessage = _US_REGISTERNG;
 			return USER_FRAME_VIEW_ERROR;
 		}
 
@@ -53,32 +64,31 @@
 
 		$this->_processMail($controller);
 		$eventArgs = array();
-		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success",$controller,$eventArgs);
+		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success", $controller, $eventArgs);
 		
 		return USER_FRAME_VIEW_SUCCESS;
 	}
 	
-	function getDefaultView(&$controller,&$xoopsUser)
+	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$this->_getRegistForm($controller);
-		$this->_processActionForm($controller);
-
 		return USER_FRAME_VIEW_INPUT;
 	}
 	
 	/**
 	 * Get regist actionform from Session and set it to the member property.
+	 * @access private
 	 */
 	function _getRegistForm(&$controller)
 	{
-		$this->mRegistForm=& unserialize($_SESSION['user_register_actionform']);
-		if(!is_object($this->mRegistForm)) {
+		$this->mRegistForm =& unserialize($_SESSION['user_register_actionform']);
+		if (!is_object($this->mRegistForm)) {
 			$controller->executeForward('./index.php?action=UserRegister');
 		}
 	}
 
 	/**
-	 * clear session
+	 * Clear session.
+	 * @access private
 	 */
 	function _clearRegistForm(&$controller)
 	{
@@ -87,61 +97,73 @@
 	
 	function _processMail(&$controller)
 	{
-		$activationType=$this->mConfig['activation_type'];
+		$activationType = $this->mConfig['activation_type'];
 		
-		if($activationType==1)
+		if($activationType == 1) {
 			return;
+		}
 
 		// Wmm..
-		$builder = ($activationType==0) ? new RegistUserActivateMailBuilder()
-		                                    : new RegistUserAdminActivateMailBuilder();
+		$builder = ($activationType == 0) ? new User_RegistUserActivateMailBuilder()
+		                                  : new User_RegistUserAdminActivateMailBuilder();
 
-		$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mConfig);
-		$director->contruct($builder);
-		$mailer=&$builder->getResult();
+		$director =& new User_UserRegistMailDirector($builder, $this->mNewUser, $controller->getConfig(), $this->mConfig);
+		$director->contruct();
+		$mailer =& $builder->getResult();
 		
-		$mailer->send();	// CHECKS
+		$mailer->send();	// TODO CHECKS
 	}
 	
 	function eventNotifyMail(&$controller,&$eventArgs)
 	{
 		if($this->mConfig['new_user_notify'] == 1 && !empty($this->mConfig['new_user_notify_group'])) {
-			$director=new UserRegistMailDirector($this->mNewUser,$controller->getConfig(),$this->mConfig);
-			$builder = new RegistUserNotifyMailBuilder();
+			$director =& new User_UserRegistMailDirector($this->mNewUser, $controller->getConfig(), $this->mConfig);
+			$builder =& new User_RegistUserNotifyMailBuilder();
 			$director->contruct($builder);
-			$mailer=&$builder->getResult();
+			$mailer =& $builder->getResult();
 			$mailer->send();
 		}
 	}
 
-	function _processActionForm(&$controller)
+	function _processActionForm()
 	{
-		$this->mActionForm=new UserConfirmForm();
+		$this->mActionForm =& new User_UserConfirmForm();
+		$this->mActionForm->prepare();
 	}
 
-	function executeViewError(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		XCube_Utils::redirectHeader(XOOPS_URL,1,$this->mRedirectMessage);
+		$execute->executeRedirect(XOOPS_URL, 1, $this->mRedirectMessage);
 	}
 
-	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
+	function executeViewInput(&$controller,&$xoopsUser,&$render)
 	{
-		$renderSystem->setTemplateName("user_register_confirm.html");
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("registForm",$this->mRegistForm);
+		$render->setTemplateName("user_register_confirm.html");
+		$render->setAttribute("actionForm", $this->mActionForm);
+		$render->setAttribute("registForm", $this->mRegistForm);
 	}
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderSystem)
+	
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
-		$activationType=$this->mConfig['activation_type'];
+		$activationType = $this->mConfig['activation_type'];
 
-		if($activationType==0) {
-			$renderSystem->setTemplateName("user_register_finish.html");
-			$renderSystem->setAttribute("complete_message",_US_YOURREGISTERED);
-		} else if($activationType==1) {
-			XCube_Utils::redirectHeader(XOOPS_URL,4,_US_ACTLOGIN);
-		} else if($activationType==2) {
-			$renderSystem->setTemplateName("user_register_finish.html");
-			$renderSystem->setAttribute("complete_message",_US_YOURREGISTERED2);
+		if ($activationType == 0) {
+			$render->setTemplateName("user_register_finish.html");
+			$render->setAttribute("complete_message", _US_YOURREGISTERED);
+		}
+		elseif ($activationType == 1) {
+			$controller->executeRedirect(XOOPS_URL, 4, _US_ACTLOGIN);
+		}
+		elseif($activationType == 2) {
+			$render->setTemplateName("user_register_finish.html");
+			$render->setAttribute("complete_message", _US_YOURREGISTERED2);
+		}
+		else {
+			//
+			// This case is never.
+			//
+			$render->setTemplateName("user_register_finish.html");
+			$render->setAttribute("complete_message", _US_YOURREGISTERED2);
 		}
 	}
 }
Index: xoops2jp/html/modules/user/actions/UserRegisterAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.8
--- xoops2jp/html/modules/user/actions/UserRegisterAction.class.php:1.1.2.7	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/UserRegisterAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,39 +1,51 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserRegisterAction.class.php,v 1.1.2.8 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH."/user/forms/UserRegisterEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/forms/UserRegisterEditForm.class.php";
 
+/**
+ * This action uses the special technic to realize confirming. It set the 
+ * register action form to Session through serialize(), then forward to the
+ * confirm action. Because the confirm action can't work without the register
+ * action form which it fetches from Session, the confim action doesn't need
+ * to check the permission to register.
+ */
 class User_UserRegisterAction extends User_Action
 {
-	var $mActionForm=null;
+	var $mActionForm = null;
 	var $mConfig;
-	var $mEnableAgreeFlag=false;
+	var $mEnableAgreeFlag = false;
 
-	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mConfig=&$moduleConfig;
+		$this->mConfig = $moduleConfig;
 		
 		if(is_object($xoopsUser)) { 
+			//
 			// If user is registered, kick to his information page.
-			$controller->executeForward(XOOPS_URL."/user.php");
+			//
+			$controller->executeForward(XOOPS_URL . "/user.php");
 		}
 		if (empty($this->mConfig['allow_register'])) {
-		    redirect_header(XOOPS_URL.'/', 6, _US_NOREGISTER);
-		    exit();	
+		    $controller->executeRedirect(XOOPS_URL, 6, _US_NOREGISTER);
 		}
 	}
 
-	function execute(&$controller,&$xoopsUser)
+	function execute(&$controller, &$xoopsUser)
 	{
 		$this->_processActionForm();
 		$this->mActionForm->fetch();
 		$this->mActionForm->validate();
 		
-		if($this->mActionForm->hasError()) {
+		if ($this->mActionForm->hasError()) {
 			return USER_FRAME_VIEW_INPUT;
 		} else {
-			$_SESSION['user_register_actionform']=serialize(&$this->mActionForm);
+			$_SESSION['user_register_actionform'] = serialize(&$this->mActionForm);
 			$controller->executeForward('./index.php?action=UserRegister_confirm');
 		}
 	}
@@ -46,11 +58,11 @@
 	
 	function _processActionForm()
 	{
-		if($this->mConfig['reg_dispdsclmr']!=0 && $this->mConfig['reg_disclaimer']!=null) {
-			$this->mEnableAgreeFlag=true;
-			$this->mActionForm=new UserRegisterAgreeEditForm();
+		if ($this->mConfig['reg_dispdsclmr'] != 0 && $this->mConfig['reg_disclaimer'] != null) {
+			$this->mEnableAgreeFlag = true;
+			$this->mActionForm =& new User_RegisterAgreeEditForm();
 		} else {
-			$this->mActionForm=new UserRegisterEditForm();
+			$this->mActionForm =& new User_RegisterEditForm();
 		}
 		
 		$this->mActionForm->prepare($this->mConfig);
@@ -59,14 +71,16 @@
 	function executeViewInput(&$controller,&$xoopsUser,&$renderSystem)
 	{
 		$renderSystem->setTemplateName("user_register_form.html");
+		//
 		// Get some objects for input form.
+		//
 		$tzoneHandler =& xoops_gethandler('timezone');
 		$timezones =& $tzoneHandler->getObjects();
 		$renderSystem->setAttribute('timezones', $timezones);
-		$renderSystem->setAttribute("actionForm",$this->mActionForm);
-		$renderSystem->setAttribute("enableAgree",$this->mEnableAgreeFlag);
+		$renderSystem->setAttribute("actionForm", $this->mActionForm);
+		$renderSystem->setAttribute("enableAgree", $this->mEnableAgreeFlag);
 		if($this->mEnableAgreeFlag) {
-			$renderSystem->setAttribute("disclaimer",$this->mConfig['reg_disclaimer']);
+			$renderSystem->setAttribute("disclaimer", $this->mConfig['reg_disclaimer']);
 		}
 	}
 }
Index: xoops2jp/html/modules/user/actions/UserInfoAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.3	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,9 +1,20 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.4 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 /**
- * Receive $_GET['uid']
+ * This action shows a information of the target user which is specified by
+ * $uid. And display posts of the user with the global search service.
+ * 
+ * [Warning]
+ * Now, the global search service can't work because the design of XCube is
+ * changed.
+ * 
+ * @todo The global search service can't work.
  */
 class User_UserInfoAction extends User_Action
 {
@@ -18,7 +29,7 @@
 
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
-		$uid = isset($_GET['uid']) ? intval($_GET['uid']) : 0;
+		$uid = isset($_GET['uid']) ? intval(xoops_getrequest('uid')) : 0;
 		
 		$handler =& xoops_gethandler('user');
 		$this->mObject =& $handler->get($uid);
@@ -31,7 +42,7 @@
 		$this->mRankObject =& $rankHandler->get($this->mObject->get('rank'));
 		
 		$root =& $controller->mRoot;
-		$service =& $root->mServiceManager->searchXCubeService("LegacySearch");
+		$service =& $root->mServiceManager->getService("LegacySearch");
 		if ($service) {
 			$current_uid = is_object($xoopsUser) ? $xoopsUser->get('uid') : 0;
 			
@@ -44,6 +55,11 @@
 		return USER_FRAME_VIEW_SUCCESS;
 	}
 	
+	/**
+	 * [Notice]
+	 * Because XCube_Service class group are changed now, this member function
+	 * can't get the result of user posts.
+	 */
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("user_userinfo.html");
Index: xoops2jp/html/modules/user/actions/UserActivateAction.class.php
diff -u xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.2 xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/actions/UserActivateAction.class.php:1.1.2.2	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/UserActivateAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,22 +1,27 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserActivateAction.class.php,v 1.1.2.3 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH."/user/class/AbstractEditAction.class.php";
-require_once XOOPS_MODULE_PATH."/user/class/RegistMailBuilder.class.php";
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/user/class/RegistMailBuilder.class.php";
 
 class User_UserActivateAction extends User_AbstractEditAction
 {
 	function _getId()
 	{
-		return isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
+		return isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
 	}
 	
 	function &_getHandler()
 	{
-		$handler =& xoops_gethandler('user');
+		$handler =& xoops_getmodulehandler('user');
 		return $handler;
 	}
+	
 	/**
 	 *  Return false.
 	 *  If a user requests dummy uid, kick out him!
@@ -38,34 +43,36 @@
 	function getDefaultView(&$controller, &$xoopsUser)
 	{
 		if ((!isset($_REQUEST['actkey'])) || (!$this->mObject)) {
-			$controller->executeForward(XOOPS_URL.'/');
-			exit();
+			$controller->executeForward(XOOPS_URL . '/');
 		}
-		if ($this->mObject->get('actkey') != $_REQUEST['actkey']) {
-			redirect_header(XOOPS_URL, 3, _US_ACTKEYNOT);
-			exit();
+
+		if ($this->mObject->get('actkey') != xoops_getrequest('actkey')) {
+			$controller->executeRedirect(XOOPS_URL, 3, _US_ACTKEYNOT);
 		} 
+
 		if ($this->mObject->get('level') > 1) {
-			redirect_header(XOOPS_URL.'/user.php', 3, _US_ACONTACT);
-			exit();
+			$controller->executeRedirect(XOOPS_URL . '/user.php', 3, _US_ACONTACT);
 		}
 		
-		$this->mObject->setVar('level','1');
+		$this->mObject->set('level', '1');
+		
+		//
 		// Force update with GET request
-		$this->mObjectHandler->insert($this->mObject,true);
+		//
+		$this->mObjectHandler->insert($this->mObject, true);
 
 		if ($this->mConfig['activation_type'] == 2) {
-			$builder = new RegistAdminCommitMailBuilder();
-			$director=new UserRegistMailDirector($this->mObject,$controller->getConfig(),$this->mConfig);
+			$builder =& new RegistAdminCommitMailBuilder();
+			$director =& new UserRegistMailDirector($this->mObject, $controller->getConfig(), $this->mConfig);
 			$director->contruct($builder);
 			$mailer=&$builder->getResult();
 			if ($mailer->send()) {
-				redirect_header(XOOPS_URL.'/' ,5, sprintf(_US_ACTVMAILOK, $this->mObject->getVar('uname')));
+				$controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILOK, $this->mObject->get('uname')));
 			} else {
-				redirect_header(XOOPS_URL.'/' ,5, sprintf(_US_ACTVMAILNG, $this->mObject->getVar('uname')));
+				$controller->executeRedirect(XOOPS_URL, 5, sprintf(_US_ACTVMAILNG, $this->mObject->get('uname')));
 			}
 		} else {
-			redirect_header(XOOPS_URL.'/user.php' ,5,_US_ACTLOGIN);
+			$controller->executeRedirect(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN);
 		}
 	}
 }
Index: xoops2jp/html/modules/user/actions/DefaultAction.class.php
diff -u xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.2 xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/actions/DefaultAction.class.php:1.1.2.2	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/DefaultAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,9 +1,14 @@
 <?php
+/**
+ * @package legacy
+ * @version $Id: DefaultAction.class.php,v 1.1.2.3 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 /**
- * Receive $_GET['uid']
+ * This action shows two forms for login and lostpass. If the current user is
+ * logined, forward to the userinfo page.
  */
 class User_DefaultAction extends User_Action
 {
Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.3 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.3	Tue Apr 11 19:03:53 2006
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Wed Jul 19 19:20:33 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: LostPassAction.class.php,v 1.1.2.4 2006/07/19 10:20:33 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,11 +11,14 @@
 
 class User_LostPassAction extends User_Action
 {
+	/**
+	 * @var User_LostPassEditForm
+	 */
 	var $mActionForm = null;
 	
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mActionForm =& new LostPassEditForm();
+		$this->mActionForm =& new User_LostPassEditForm();
 		$this->mActionForm->prepare();
 	}
 	
@@ -20,23 +27,27 @@
 		return false;
 	}
 	
-	function hasPerm(&$controller, &$xoopsUser)
+	/**
+	 * Allow anonymous users only.
+	 */
+	function hasPerm(&$controller, &$xoopsUser, $moduleConfig)
 	{
 		return !is_object($xoopsUser);
 	}
 
-	function getDefaultView(&$controller, &$xoopsUser)
+	function getDefaultView(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		if ((!isset($_REQUEST['code']))||(!isset($_REQUEST['email']))) {
+		if ((!isset($_REQUEST['code'])) || (!isset($_REQUEST['email']))) {
 			return USER_FRAME_VIEW_INPUT;
 		} else {
 			return $this->_updatePassword($controller);
 		}
 	}
+
 	function _updatePassword(&$controller) {
 		$this->mActionForm->fetch();
 
-		$userHandler =& xoops_gethandler('user');
+		$userHandler =& xoops_getmodulehandler('users');
 		$lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email')));
 		if (is_array($lostUserArr) && count($lostUserArr) > 0) {
 			$lostUser =& $lostUserArr[0];
@@ -47,15 +58,15 @@
 
 		$newpass = xoops_makepass();
 		$extraVars['newpass'] = $newpass;
-		$builder =& new LostPass2MailBuilder();
-		$director =& new LostPassMailDirector($builder, $lostUser, $controller->mConfig, $extraVars);
+		$builder =& new User_LostPass2MailBuilder();
+		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mConfig, $extraVars);
 		$director->contruct();
 		$xoopsMailer =& $builder->getResult();
 		if (!$xoopsMailer->send()) {
 			// $xoopsMailer->getErrors();
 			return USER_FRAME_VIEW_ERROR;
 		}
-		$lostUser->setVar('pass',md5($newpass), true);
+		$lostUser->set('pass',md5($newpass), true);
 		$userHandler->insert($lostUser, true);
 
 		return USER_FRAME_VIEW_SUCCESS;
@@ -70,7 +81,7 @@
 			return USER_FRAME_VIEW_INPUT;
 		}
 		
-		$userHandler =& xoops_gethandler('user');
+		$userHandler =& xoops_getmodulehandler('users');
 		$lostUserArr =& $userHandler->getObjects(new Criteria('email', $this->mActionForm->get('email')));
 
 		if (is_array($lostUserArr) && count($lostUserArr) > 0) {
@@ -80,8 +91,8 @@
 			return USER_FRAME_VIEW_SUCCESS;
 		}
 
-		$builder =& new LostPass1MailBuilder();
-		$director =& new LostPassMailDirector($builder, $lostUser, $controller->mConfig);
+		$builder =& new User_LostPass1MailBuilder();
+		$director =& new User_LostPassMailDirector($builder, $lostUser, $controller->mConfig);
 		$director->contruct();
 		$xoopsMailer =& $builder->getResult();
 
@@ -101,11 +112,12 @@
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
 	{
+		$controller->executeRedirect(XOOPS_URL, 3, _MD_MESSAGE_SEND_PASSWORD);
 	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header(XOOPS_URL, 3, _MD_ERROR_SEND_MAIL);
+		$controller->executeRedirect(XOOPS_URL, 3, _MD_ERROR_SEND_MAIL);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:20:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:20:53 +0900
Subject: [xoops-cvslog 3614] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060719102053.951032AC083@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.1	Tue Apr 11 18:16:26 2006
+++ xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php	Wed Jul 19 19:20:53 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserSearchListAction.class.php,v 1.1.2.2 2006/07/19 10:20:53 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
Index: xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.1 xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.1	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php	Wed Jul 19 19:20:53 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: MailjobListAction.class.php,v 1.1.2.2 2006/07/19 10:20:53 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
Index: xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.5 xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.6
--- xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php:1.1.2.5	Fri May 26 18:01:46 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPermAction.class.php	Wed Jul 19 19:20:53 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: GroupPermAction.class.php,v 1.1.2.6 2006/07/19 10:20:53 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -6,8 +10,8 @@
 require_once XOOPS_MODULE_PATH."/user/admin/forms/GroupPermEditForm.class.php";
 
 /**
- *
- * This function keeps difficult problems that this depens on the column's block of X2 theme format.
+ * This function keeps difficult problems that this depens on the column's
+ * block of X2 theme format.
  */
 class User_GroupPermAction extends User_GroupPropertyAction
 {
@@ -19,10 +23,6 @@
 		$this->mActionForm->prepare();
 	}
 	
-	/**
-	 * This function don't use actionform, now.
-	 * I (minahito) must remove code-clone.
-	 */
 	function execute(&$controller, &$xoopsUser)
 	{
 		$this->_loadGroup();
@@ -92,11 +92,11 @@
 	function executeViewIndex(&$controller,&$xoopsUser,&$render)
 	{
 		$render->setTemplateName("group_perm.html");
-		$render->setAttribute("group",$this->mGroup);
-		$render->setAttribute("actionForm",$this->mActionForm);
-		$render->setAttribute("modulePermissions",$this->mPermissions);
-		$render->setAttribute("blockPermissions",$this->mBlockPermissions);
-		$render->setAttribute("systemPermissions",$this->mSystemPermissions);
+		$render->setAttribute("group", $this->mGroup);
+		$render->setAttribute("actionForm", $this->mActionForm);
+		$render->setAttribute("modulePermissions", $this->mPermissions);
+		$render->setAttribute("blockPermissions", $this->mBlockPermissions);
+		$render->setAttribute("systemPermissions", $this->mSystemPermissions);
 	}
 
 	function executeViewSuccess(&$controller,&$xoopsUser,&$render)
Index: xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php:1.1.2.2	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/AvatarListAction.class.php	Wed Jul 19 19:20:53 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarListAction.class.php,v 1.1.2.3 2006/07/19 10:20:53 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:21:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:21:04 +0900
Subject: [xoops-cvslog 3615] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060719102104.9F5452AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.9 xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.10
--- xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php:1.1.2.9	Thu Jul 13 19:52:08 2006
+++ xoops2jp/html/modules/user/admin/forms/UserAdminEditForm.class.php	Wed Jul 19 19:21:04 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserAdminEditForm.class.php,v 1.1.2.9 2006/07/13 10:52:08 minahito Exp $
+ * @version $Id: UserAdminEditForm.class.php,v 1.1.2.10 2006/07/19 10:21:04 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -76,9 +76,10 @@
 
 		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['email']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_EMAIL, '60');
-		$this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength'));
+		$this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email'));
 		$this->mFieldProperties['email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addVar('maxlength', 60);
+		$this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL, _AD_USER_LANG_EMAIL);
 
 		$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
@@ -190,7 +191,7 @@
 	{
 		$t_url = $this->get('url');
 		if (strlen($t_url) > 0) {
-			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$', $t_url)) {
+			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $t_url)) {
 				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_INJURY, _AD_USER_LANG_URL));
 			}
 		}
Index: xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupMemberEditForm.class.php	Wed Jul 19 19:21:04 2006
@@ -22,7 +22,6 @@
 		//
 		// Set field properties
 		//
-	
 		$this->mFieldProperties['uid'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['uid']->setDependsByArray(array('intRange'));
 		$this->mFieldProperties['uid']->addMessage('intRange', _AD_USER_ERROR_REQUEST_IS_WRONG);

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:21:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:21:16 +0900
Subject: [xoops-cvslog 3616] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060719102116.00ABA2AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.5 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.6
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.5	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Wed Jul 19 19:21:16 2006
@@ -1,50 +1,82 @@
 <?php
+/**
+ * @package user
+ * @version $Id: RegistMailBuilder.class.php,v 1.1.2.6 2006/07/19 10:21:16 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-class UserRegistMailDirector
+/**
+ * This class commands a builder to build mail. It's a kind of builder pattern,
+ * and made for separating the building logic and the business logic.
+ */
+class User_UserRegistMailDirector
 {
+	/**
+	 * @var User_RegistUserActivateMailBuilder
+	 */
 	var $mBuilder;
+	
+	/**
+	 * @var XoopsUser
+	 */
 	var $mUser;
+	
 	var $mXoopsConfig;
+	
 	var $mUserConfig;
 
-	function UserRegistMailDirector(&$user,$xoopsConfig,$userConfig)
+	function User_UserRegistMailDirector(&$builder, &$user, $xoopsConfig, $userConfig)
 	{
-		$this->mUser=&$user;
-		$this->mXoopsConfig=$xoopsConfig;
-		$this->mUserConfig=$userConfig;
-	}
-	
-	function contruct(&$builder)
-	{
-		$builder->setTemplate();
-		$builder->setToUsers($this->mUser,$this->mUserConfig);
-		$builder->setFromEmail($this->mXoopsConfig);
-		$builder->setSubject($this->mUser,$this->mXoopsConfig);
-		$builder->setBody($this->mUser,$this->mXoopsConfig);
+		$this->mBuilder =& $builder;
+		
+		$this->mUser =& $user;
+		$this->mXoopsConfig =$xoopsConfig;
+		$this->mUserConfig = $userConfig;
+	}
+	
+	/**
+	 * With setting variables to a builder, triggers building the mail of a
+	 * builder.
+	 */
+	function contruct()
+	{
+		$this->mBuilder->setTemplate();
+		$this->mBuilder->setToUsers($this->mUser, $this->mUserConfig);
+		$this->mBuilder->setFromEmail($this->mXoopsConfig);
+		$this->mBuilder->setSubject($this->mUser, $this->mXoopsConfig);
+		$this->mBuilder->setBody($this->mUser, $this->mXoopsConfig);
 	}
 }
 
-class RegistUserActivateMailBuilder
+/**
+ * This class is a builder for User_UserRegistMailDirector and the base class,
+ * and the base class for other builders. Use register.tpl as the template.
+ * That's the first mail at procedure of the user registration, and written
+ * about the special URL which activates the registration application.
+ */
+class User_RegistUserActivateMailBuilder
 {
 	var $mMailer;
 	
-	function RegistUserActivateMailBuilder()
+	function User_RegistUserActivateMailBuilder()
 	{
-		$this->mMailer=&getMailer();
+		$this->mMailer =& getMailer();
 		$this->mMailer->useMail();
 	}
 
+	/**
+	 * Set the template itself.
+	 */
 	function setTemplate()
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/user/language/' . $language . '/mail_template/');
 		$this->mMailer->setTemplate('register.tpl');
 	}
 
-	function setToUsers($user,$userConfig)
+	function setToUsers($user, $userConfig)
 	{
 		$this->mMailer->setToUsers($user);
 	}
@@ -55,17 +87,17 @@
 		$this->mMailer->setFromName($xoopsConfig['sitename']);
 	}
 	
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
-		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
+		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR, $user->getShow('uname')));
 	}
 
 	function setBody($user,$xoopsConfig)
 	{
-		$this->mMailer->assign('SITENAME',$xoopsConfig['sitename']);
-		$this->mMailer->assign('ADMINMAIL',$xoopsConfig['adminmail']);
-		$this->mMailer->assign('SITEURL',XOOPS_URL.'/');
-		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+		$this->mMailer->assign('SITENAME', $xoopsConfig['sitename']);
+		$this->mMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+		$this->mMailer->assign('SITEURL', XOOPS_URL . '/');
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/modules/user/index.php?action=UserActivate&uid=' . $user->getVar('uid') . '&actkey=' . $user->getShow('actkey'));
 	}
 	
 	function &getResult()
@@ -74,17 +106,22 @@
 	}
 }
 
-class RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
+/**
+ * This class is a builder which uses adminactivate.tpl as the template. The
+ * mail which this class builds, requests activating the new registration for
+ * administrators.
+ */
+class User_RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/user/language/' . $language . '/mail_template/');
 		$this->mMailer->setTemplate('adminactivate.tpl');
 	}
 
-	function setToUsers($user,$userConfig)
+	function setToUsers($user, $userConfig)
 	{
 		$memberHandler=&xoops_gethandler('member');
 		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['activation_group']));
@@ -97,56 +134,66 @@
 		$this->mMailer->setFromName($xoopsConfig['sitename']);
 	}
 	
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
 		$this->mMailer->setSubject(@sprintf(_US_USERKEYFOR,$user->getVar('uname')));
 	}
 
-	function setBody($user,$xoopsConfig)
+	function setBody($user, $xoopsConfig)
 	{
 		parent::setBody($user,$xoopsConfig);
 		$this->mMailer->assign('USERNAME', $user->getVar('uname'));
 		$this->mMailer->assign('USEREMAIL', $user->getVar('email'));
-		$this->mMailer->assign('USERACTLINK', XOOPS_URL.'/modules/user/index.php?action=UserActivate&uid='.$user->getVar('uid').'&actkey='.$user->getVar('actkey'));
+		$this->mMailer->assign('USERACTLINK', XOOPS_URL . '/modules/user/index.php?action=UserActivate&uid=' . $user->getVar('uid') . '&actkey=' . $user->getVar('actkey'));
 	}
 }
 
-class RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
+/**
+ * [Notice]
+ * Uncompleted?
+ * 
+ * @todo Implement setTemplate()
+ */
+class User_RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
 	}
 
-	function setToUsers($user,$userConfig)
+	function setToUsers($user, $userConfig)
 	{
 		$memberHandler=&xoops_gethandler('member');
 		$this->mMailer->setToGroups($memberHandler->getGroup($userConfig['new_user_notify_group']));
 	}
 	
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
-		$this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT,$xoopsConfig['sitename']));
+		$this->mMailer->setSubject(@sprintf(_US_NEWUSERREGAT, $xoopsConfig['sitename']));
 	}
 
-	function setBody($user,$xoopsConfig)
+	function setBody($user, $xoopsConfig)
 	{
 		$this->mMailer->setBody(@sprintf(_US_HASJUSTREG, $user->getVar('uname')));
 	}
 }
 
-class RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
+/**
+ * This class is a builder which uses activated.tpl as the template. The mail
+ * which this class builds, reports completed activation for a new user.
+ */
+class User_RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/user/language/' . $language . '/mail_template/');
 		$this->mMailer->setTemplate('activated.tpl');
 	}
 	
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
-		$this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT,$xoopsConfig['sitename']));
+		$this->mMailer->setSubject(@sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename']));
 	}
 }
 
Index: xoops2jp/html/modules/user/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.6 xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.7
--- xoops2jp/html/modules/user/class/AbstractEditAction.class.php:1.1.2.6	Thu Jul 13 19:53:42 2006
+++ xoops2jp/html/modules/user/class/AbstractEditAction.class.php	Wed Jul 19 19:21:16 2006
@@ -9,18 +9,30 @@
 	var $mActionForm = null;
 	var $mConfig;
 
+	/**
+	 * @access protected
+	 */
 	function _getId()
 	{
 	}
 
+	/**
+	 * @access protected
+	 */
 	function &_getHandler()
 	{
 	}
 
+	/**
+	 * @access protected
+	 */
 	function _setupActionForm()
 	{
 	}
 
+	/**
+	 * @access protected
+	 */
 	function _setupObject()
 	{
 		$id = $this->_getId();
@@ -34,14 +46,17 @@
 		}
 	}
 
+	/**
+	 * @access protected
+	 */
 	function isEnableCreate()
 	{
 		return true;
 	}
 
-	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
-		$this->mConfig=&$moduleConfig;
+		$this->mConfig = $moduleConfig;
 
 		$this->_setupActionForm();
 		$this->_setupObject();
@@ -83,6 +98,9 @@
 		                                         : USER_FRAME_VIEW_ERROR;
 	}
 
+	/**
+	 * @access protected
+	 */
 	function _doExecute()
 	{
 		return $this->mObjectHandler->insert($this->mObject);
Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.2 xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.2	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php	Wed Jul 19 19:21:16 2006
@@ -1,62 +1,80 @@
 <?php
+/**
+ * @package user
+ * @version $Id: LostPassMailBuilder.class.php,v 1.1.2.3 2006/07/19 10:21:16 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-class LostPassMailDirector
+/**
+ * This class commands a builder to build mail. It's a kind of builder pattern,
+ * and made for separating the building logic and the business logic.
+ */
+class User_LostPassMailDirector
 {
 	var $mBuilder;
 	var $mXoopsUser;
 	var $mXoopsConfig;
 	var $mExtraVars;
 	
-	function LostPassMailDirector(&$builder,&$user,&$xoopsConfig,$extraVars=array())
+	function User_LostPassMailDirector(&$builder, &$user, &$xoopsConfig, $extraVars = array())
 	{
-		$this->mBuilder=&$builder;
-		$this->mXoopsUser=&$user;
-		$this->mXoopsConfig=&$xoopsConfig;
-		$this->mExtraVars=$extraVars;
+		$this->mBuilder =& $builder;
+		$this->mXoopsUser =& $user;
+		$this->mXoopsConfig =& $xoopsConfig;
+		$this->mExtraVars = $extraVars;
 	}
 	
 	function contruct()
 	{
-		$this->mBuilder->setToUsers($this->mXoopsUser,$this->mXoopsConfig);
-		$this->mBuilder->setFromEmail($this->mXoopsUser,$this->mXoopsConfig);
-		$this->mBuilder->setSubject($this->mXoopsUser,$this->mXoopsConfig);
+		$this->mBuilder->setToUsers($this->mXoopsUser, $this->mXoopsConfig);
+		$this->mBuilder->setFromEmail($this->mXoopsUser, $this->mXoopsConfig);
+		$this->mBuilder->setSubject($this->mXoopsUser, $this->mXoopsConfig);
 		$this->mBuilder->setTemplate();
-		$this->mBuilder->setBody($this->mXoopsUser,$this->mXoopsConfig,$this->mExtraVars);
+		$this->mBuilder->setBody($this->mXoopsUser, $this->mXoopsConfig,$this->mExtraVars);
 	}
 }
-class LostPass1MailBuilder
+
+/**
+ * This class is a builder for User_LostPassMailDirector and the base class,
+ * and the base class for other builders. Use lostpass1.tpl as the template.
+ * That's the first mail at procedure of the password regenerated, and written
+ * about the special URL which generates new password.
+ */
+class User_LostPass1MailBuilder
 {
 	var $mMailer;
 	
-	function LostPass1MailBuilder()
+	function User_LostPass1MailBuilder()
 	{
-		$this->mMailer=&getMailer();
+		$this->mMailer =& getMailer();
 		$this->mMailer->useMail();
 	}
 
-	function setToUsers($user,$xoopsConfig)
+	function setToUsers($user, $xoopsConfig)
 	{
 		$this->mMailer->setToUsers($user);
 	}
 
-	function setFromEmail($user,$xoopsConfig)
+	function setFromEmail($user, $xoopsConfig)
 	{
 		$this->mMailer->setFromEmail($xoopsConfig['adminmail']);
 		$this->mMailer->setFromName($xoopsConfig['sitename']);
 	}
 	
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
-		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,$xoopsConfig['sitename']));
+		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ, $xoopsConfig['sitename']));
 	}
 
+	/**
+	 * Set template file itself.
+	 */
 	function setTemplate()
 	{
-		$root=&XCube_Root::getSingleton();
+		$root =& XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplateDir(XOOPS_MODULE_PATH . '/user/language/' . $language . '/mail_template/');
 		$this->mMailer->setTemplate("lostpass1.tpl");
 	}
 	
@@ -64,9 +82,9 @@
 	{
 		$this->mMailer->assign("SITENAME", $xoopsConfig['sitename']);
 		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
-		$this->mMailer->assign("SITEURL", XOOPS_URL."/");
+		$this->mMailer->assign("SITEURL", XOOPS_URL . "/");
 		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
-		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL."/modules/user/index.php?action=LostPass&email=".$user->get('email')."&code=".substr($user->get("pass"), 0, 5));
+		$this->mMailer->assign("NEWPWD_LINK", XOOPS_URL . "/modules/user/index.php?action=LostPass&email=" . $user->getShow('email') . "&code=" . substr($user->get("pass"), 0, 5));
 	}
 		
 	function &getResult()
@@ -74,26 +92,32 @@
 		return $this->mMailer;
 	}
 }
-class LostPass2MailBuilder extends LostPass1MailBuilder
+
+/**
+ * This class is a builder which uses lostpass2.tpl as the template. That's the
+ * second mail at procedure of the password regenerated, and written about the
+ * new generated password of the user.
+ */
+class User_LostPass2MailBuilder extends LostPass1MailBuilder
 {
 	function setTemplate()
 	{
 		$root=&XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		$this->mMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/user/language/'.$language.'/mail_template/');
+		$this->mMailer->setTemplateDir(XOOPS_MODULE_PATH . '/user/language/' . $language . '/mail_template/');
 		$this->mMailer->setTemplate("lostpass2.tpl");
 	}
 
-	function setSubject($user,$xoopsConfig)
+	function setSubject($user, $xoopsConfig)
 	{
 		$this->mMailer->setSubject(sprintf(_US_NEWPWDREQ,XOOPS_URL));
 	}
 
-	function setBody($user,$xoopsConfig,$extraVars)
+	function setBody($user, $xoopsConfig, $extraVars)
 	{
 		$this->mMailer->assign("SITENAME", $xoopsConfig['sitename']);
 		$this->mMailer->assign("ADMINMAIL", $xoopsConfig['adminmail']);
-		$this->mMailer->assign("SITEURL", XOOPS_URL."/");
+		$this->mMailer->assign("SITEURL", XOOPS_URL . "/");
 		$this->mMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
 		$this->mMailer->assign("NEWPWD", $extraVars['newpass']);
 	}

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:21:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:21:26 +0900
Subject: [xoops-cvslog 3617] CVS update: xoops2jp/html/modules/user/forms
Message-ID: <20060719102126.256832AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/forms/LostPassEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/LostPassEditForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/LostPassEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/forms/LostPassEditForm.class.php:1.1.2.2	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/LostPassEditForm.class.php	Wed Jul 19 19:21:25 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: LostPassEditForm.class.php,v 1.1.2.3 2006/07/19 10:21:25 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -7,7 +11,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class LostPassEditForm extends XCube_ActionForm
+class User_LostPassEditForm extends XCube_ActionForm
 {
 	function getTokenName()
 	{
@@ -21,21 +25,14 @@
 		//
 		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
 		$this->mFormProperties['code'] =& new XCube_StringProperty('code');
-		$this->mFormProperties['newpass'] =& new XCube_StringProperty('newpass');
 
 		//
 		// Set field properties
 		//
 		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required'));
+		$this->mFieldProperties['email']->setDependsByArray(array('required', 'email'));
 		$this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL);
-	}
-	
-	function validateEmail()
-	{
-		if ($this->get('email') != null && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$this->get('email'))) {
-			$this->addErrorMessage(_MD_USER_ERROR_EMAIL_FORMAT);
-		}
+		$this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT);
 	}
 }
 
Index: xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php:1.1.2.2	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/AvatarSelectForm.class.php	Wed Jul 19 19:21:25 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarSelectForm.class.php,v 1.1.2.3 2006/07/19 10:21:25 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -10,7 +14,7 @@
 	
 	function getTokenName()
 	{
-		return "module.user.AvatarSelectForm.TOKEN";
+		return "module.user.AvatarSelectForm.TOKEN" . $this->get('uid');
 	}
 
 	function prepare()
Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php
diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.10 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.11
--- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.10	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/EditUserForm.class.php	Wed Jul 19 19:21:25 2006
@@ -2,140 +2,215 @@
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/forms/AbstractUserEditForm.class.php";
 
 /**
  * This class is generated by makeActionForm tool.
  * @auchor makeActionForm
  */
-class EditUserForm extends XCube_ActionForm 
+class User_EditUserForm extends User_AbstractUserEditForm 
 {
 	function getTokenName()
 	{
 		return "Module.User.EditUserForm.Token." . $this->get('uid');
 	}
 	
+	/**
+	 * TODO The argument of this member property may be moved to constructor.
+	 */
 	function prepare()
 	{
+		parent::prepare();
+		
+		//
 		// set properties
-		$this->mFormProperties['uid']=new XCube_IntProperty('uid');
-		$this->mFormProperties['name']=new XCube_StringProperty('name');
-		$this->mFormProperties['email']=new XCube_StringProperty('email');
-		$this->mFormProperties['user_viewemail']=new XCube_IntProperty('user_viewemail');
-		$this->mFormProperties['url']=new XCube_StringProperty('url');
-		$this->mFormProperties['user_icq']=new XCube_StringProperty('user_icq');
-		$this->mFormProperties['user_aim']=new XCube_StringProperty('user_aim');
-		$this->mFormProperties['user_yim']=new XCube_StringProperty('user_yim');
-		$this->mFormProperties['user_msnm']=new XCube_StringProperty('user_msnm');
-		$this->mFormProperties['user_from']=new XCube_StringProperty('user_from');
-		$this->mFormProperties['user_occ']=new XCube_StringProperty('user_occ');
-		$this->mFormProperties['user_intrest']=new XCube_StringProperty('user_intrest');
-		$this->mFormProperties['user_sig']=new XCube_TextProperty('user_sig');
-		$this->mFormProperties['attachsig']=new XCube_IntProperty('attachsig');
-		$this->mFormProperties['bio']=new XCube_TextProperty('bio');
-		$this->mFormProperties['pass']=new XCube_StringProperty('pass');
-		$this->mFormProperties['vpass']=new XCube_StringProperty('vpass');
-		$this->mFormProperties['user_mailok']=new XCube_IntProperty('user_mailok');
+		//
+		$this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
+		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
+		
+		if ($this->mConfig['allow_chgmail']) {
+			$this->mFormProperties['email'] =& new XCube_StringProperty('email');
+		}
 
+		$this->mFormProperties['user_viewemail'] =& new XCube_BoolProperty('user_viewemail');
+		$this->mFormProperties['url'] =& new XCube_StringProperty('url');
+		$this->mFormProperties['user_icq'] =& new XCube_StringProperty('user_icq');
+		$this->mFormProperties['user_aim'] =& new XCube_StringProperty('user_aim');
+		$this->mFormProperties['user_yim'] =& new XCube_StringProperty('user_yim');
+		$this->mFormProperties['user_msnm'] =& new XCube_StringProperty('user_msnm');
+		$this->mFormProperties['user_from'] =& new XCube_StringProperty('user_from');
+		$this->mFormProperties['timezone_offset'] =& new XCube_FloatProperty('timezone_offset');
+		$this->mFormProperties['umode'] =& new XCube_StringProperty('umode');
+		$this->mFormProperties['uorder'] =& new XCube_IntProperty('uorder');
+		$this->mFormProperties['notify_method'] =& new XCube_IntProperty('notify_method');
+		$this->mFormProperties['notify_mode'] =& new XCube_IntProperty('notify_mode');
+		$this->mFormProperties['user_occ'] =& new XCube_StringProperty('user_occ');
+		$this->mFormProperties['user_intrest'] =& new XCube_StringProperty('user_intrest');
+		$this->mFormProperties['user_sig'] =& new XCube_TextProperty('user_sig');
+		$this->mFormProperties['attachsig'] =& new XCube_BoolProperty('attachsig');
+		$this->mFormProperties['bio'] =& new XCube_TextProperty('bio');
+		$this->mFormProperties['pass'] =& new XCube_StringProperty('pass');
+		$this->mFormProperties['vpass'] =& new XCube_StringProperty('vpass');
+		$this->mFormProperties['user_mailok'] =& new XCube_BoolProperty('user_mailok');
+
+		//
 		// set fields
-		$this->mFieldProperties['name']=new XCube_FieldProperty($this);
+		//
+		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['name']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['name']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_REALNAME,"60");
-		$this->mFieldProperties['name']->addVar("maxlength",60);
+		$this->mFieldProperties['name']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_REALNAME, "60");
+		$this->mFieldProperties['name']->addVar("maxlength", 60);
 
-		$this->mFieldProperties['email']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['email']->addMessage("required",_MD_USER_ERROR_REQUIRED,_US_EMAIL,"60");
-		$this->mFieldProperties['email']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_EMAIL,"60");
-		$this->mFieldProperties['email']->addVar("maxlength",60);
-
-		$this->mFieldProperties['user_viewemail']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_viewemail']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['user_viewemail']->addMessage("intRange",_MD_USER_ERROR_INTRANGE,"user_viewemail");
-		$this->mFieldProperties['user_viewemail']->addVar("min",0);
-		$this->mFieldProperties['user_viewemail']->addVar("max",1);
+		if ($this->mConfig['allow_chgmail']) {
+			$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
+			$this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email'));
+			$this->mFieldProperties['email']->addMessage("required", _MD_USER_ERROR_REQUIRED, _US_EMAIL, "60");
+			$this->mFieldProperties['email']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_EMAIL, "60");
+			$this->mFieldProperties['email']->addVar("maxlength", 60);
+			$this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT);
+		}
 
-		$this->mFieldProperties['url']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['url']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_WEBSITE,"100");
-		$this->mFieldProperties['url']->addVar("maxlength",100);
+		$this->mFieldProperties['url']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_WEBSITE, "100");
+		$this->mFieldProperties['url']->addVar("maxlength", 100);
 
-		$this->mFieldProperties['user_icq']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['user_icq']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_ICQ,"15");
-		$this->mFieldProperties['user_icq']->addVar("maxlength",15);
+		$this->mFieldProperties['user_icq']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_ICQ, "15");
+		$this->mFieldProperties['user_icq']->addVar("maxlength", 15);
 
-		$this->mFieldProperties['user_from']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_from']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['user_from']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_LOCATION,"100");
-		$this->mFieldProperties['user_from']->addVar("maxlength",100);
+		$this->mFieldProperties['user_from']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_LOCATION, "100");
+		$this->mFieldProperties['user_from']->addVar("maxlength", 100);
 
-		$this->mFieldProperties['user_aim']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['user_aim']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_AIM,"18");
-		$this->mFieldProperties['user_aim']->addVar("maxlength",18);
+		$this->mFieldProperties['user_aim']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_AIM, "18");
+		$this->mFieldProperties['user_aim']->addVar("maxlength", 18);
 
-		$this->mFieldProperties['user_msnm']=new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength'));
-		$this->mFieldProperties['user_msnm']->addMessage("maxlength",_MD_USER_ERROR_MAXLENGTH,_US_MSNM,"100");
-		$this->mFieldProperties['user_msnm']->addVar("maxlength",100);
-
-		$this->mFieldProperties['attachsig']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['attachsig']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['attachsig']->addMessage("intRange",_MD_USER_ERROR_INTRANGE,"attachsig");
-		$this->mFieldProperties['attachsig']->addVar("min",0);
-		$this->mFieldProperties['attachsig']->addVar("max",1);
-
-		$this->mFieldProperties['user_mailok']=new XCube_FieldProperty($this);
-		$this->mFieldProperties['user_mailok']->setDependsByArray(array('intRange'));
-		$this->mFieldProperties['user_mailok']->addMessage("intRange",_MD_USER_ERROR_INTRANGE,"user_mailok");
-		$this->mFieldProperties['user_mailok']->addVar("min",0);
-		$this->mFieldProperties['user_mailok']->addVar("max",1);
-	}
-	
-	function validatePass()
-	{
-		if(strlen($this->getVar('pass'))>0||strlen($this->getVar('vpass'))>0)
-			if($this->getVar('pass')!=$this->getVar('vpass')) {
-				$this->addErrorMessage(_MD_USER_ERROR_PASSWORD);
-				$this->set('pass',null);	// reset
-				$this->set('vpass',null);
-			}
+		$this->mFieldProperties['user_msnm']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_MSNM, "100");
+		$this->mFieldProperties['user_msnm']->addVar("maxlength", 100);
+		
+		$this->mFieldProperties['pass'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['pass']->setDependsByArray(array('minlength', 'maxlength'));
+		$this->mFieldProperties['pass']->addMessage('minlength', _MD_USER_ERROR_MINLENGTH, _MD_USER_LANG_PASS, $this->mConfig['minpass']);
+		$this->mFieldProperties['pass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32');
+		$this->mFieldProperties['pass']->addVar('minlength', $this->mConfig['minpass']);
+		$this->mFieldProperties['pass']->addVar('maxlength', 32);
+
+		$this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['vpass']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32');
+		$this->mFieldProperties['vpass']->addVar('maxlength', 32);
+		
+		$this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['timezone_offset']->setDependsByArray(array('required'));
+		$this->mFieldProperties['timezone_offset']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_TIMEZONE_OFFSET);
+
+		$this->mFieldProperties['umode'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['umode']->setDependsByArray(array('required'));
+		$this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CDISPLAYMODE);
+
+		$this->mFieldProperties['uorder'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['uorder']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CSORTORDER);
+		$this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _US_CSORTORDER);
+		$this->mFieldProperties['uorder']->addVar('min', 0);
+		$this->mFieldProperties['uorder']->addVar('max', 1);
+
+		$this->mFieldProperties['notify_method'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['notify_method']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['notify_method']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_NOTIFY_METHOD);
+		$this->mFieldProperties['notify_method']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_NOTIFY_METHOD);
+		$this->mFieldProperties['notify_method']->addVar('min', 0);
+		$this->mFieldProperties['notify_method']->addVar('max', 2);
+
+		$this->mFieldProperties['notify_mode'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['notify_mode']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['notify_mode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_NOTIFY_MODE);
+		$this->mFieldProperties['notify_mode']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_NOTIFY_MODE);
+		$this->mFieldProperties['notify_mode']->addVar('min', 0);
+		$this->mFieldProperties['notify_mode']->addVar('max', 2);
+		
+		$this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_OCCUPATION, '100');
+		$this->mFieldProperties['user_occ']->addVar('maxlength', 100);
+
+		$this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_INTEREST, '150');
+		$this->mFieldProperties['user_intrest']->addVar('maxlength', 150);
 	}
 	
-	function load(&$user)
+	function load(&$obj)
 	{
-		//Corner-cutting
-		$vars=$user->getProperties();
-		foreach($vars as $key=>$val) {
-			$this->set($key,$val);
+		$this->set('uid', $obj->get('uid'));
+		$this->set('name', $obj->get('name'));
+		
+		if ($this->mConfig['allow_chgmail']) {
+			$this->set('email', $obj->get('email'));
 		}
 
-		$this->set('pass',null);
-		$this->set('vpass',null);
+		$this->set('url', $obj->get('url'));
+		$this->set('user_icq', $obj->get('user_icq'));
+		$this->set('user_from', $obj->get('user_from'));
+		$this->set('user_sig', $obj->get('user_sig'));
+		$this->set('user_viewemail', $obj->get('user_viewemail'));
+		$this->set('user_aim', $obj->get('user_aim'));
+		$this->set('user_yim', $obj->get('user_yim'));
+		$this->set('user_msnm', $obj->get('user_msnm'));
+
+		$this->set('attachsig', $obj->get('attachsig'));
+		$this->set('timezone_offset', $obj->get('timezone_offset'));
+		$this->set('umode', $obj->get('umode'));
+		$this->set('uorder', $obj->get('uorder'));
+		$this->set('notify_method', $obj->get('notify_method'));
+		$this->set('notify_mode', $obj->get('notify_mode'));
+		$this->set('user_occ', $obj->get('user_occ'));
+		$this->set('bio', $obj->get('bio'));
+		$this->set('user_intrest', $obj->get('user_intrest'));
+		$this->set('user_mailok', $obj->get('user_mailok'));
+		
+		$this->set('pass', null);
+		$this->set('vpass', null);
 	}
 	
-	function update(&$user)
+	function update(&$obj)
 	{
-		$user->set('name',$this->getVar('name'));
-		$user->set('email',$this->getVar('email'));
-		$user->set('user_viewemail',$this->getVar('user_viewemail'));
-		$user->set('url',$this->getVar('url'));
-		$user->set('user_icq',$this->getVar('user_icq'));
-		$user->set('user_aim',$this->getVar('user_aim'));
-		$user->set('user_yim',$this->getVar('user_yim'));
-		$user->set('user_msnm',$this->getVar('user_msnm'));
-		$user->set('user_from',$this->getVar('user_from'));
-		$user->set('user_occ',$this->getVar('user_occ'));
-		$user->set('user_intrest',$this->getVar('user_intrest'));
-		$user->set('user_sig',$this->getVar('user_sig'));
-		$user->set('attachsig',$this->getVar('attachsig'));
-		$user->set('user_sig',$this->getVar('user_sig'));
-		$user->set('bio',$this->getVar('bio'));
-		$user->set('user_mailok',$this->getVar('user_mailok'));
+		$obj->set('name', $this->get('name'));
 		
-		if($this->getVar('pass'))
-			$user->set('pass',md5($this->getVar('pass')));
+		if ($this->mConfig['allow_chgmail']) {
+			$obj->set('email', $this->get('email'));
+		}
+
+		$obj->set('url', $this->get('url'));
+		$obj->set('user_icq', $this->get('user_icq'));
+		$obj->set('user_from', $this->get('user_from'));
+		$obj->set('user_sig', $this->get('user_sig'));
+		$obj->set('user_viewemail', $this->get('user_viewemail'));
+		$obj->set('user_aim', $this->get('user_aim'));
+		$obj->set('user_yim', $this->get('user_yim'));
+		$obj->set('user_msnm', $this->get('user_msnm'));
+
+		if (strlen($this->get('pass'))) {
+			$obj->set('pass', md5($this->get('pass')));
+		}
+
+		$obj->set('attachsig', $this->get('attachsig'));
+		$obj->set('timezone_offset', $this->get('timezone_offset'));
+		$obj->set('umode', $this->get('umode'));
+		$obj->set('uorder', $this->get('uorder'));
+		$obj->set('notify_method', $this->get('notify_method'));
+		$obj->set('notify_mode', $this->get('notify_mode'));
+		$obj->set('user_occ', $this->get('user_occ'));
+		$obj->set('bio', $this->get('bio'));
+		$obj->set('user_intrest', $this->get('user_intrest'));
+		$obj->set('user_mailok', $this->get('user_mailok'));
 	}
 }
 
Index: xoops2jp/html/modules/user/forms/UserConfirmForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.3 xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/forms/UserConfirmForm.class.php:1.1.2.3	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/UserConfirmForm.class.php	Wed Jul 19 19:21:25 2006
@@ -1,14 +1,18 @@
 <?php
+/**
+ * @package user
+ * @version $Id: UserConfirmForm.class.php,v 1.1.2.4 2006/07/19 10:21:25 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_ROOT_PATH."/class/XCube_ActionForm.class.php";
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
 
 /**
  * This class is generated by makeActionForm tool.
  * @auchor makeActionForm
  */
-class UserConfirmForm extends XCube_ActionForm 
+class User_UserConfirmForm extends XCube_ActionForm 
 {
 	function getTokenName()
 	{
Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.5 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.6
--- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.5	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php	Wed Jul 19 19:21:25 2006
@@ -9,8 +9,11 @@
  */
 class User_AbstractUserEditForm extends XCube_ActionForm
 {
-	var $mConfig = array();
+	var $mConfig = null;
 	
+	/**
+	 * TODO The argument of this member property may be moved to constructor.
+	 */
 	function prepare($userConfig)
 	{
 		$this->mConfig = $userConfig;
@@ -73,10 +76,13 @@
 		}
 	}
 	
-	function validateEmail()
+	function validateUrl()
 	{
-		if ($this->get('email') != null && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$this->get('email'))) {
-			$this->addErrorMessage(_MD_USER_ERROR_EMAIL_FORMAT);
+		$t_url = $this->get('url');
+		if (strlen($t_url) > 0) {
+			if (!preg_match('/^https?(:\/\/[-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)$/', $t_url)) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_MD_USER_ERROR_INJURY, _MD_USER_LANG_URL));
+			}
 		}
 	}
 	
Index: xoops2jp/html/modules/user/forms/AvatarFilterForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/user/forms/AvatarFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/user/forms/AvatarFilterForm.class.php:1.1.2.3	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/AvatarFilterForm.class.php	Wed Jul 19 19:21:25 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarFilterForm.class.php,v 1.1.2.4 2006/07/19 10:21:25 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -12,7 +16,6 @@
 class User_AvatarFilterForm extends User_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $_mCriteria = null;
 
 	function fetch()
 	{
Index: xoops2jp/html/modules/user/forms/AvatarEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.4 xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.5
--- xoops2jp/html/modules/user/forms/AvatarEditForm.class.php:1.1.2.4	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/AvatarEditForm.class.php	Wed Jul 19 19:21:25 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id: AvatarEditForm.class.php,v 1.1.2.5 2006/07/19 10:21:25 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -12,12 +16,12 @@
 	var $mOldAvatarFilename = null;
 	var $mFormFile = null;
 	
-	var $mWidth;
-	var $mHeight;
+	var $mWidth = 0;
+	var $mHeight = 0;
 	
 	function getTokenName()
 	{
-		return "module.user.AvatarEditForm.TOKEN";
+		return "module.user.AvatarEditForm.TOKEN" . $this->get('uid');
 	}
 
 	function prepare($width, $height, $maxfilesize)
Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.7
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.6	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php	Wed Jul 19 19:21:25 2006
@@ -7,7 +7,7 @@
 /**
  * This class is generated by makeActionForm tool.
  */
-class UserRegisterEditForm extends User_AbstractUserEditForm
+class User_RegisterEditForm extends User_AbstractUserEditForm
 {
 	function getTokenName()
 	{
@@ -36,7 +36,7 @@
 		// Set field properties
 		//
 		$this->mFieldProperties['uname'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['uname']->setDependsByArray(array('required','maxlength','minlength'));
+		$this->mFieldProperties['uname']->setDependsByArray(array('required', 'maxlength', 'minlength'));
 		$this->mFieldProperties['uname']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UNAME, '25');
 		$this->mFieldProperties['uname']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_UNAME, min(25,$this->mConfig['maxuname']));
 		$this->mFieldProperties['uname']->addMessage('minlength', _MD_USER_ERROR_MINLENGTH, _MD_USER_LANG_UNAME, $this->mConfig['minuname']);
@@ -44,10 +44,11 @@
 		$this->mFieldProperties['uname']->addVar('minlength', $this->mConfig['minuname']);
 
 		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email'));
 		$this->mFieldProperties['email']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addVar('maxlength', 60);
+		$this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT);
 
 		$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
@@ -55,15 +56,15 @@
 		$this->mFieldProperties['url']->addVar('maxlength', 100);
 
 		$this->mFieldProperties['pass'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['pass']->setDependsByArray(array('required','minlength','maxlength'));
+		$this->mFieldProperties['pass']->setDependsByArray(array('required', 'minlength', 'maxlength'));
 		$this->mFieldProperties['pass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_PASS, '32');
-		$this->mFieldProperties['pass']->addMessage('minlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, $this->mConfig['minpass']);
+		$this->mFieldProperties['pass']->addMessage('minlength', _MD_USER_ERROR_MINLENGTH, _MD_USER_LANG_PASS, $this->mConfig['minpass']);
 		$this->mFieldProperties['pass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_PASS, '32');
 		$this->mFieldProperties['pass']->addVar('minlength', $this->mConfig['minpass']);
 		$this->mFieldProperties['pass']->addVar('maxlength', 32);
 
 		$this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['vpass']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['vpass']->setDependsByArray(array('required', 'maxlength'));
 		$this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_VERIFYPASS, '32');
 		$this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32');
 		$this->mFieldProperties['vpass']->addVar('maxlength', 32);
@@ -94,7 +95,8 @@
         $obj->set('user_regdate',time(),true);
 	}
 }
-class UserRegisterAgreeEditForm extends UserRegisterEditForm 
+
+class User_RegisterAgreeEditForm extends User_RegisterEditForm 
 {
 	function prepare($userConfig)
 	{
Index: xoops2jp/html/modules/user/forms/GroupsFilterForm.class.php
diff -u xoops2jp/html/modules/user/forms/GroupsFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/user/forms/GroupsFilterForm.class.php:removed
--- xoops2jp/html/modules/user/forms/GroupsFilterForm.class.php:1.1.2.2	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/forms/GroupsFilterForm.class.php	Wed Jul 19 19:21:26 2006
@@ -1,48 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
-
-define('GROUPS_SORT_KEY_DEFAULT', 0);
-define('GROUPS_SORT_KEY_GROUPID', 1);
-define('GROUPS_SORT_KEY_NAME', 2);
-define('GROUPS_SORT_KEY_DESCRIPTION', 3);
-define('GROUPS_SORT_KEY_GROUP_TYPE', 4);
-define('GROUPS_SORT_KEY_MAXVALUE', 4);
-
-class User_GroupsFilterForm extends User_AbstractFilterForm
-{
-	var $mSort = 0;
-	var $_mSortKeys = array(
-		GROUPS_SORT_KEY_DEFAULT => 'groupid',
-		GROUPS_SORT_KEY_GROUPID => 'groupid',
-		GROUPS_SORT_KEY_NAME => 'name',
-		GROUPS_SORT_KEY_DESCRIPTION => 'description',
-		GROUPS_SORT_KEY_GROUP_TYPE => 'group_type'
-	);
-	var $_mCriteria = null;
-
-	function fetch()
-	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
-	
-		if ($this->mSort > GROUPS_SORT_KEY_MAXVALUE) {
-			$this->mSort = GROUPS_SORT_KEY_DEFAULT;
-		}
-	
-		if (isset($_REQUEST['groupid'])) {
-			$this->_mCriteria->add(new Criteria('groupid', array(XOBJ_DTYPE_INT, xoops_getrequest('groupid'))));
-		}
-	
-		if (isset($_REQUEST['name'])) {
-			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
-		}
-	
-		if (isset($_REQUEST['group_type'])) {
-			$this->_mCriteria->add(new Criteria('group_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('group_type'))));
-		}
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:21:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:21:40 +0900
Subject: [xoops-cvslog 3618] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060719102140.DE6B72AC083@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.11 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.12
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.11	Fri Jun 30 17:04:39 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Wed Jul 19 19:21:40 2006
@@ -4,8 +4,8 @@
   </div>
 <{elseif $xoops_isadmin == true}>
   <div style="text-align:right;">
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserEdit&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - 
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_DELACCOUNT}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - 
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_DELACCOUNT}></a>
   </div>
 <{/if}>
 
@@ -16,84 +16,84 @@
     <table class="outer" cellpadding="4" cellspacing="1" width="100%">
       <tr>
         <th colspan="2" style="text-align:center;">
-          <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}>
+          <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getShow('uname')}>
         </th>
       </tr>
       <{if $user_ownpage == true}>
       <tr>
         <td class="head" colspan="2" style="text-align:center;">
-          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a>
+          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_EDITPROFILE}></a>
         </td>
       </tr>
       <{/if}>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_AVATAR}></td>
         <td class="even" style="text-align:center;">
-          <{if $thisUser->getVar('user_avatar') != "blank.gif" }>
-            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" title="Avatar" />
+          <{if $thisUser->get('user_avatar') != "blank.gif" }>
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getShow('user_avatar')}>" alt="Avatar" title="Avatar" />
           <{else}>
             <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="No Avatar" title="No Avatar" />
           <{/if}>
           <{if $user_ownpage == true}>
-            <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
+            <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
           <{/if}>
         </td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_REALNAME}></td>
-        <td class="odd" style="text-align:center;"><{$thisUser->getVar('name')}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->getShow('name')}></td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_WEBSITE}></td>
-        <td class="even"><a href="<{$thisUser->getVar('url', 'E')}>" target="_blank"><{$thisUser->getVar('url')}></a></td>
+        <td class="even"><a href="<{$thisUser->getShow('url')}>" target="_blank"><{$thisUser->getShow('url')}></a></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_EMAIL}></td>
         <td class="odd">
-          <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
-            <{mailto address=$thisUser->getVar('email') encode="javascript"}>
+          <{if $thisUser->get('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
+            <{mailto address=$thisUser->get('email') encode="javascript"}>
           <{/if}>
         </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_PM}></td>
         <td class="even">
-          <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getVar('uid')}>', 'pmlite', 450, 380);">
-          <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" /></a>
+          <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getShow('uid')}>', 'pmlite', 450, 380);">
+          <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" /></a>
           <{$user_pmlink}>
         </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_ICQ}></td>
-        <td class="odd"><{$thisUser->getVar('user_icq')}></td>
+        <td class="odd"><{$thisUser->getShow('user_icq')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_AIM}></td>
-        <td class="even"><{$thisUser->getVar('user_aim')}></td>
+        <td class="even"><{$thisUser->getShow('user_aim')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_YIM}></td>
-        <td class="odd"><{$thisUser->getVar('user_yim')}></td>
+        <td class="odd"><{$thisUser->getShow('user_yim')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_MSNM}></td>
-        <td class="even"><{$thisUser->getVar('user_msnm')}></td>
+        <td class="even"><{$thisUser->getShow('user_msnm')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_LOCATION}></td>
-        <td class="odd"><{$thisUser->getVar('user_from')}></td>
+        <td class="odd"><{$thisUser->getShow('user_from')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_OCCUPATION}></td>
-        <td class="even"><{$thisUser->getVar('user_occ')}></td>
+        <td class="even"><{$thisUser->getShow('user_occ')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_INTEREST}></td>
-        <td class="odd"><{$thisUser->getVar('user_intrest')}></td>
+        <td class="odd"><{$thisUser->getShow('user_intrest')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
-        <td class="even"><{$thisUser->getVar('bio')}></td>
+        <td class="even"><{$thisUser->getShow('bio')}></td>
       </tr>
     </table>
     </td>
@@ -104,24 +104,24 @@
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_MEMBERSINCE}></td>
-        <td class="even" style="text-align:center;"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->get('user_regdate')|xoops_formattimestamp:l}></td>
       </tr>
       <{if $rank != null}>
         <tr valign="top">
           <td class="head"><{$smarty.const._US_RANK}></td>
           <td class="odd" style="text-align:center;">
-            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" alt="<{$rank->getVar('rank_title')}>" title="<{$rank->getVar('rank_title')}>" /><br />
-            <{$rank->getVar('rank_title')}>
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getShow('rank_image')}>" alt="<{$rank->getShow('rank_title')}>" title="<{$rank->getShow('rank_title')}>" /><br />
+            <{$rank->getShow('rank_title')}>
           </td>
         </tr>
       <{/if}>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_POSTS}></td>
-        <td class="even" style="text-align:center;"><{$thisUser->getVar('posts')}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->getShow('posts')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_LASTLOGIN}></td>
-        <td class="odd" style="text-align:center;"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->get('last_login')|xoops_formattimestamp:l}></td>
       </tr>
     </table>
     <br />
@@ -149,7 +149,7 @@
   <!-- end results item loop -->
 
   <{if $module.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|escape}>&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_SHOWALL}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|escape}>&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_SHOWALL}></a>
   <{/if}>
   </p>
 <{/foreach}>
Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.4	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Wed Jul 19 19:21:40 2006
@@ -3,13 +3,13 @@
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->getVar('uname')|escape}>
+      <{$registForm->get('uname')|escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EMAIL}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->getVar('email')|escape}>
+      <{$registForm->get('email')|escape}>
     </td>
   </tr>
   <tr>
Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.7 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.8
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.7	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Wed Jul 19 19:21:40 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a>
+<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->getShow('uid')}>"><{$smarty.const._US_PROFILE}></a>
 &nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
 </div>
 
@@ -58,9 +58,9 @@
     <tr>
       <{foreach item=obj from=$systemAvatars}>
         <td class="<{cycle values="odd,even" name="class"}>" style="text-align:center;">
-          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" alt="<{$obj->getVar('avatar_name')}>" title="<{$obj->getVar('avatar_name')}>"/><br />
-          <{$obj->getVar('avatar_name')}><br />
-          <input name="avatar_id[<{$obj->getVar('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
+          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>"/><br />
+          <{$obj->getShow('avatar_name')}><br />
+          <input name="avatar_id[<{$obj->getShow('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
         <{cycle name="table" values="</td>,</td>,</td>,</td>,</td></tr><tr>"}>
       <{/foreach}>
     </tr>
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.8 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.9
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Wed Jul 19 19:21:40 2006
@@ -22,7 +22,7 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
-    <td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$thisUser->getShow('uname')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_REALNAME}></td>
@@ -30,20 +30,29 @@
       <{xoops_input name=name size=30 maxlength=60 value=$actionForm->get('name')}>
     </td>
   </tr>
+  <{if $allow_chgmail}>
+    <tr>
+      <td class="head"><{$smarty.const._US_EMAIL}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
+        <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._US_ALLOWVIEWEMAIL}>
+      </td>
+    </tr>
+  <{/if}>
   <tr>
-    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="head"><{$smarty.const._US_WEBSITE}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
-      <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->get('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}>
+      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
     </td>
   </tr>
   <tr>
-    <td class="head"><{$smarty.const._US_WEBSITE}></td>
+    <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
+      <select name="timezone_offset">
+        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
+      </select>
     </td>
   </tr>
-  <!--- // TODO TIMEZONE --->
   <tr>
     <td class="head"><{$smarty.const._US_ICQ}></td>
     <td class="<{cycle values="odd,even"}>">
@@ -90,13 +99,37 @@
     <td class="head"><{$smarty.const._US_SIGNATURE}></td>
     <td class="<{cycle values="odd,even"}>">
       <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}><br />
-      <input type="checkbox" name="attachsig" value="1"<{if $actionForm->get('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}>
+      <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._US_SHOWSIG}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_CDISPLAYMODE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=umode options=$umodeOptions selected=$actionForm->get('umode')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_CSORTORDER}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=uorder options=$uorderOptions selected=$actionForm->get('uorder')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=notify_method options=$notify_methodOptions selected=$actionForm->get('notify_method')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_MODE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=notify_mode options=$notify_modeOptions selected=$actionForm->get('notify_mode')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50 id=bio}>
+      <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50}>
     </td>
   </tr>
   <tr>
@@ -110,8 +143,8 @@
   <tr>
     <td class="head"><{$smarty.const._US_MAILOK}></td>
     <td class="<{cycle values="odd,even"}>">
-      <input type="radio" name="user_mailok" value="1"<{if $actionForm->get('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}>
-      <input type="radio" name="user_mailok" value="0"<{if $actionForm->get('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}>
+      <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}><{$smarty.const._YES}>
+      <{xoops_input type=radio name=user_mailok value=0 default=$actionForm->get('user_mailok')}><{$smarty.const._NO}>
     </td>
   </tr>
   <tr>
Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.8 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.9
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Wed Jul 19 19:21:40 2006
@@ -34,9 +34,7 @@
     <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
       <select name="timezone_offset">
-        <{foreach item=timezone from=$timezones}>
-          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
-        <{/foreach}>
+        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
       </select>
     </td>
   </tr>
Index: xoops2jp/html/modules/user/templates/user_register_finish.html
diff -u xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.2
--- xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.1	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/templates/user_register_finish.html	Wed Jul 19 19:21:40 2006
@@ -1 +1 @@
-<div><{$complete_message}></div>
\ No newline at end of file
+<div><{$complete_message|escape}></div>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:22:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:22:04 +0900
Subject: [xoops-cvslog 3619] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060719102204.C0BBB2AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/users.php
diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.4 xoops2jp/html/modules/user/class/users.php:1.1.2.5
--- xoops2jp/html/modules/user/class/users.php:1.1.2.4	Thu Jul 13 19:55:29 2006
+++ xoops2jp/html/modules/user/class/users.php	Wed Jul 19 19:22:04 2006
@@ -54,7 +54,7 @@
 	//
 	function _loadGroups()
 	{
-		$handler =& xoops_getmodulehandler('groups_users_link');
+		$handler =& xoops_getmodulehandler('groups_users_link', 'user');
 		$links =& $handler->getObjects(new Criteria('uid', $this->get('uid')));
 		foreach ($links as $link) {
 			$this->Groups[] = $link->get('groupid');
@@ -150,7 +150,7 @@
 		if (parent::insert($user, $force)) {
 			$flag = true;
 
-			$handler =& xoops_getmodulehandler('groups_users_link');
+			$handler =& xoops_getmodulehandler('groups_users_link', 'user');
 			$handler->deleteAll(new Criteria('uid', $user->get('uid')), $force);
 
 			foreach ($user->Groups as $gid) {
Index: xoops2jp/html/modules/user/class/avatar.php
diff -u xoops2jp/html/modules/user/class/avatar.php:1.1.2.3 xoops2jp/html/modules/user/class/avatar.php:1.1.2.4
--- xoops2jp/html/modules/user/class/avatar.php:1.1.2.3	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/avatar.php	Wed Jul 19 19:22:04 2006
@@ -34,7 +34,7 @@
 	{
 		@unlink(XOOPS_UPLOAD_PATH . "/" . $obj->get('avatar_file'));
 		if (parent::delete($obj)) {
-			$linkHandler =& xoops_getmodulehandler('avatar_user_link');
+			$linkHandler =& xoops_getmodulehandler('avatar_user_link', 'user');
 			$criteria =& new Criteria('avatar_id', $obj->get('avatar_id'));
 			$linkHandler->deleteAll($criteria);
 			

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:22:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:22:25 +0900
Subject: [xoops-cvslog 3620] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060719102225.578052AC05C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u /dev/null xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.1
--- /dev/null	Wed Jul 19 19:22:25 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Wed Jul 19 19:22:25 2006
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @package user
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.1 2006/07/19 10:22:25 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+ 
+/**
+ * This is static functions collection class for legacy pages access.
+ */
+class User_LegacypageFunctions
+{
+	/**
+	 * The process for userinfo.php. This process doesn't execute anything
+	 * directly. Forward to the controller of the user module.
+	 */
+	function userinfo()
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$uid = isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+		
+		$url = XOOPS_URL;
+		if ($uid > 0) {
+			$url = XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=" . $uid;
+		}
+		else {
+			$xoopsUser =& $root->mController->getXoopsUser();
+			if (is_object($xoopsUser)) {
+				$url = XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=" . $xoopsUser->get('uid');
+			}
+		}
+		
+		$root->mController->executeForward($url);
+	}
+	
+	/**
+	 * The process for edituser.php. This process doesn't execute anything
+	 * directly. Forward to the controller of the user module.
+	 */
+	function edituser()
+	{
+		$root =& XCube_Root::getSingleton();
+		$uid = isset($_REQUEST['uid']) ? intval(xoops_getrequest('uid')) : 0;
+
+		$url = XOOPS_URL;
+		if ($uid > 0) {
+			$url = XOOPS_MODULE_URL . "/user/index.php?action=EditUser&uid=" . $uid;
+		}
+		else {
+			$xoopsUser =& $root->mController->getXoopsUser();
+			if (is_object($xoopsUser)) {
+				$url = XOOPS_MODULE_URL . "/user/index.php?action=EditUser&uid=" . $xoopsUser->get('uid');
+			}
+		}
+
+		$root->mController->executeForward($url);
+	}
+	
+	/**
+	 * The process for register.php. This process doesn't execute anything
+	 * directly. Forward to the controller of the user module.
+	 */
+	function register()
+	{
+		$root =& XCube_Root::getSingleton();
+		$xoopsUser =& $root->mController->getXoopsUser();
+		
+		if (is_object($xoopsUser)) {
+			$root->mController->executeForward(XOOPS_URL);
+		}
+		else {
+			$root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserRegister");
+		}
+	}
+	
+	/**
+	 * The process for lostpass.php. This process doesn't execute anything
+	 * directly. If the current user is registered user, kick out to the top
+	 * page. Else, forward to the lost-pass page.
+	 */
+	function AccessToLostpass()
+	{
+		$root =& XCube_Root::getSingleton();
+		$xoopsUser =& $root->mController->getXoopsUser();
+
+		if (is_object($xoopsUser)) {
+			$controller->executeForward(XOOPS_URL);
+		}
+		else {
+			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
+		}
+	}
+
+	/**
+	 * The process for user.php. This process doesn't execute anything directly.
+	 * Forward to the controller of the user module.
+	 */
+	function user()
+	{
+		$root =& XCube_Root::getSingleton();
+		$op = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "main";
+		$xoopsUser =& $root->mController->getXoopsUser();
+		
+		switch($op) {
+			case "main":
+				$url = is_object($xoopsUser) ? XOOPS_MODULE_URL . "/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid')
+				                               : XOOPS_MODULE_URL . "/user/index.php"; 
+				$root->mController->executeForward($url);
+				break;
+				
+			case "login":
+				$root->mController->checkLogin();
+				break;
+			
+			case "logout":
+				$root->mController->logout();
+				break;
+		}
+	}
+	
+	function checkLogin(&$xoopsUser)
+	{
+		if (is_object($xoopsUser)) {
+			return;
+		}
+
+		$root =& XCube_Root::getSingleton();
+		$root->mLanguageManager->loadModuleLanguage('user');
+
+		$userHandler =& xoops_gethandler('user');
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('uname', xoops_getrequest('uname')));
+		$criteria->add(new Criteria('pass', md5(xoops_getrequest('pass'))));
+		
+		$userArr =& $userHandler->getObjects($criteria);
+		
+		if (count($userArr) != 1) {
+			return;
+		}
+		
+		$xoopsUser = $userArr[0];
+			
+		if ($xoopsUser->get('level') == 0) {
+			// TODO We should use message "_US_NOACTTPADM"
+			return;
+		}
+	
+		//
+		// Regist to session
+		//
+		$_SESSION = array();
+		$_SESSION['xoopsUserId'] = $xoopsUser->get('uid');
+		$_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
+	}
+
+	function logout(&$successFlag, $xoopsUser)
+	{
+		$root =& XCube_Root::getSingleton();
+		$xoopsConfig = $root->mController->getConfig();
+		
+		$root->mLanguageManager->loadModuleLanguage('user');
+
+		// Reset session
+		$_SESSION = array();
+		session_destroy();
+
+		if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
+			setcookie($xoopsConfig['session_name'], '', time()- 3600, '/',  '', 0);
+		}
+
+		// clear entry from online users table
+		if (is_object($xoopsUser)) {
+			$onlineHandler =& xoops_gethandler('online');
+			$onlineHandler->destroy($xoopsUser->get('uid'));
+		}
+		
+		$successFlag = true;
+    }
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:22:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:22:36 +0900
Subject: [xoops-cvslog 3621] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060719102236.170BA2AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/main.php
diff -u xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.12 xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.13
--- xoops2jp/html/modules/user/language/japanese/main.php:1.1.2.12	Sun Feb  5 19:33:39 2006
+++ xoops2jp/html/modules/user/language/japanese/main.php	Wed Jul 19 19:22:35 2006
@@ -6,6 +6,7 @@
 define('_MD_USER_ERROR_AVATAR_SIZE', "アバターの画像サイズが許容サイズをオーバーしています");
 define('_MD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_MD_USER_ERROR_EMAIL_FORMAT', "不正なメールアドレスです");
+define('_MD_USER_ERROR_INJURY', "{0}に指定された値が不正です");
 define('_MD_USER_ERROR_INTRANGE', "{0}に対して不正な入力です");
 define('_MD_USER_ERROR_MAXLENGTH', "{0}は半角{1}文字以下にして下さい");
 define('_MD_USER_ERROR_MINLENGTH', "{0}は半角{1}文字以上にして下さい");
@@ -34,6 +35,8 @@
 define('_MD_USER_LANG_CREATE_NEW', "新規作成");
 define('_MD_USER_LANG_EMAIL', "電子メール");
 define('_MD_USER_LANG_GROUPID', "グループID");
+define('_MD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
+define('_MD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
 define('_MD_USER_LANG_PASS', "パスワード");
 define('_MD_USER_LANG_RANK_ID', "ID");
 define('_MD_USER_LANG_SELECT', "選択");
@@ -43,6 +46,7 @@
 define('_MD_USER_LANG_UNAME', "ユーザー名");
 define('_MD_USER_LANG_URL', "URL");
 define('_MD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか？");
+define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password");
 define('_US_ACONTACT', "選択されたアカウントは既に承認が完了しています。");
 define('_US_ACTKEYNOT', "承認キーが間違っています。");
 define('_US_ACTLOGIN', "アカウントを承認しました。登録の際に記入したパスワードを使用してログインしてください。");

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:22:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:22:35 +0900
Subject: [xoops-cvslog 3622] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060719102235.E9E7A2AC05C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/main.php
diff -u xoops2jp/html/modules/user/language/english/main.php:1.1.2.11 xoops2jp/html/modules/user/language/english/main.php:1.1.2.12
--- xoops2jp/html/modules/user/language/english/main.php:1.1.2.11	Sun Feb  5 19:33:39 2006
+++ xoops2jp/html/modules/user/language/english/main.php	Wed Jul 19 19:22:35 2006
@@ -6,6 +6,7 @@
 define('_MD_USER_ERROR_AVATAR_SIZE', "Uploaded file exceeds the dimensions limit for avatar.");
 define('_MD_USER_ERROR_DBUPDATE_FAILED', "Failed updating database");
 define('_MD_USER_ERROR_EMAIL_FORMAT', "Incorrect email address");
+define('_MD_USER_ERROR_INJURY', "The specified value {0} is wrong.");
 define('_MD_USER_ERROR_INTRANGE', "Incorrect input on {0}.");
 define('_MD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
 define('_MD_USER_ERROR_MINLENGTH', "Input {0} with {1} or more characters.");
@@ -34,6 +35,8 @@
 define('_MD_USER_LANG_CREATE_NEW', "Create new");
 define('_MD_USER_LANG_EMAIL', "Email");
 define('_MD_USER_LANG_GROUPID', "Group ID");
+define('_MD_USER_LANG_NOTIFY_METHOD', "Notify method");
+define('_MD_USER_LANG_NOTIFY_MODE', "Notify mode");
 define('_MD_USER_LANG_PASS', "Password");
 define('_MD_USER_LANG_RANK_ID', "ID");
 define('_MD_USER_LANG_SELECT', "Select");
@@ -43,6 +46,7 @@
 define('_MD_USER_LANG_UNAME', "uname");
 define('_MD_USER_LANG_URL', "URL");
 define('_MD_USER_MESSAGE_CONFIRM_DELETE', "Do you delete the following data?");
+define('_MD_USER_MESSAGE_SEND_PASSWORD', "Send password");
 define('_US_ACONTACT', "Selected account is already activated!");
 define('_US_ACTKEYNOT', "Activation key is not correct!");
 define('_US_ACTLOGIN', "Your account has been activated. Please login with the registered password.");

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:23:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:23:22 +0900
Subject: [xoops-cvslog 3623] CVS update:
	xoops2jp/html/modules/user/preload/Primary
Message-ID: <20060719102322.B4B512AC05C@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.3 xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.4
--- xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.3	Tue Jun 27 18:16:50 2006
+++ xoops2jp/html/modules/user/preload/Primary/Primary.class.php	Wed Jul 19 19:23:22 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package user
+ * @version $Id
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) die();
 
@@ -6,12 +10,49 @@
 {
 	function preFilter()
 	{
-		require_once XOOPS_ROOT_PATH . "/modules/user/kernel/UserEventProxyRegister.class.php";
-		
 		$root =& XCube_Root::getSingleton();
-		$root->mDelegateManager->add("Site.Login", array ("UserCommonEventFunction", "NewLogin"));
+		$root->mDelegateManager->add("Site.Login", "User_Login::login");
+
+		$file = XOOPS_ROOT_PATH . "/modules/user/kernel/LegacypageFunctions.class.php";
+		
+		$root->mDelegateManager->add("Legacypage.Userinfo.Access", "User_LegacypageFunctions::userinfo", $file);
+		$root->mDelegateManager->add("Legacypage.Edituser.Access", "User_LegacypageFunctions::edituser", $file);
+		$root->mDelegateManager->add("Legacypage.Register.Access", "User_LegacypageFunctions::register", $file);
+		$root->mDelegateManager->add("Legacypage.User.Access", "User_LegacypageFunctions::user", $file);
+		$root->mDelegateManager->add("Legacypage.Lostpass.Access", "User_LegacypageFunctions::lostpass", $file);
+		$root->mDelegateManager->add("Site.CheckLogin", "User_LegacypageFunctions::checkLogin", $file);
+		$root->mDelegateManager->add("Site.Logout", "User_LegacypageFunctions::logout", $file);
+	}
+}
 
-		$this->mController->mRoot->mEventManager->addProxyRegister(new UserEventProxyRegister());
+/**
+ * This static class has a static member function for login process. Because
+ * this process is always called, this class is always loaded. We may move this
+ * class to other file. This file is a preload and no good for normal class
+ * definition. 
+ * 
+ * @todo We may move this class to other file.
+ */
+class User_Login
+{
+	function login(&$xoopsUser)
+	{
+		if (is_object($xoopsUser)) {
+			return;
+		}
+		
+		if (!empty($_SESSION['xoopsUserId'])) {
+			$memberHandler=xoops_gethandler('member');
+			$user =& $memberHandler->getUser($_SESSION['xoopsUserId']);
+			$xoopsUser = $user;
+			if(!is_object($xoopsUser)) {
+				$xoopsUser = null;
+				$_SESSION = array();
+			}
+			else {
+				$xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
+			}
+		}
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:25:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:25:14 +0900
Subject: [xoops-cvslog 3624] CVS update: xoops2jp/html
Message-ID: <20060719102514.4F1D72AC00E@users.sourceforge.jp>

Index: xoops2jp/html/lostpass.php
diff -u xoops2jp/html/lostpass.php:1.2.8.2 xoops2jp/html/lostpass.php:1.2.8.3
--- xoops2jp/html/lostpass.php:1.2.8.2	Tue Nov  8 18:49:29 2005
+++ xoops2jp/html/lostpass.php	Wed Jul 19 19:25:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: lostpass.php,v 1.2.8.2 2005/11/08 09:49:29 minahito Exp $
+// $Id: lostpass.php,v 1.2.8.3 2006/07/19 10:25:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -28,7 +28,7 @@
 require_once "mainfile.php";
 
 $root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Lostpass.Access",$root->mController,$eventArgs);
+
+XCube_DelegateUtils::call("Legacypage.Lostpass.Access");
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/edituser.php
diff -u xoops2jp/html/edituser.php:1.2.8.4 xoops2jp/html/edituser.php:1.2.8.5
--- xoops2jp/html/edituser.php:1.2.8.4	Tue Nov  8 18:49:24 2005
+++ xoops2jp/html/edituser.php	Wed Jul 19 19:25:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: edituser.php,v 1.2.8.4 2005/11/08 09:49:24 minahito Exp $
+// $Id: edituser.php,v 1.2.8.5 2006/07/19 10:25:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -27,8 +27,6 @@
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Edituser.Access",$root->mController,$eventArgs);
+XCube_DelegateUtils::call("Legacypage.Edituser.Access");
 
 ?>
Index: xoops2jp/html/register.php
diff -u xoops2jp/html/register.php:1.2.8.2 xoops2jp/html/register.php:1.2.8.3
--- xoops2jp/html/register.php:1.2.8.2	Wed Nov  9 20:54:36 2005
+++ xoops2jp/html/register.php	Wed Jul 19 19:25:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: register.php,v 1.2.8.2 2005/11/09 11:54:36 minahito Exp $
+// $Id: register.php,v 1.2.8.3 2006/07/19 10:25:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -27,8 +27,6 @@
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Register.Access",$root->mController,$eventArgs);
+XCube_DelegateUtils::call("Legacypage.Register.Access");
 
 ?>
Index: xoops2jp/html/user.php
diff -u xoops2jp/html/user.php:1.2.8.5 xoops2jp/html/user.php:1.2.8.6
--- xoops2jp/html/user.php:1.2.8.5	Tue Nov  8 18:49:39 2005
+++ xoops2jp/html/user.php	Wed Jul 19 19:25:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.php,v 1.2.8.5 2005/11/08 09:49:39 minahito Exp $
+// $Id: user.php,v 1.2.8.6 2006/07/19 10:25:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -28,7 +28,7 @@
 require_once "mainfile.php";
 
 $root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.User.Access",$root->mController,$eventArgs);
+
+XCube_DelegateUtils::call("Legacypage.User.Access");
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/userinfo.php
diff -u xoops2jp/html/userinfo.php:1.2.8.3 xoops2jp/html/userinfo.php:1.2.8.4
--- xoops2jp/html/userinfo.php:1.2.8.3	Tue Nov  8 18:49:43 2005
+++ xoops2jp/html/userinfo.php	Wed Jul 19 19:25:14 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: userinfo.php,v 1.2.8.3 2005/11/08 09:49:43 minahito Exp $
+// $Id: userinfo.php,v 1.2.8.4 2006/07/19 10:25:14 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -27,8 +27,6 @@
 
 require_once "mainfile.php";
 
-$root=&XCube_Root::getSingleton();
-$eventArgs=array();
-$root->mEventManager->raiseEvent("Legacypage.Userinfo.Access",$root->mController,$eventArgs);
+XCube_DelegateUtils::call("Legacypage.Userinfo.Access");
 
-?>
\ No newline at end of file
+?>

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:28:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:28:28 +0900
Subject: [xoops-cvslog 3625] CVS update:
	xoops2jp/html/modules/user/preload/Primary
Message-ID: <20060719102828.119FD2AC00E@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.4 xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.5
--- xoops2jp/html/modules/user/preload/Primary/Primary.class.php:1.1.2.4	Wed Jul 19 19:23:22 2006
+++ xoops2jp/html/modules/user/preload/Primary/Primary.class.php	Wed Jul 19 19:28:27 2006
@@ -21,6 +21,7 @@
 		$root->mDelegateManager->add("Legacypage.User.Access", "User_LegacypageFunctions::user", $file);
 		$root->mDelegateManager->add("Legacypage.Lostpass.Access", "User_LegacypageFunctions::lostpass", $file);
 		$root->mDelegateManager->add("Site.CheckLogin", "User_LegacypageFunctions::checkLogin", $file);
+		$root->mDelegateManager->add("Site.CheckLogin.Success", "User_LegacypageFunctions::checkLoginSuccess", $file);
 		$root->mDelegateManager->add("Site.Logout", "User_LegacypageFunctions::logout", $file);
 	}
 }

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:28:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:28:35 +0900
Subject: [xoops-cvslog 3626] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060719102835.B405D2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.1 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.2
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.1	Wed Jul 19 19:22:25 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Wed Jul 19 19:28:35 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.1 2006/07/19 10:22:25 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.2 2006/07/19 10:28:35 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -155,6 +155,16 @@
 		$_SESSION['xoopsUserId'] = $xoopsUser->get('uid');
 		$_SESSION['xoopsUserGroups'] = $xoopsUser->getGroups();
 	}
+	
+    function checkLoginSuccess(&$xoopsUser)
+    {
+		if (is_object($xoopsUser)) {
+			$handler =& xoops_gethandler('user');
+			$xoopsUser->set('last_login', time());
+			
+			$handler->insert($xoopsUser);
+		}
+	}
 
 	function logout(&$successFlag, $xoopsUser)
 	{

From minahito ＠ users.sourceforge.jp  Wed Jul 19 19:30:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 19:30:32 +0900
Subject: [xoops-cvslog 3627] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060719103032.DDC6B2AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php
diff -u xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:1.1.2.8 xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:removed
--- xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php:1.1.2.8	Thu Jun 22 14:38:46 2006
+++ xoops2jp/html/modules/user/kernel/UserEventProxyRegister.class.php	Wed Jul 19 19:30:32 2006
@@ -1,123 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
-
-class UserEventProxyRegister extends XCube_EventProxyRegister
-{
-	var $_mList=array("Legacypage.Userinfo.Access","Legacypage.Edituser.Access",
-	                   "Legacypage.User.Access", "Site.CheckLogin", "Site.Logout",
-	                   "Legacypage.Register.Access","Site.CheckLogin.Success",
-					   "Legacypage.Lostpass.Access");
-	
-	function getEventNameList()
-	{
-		return $this->_mList;
-	}
-	
-	function &createLegacypage_Userinfo_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","AccessToUserinfo");
-		return $delegate;
-	}
-
-	function &createLegacypage_Edituser_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","AccessToEdituser");
-		return $delegate;
-	}
-
-	function &createLegacypage_User_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","AccessToUser");
-		return $delegate;
-	}
-
-	function &createLegacypage_Register_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","AccessToRegister");
-		return $delegate;
-	}
-
-	function &createSite_CheckLoginDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","CheckLogin");
-		return $delegate;
-	}
-
-	function &createSite_LogoutDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","Logout");
-		return $delegate;
-	}
-
-	function &createSite_CheckLogin_SuccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","CheckLoginSuccess");
-		return $delegate;
-	}
-
-	function &createLegacypage_Lostpass_AccessDelegate()
-	{
-		require_once XOOPS_MODULE_PATH."/user/kernel/UserEventFunction.class.php";
-		$delegate=new XCube_Delegate("UserEventFunction","AccessToLostpass");
-		return $delegate;
-	}
-}
-
-class UserCommonEventFunction
-{
-	function &Login(&$controller,&$loginEventArgs)
-	{
-		if (!empty($_SESSION['xoopsUserId'])) {
-			$memberHandler=xoops_gethandler('member');
-			$xoopsUser=&$memberHandler->getUser($_SESSION['xoopsUserId']);
-			if(!is_object($xoopsUser)) {
-				$xoopsUser = null;
-				$_SESSION=array();
-			}
-			else {
-				$xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
-			}
-			$loginEventArgs->setXoopsUser($xoopsUser);
-			$controller->mXoopsUser=&$xoopsUser;
-		}
-
-		return $loginEventArgs;
-	}
-	
-	/**
-	 * [Notice]
-	 * New function for new delegate. Of course, we'll change the name before
-	 * released.
-	 */
-	function NewLogin(&$xoopsUser)
-	{
-		if (is_object($xoopsUser)) {
-			return;
-		}
-
-		if (!empty($_SESSION['xoopsUserId'])) {
-			$memberHandler=xoops_gethandler('member');
-			$user =& $memberHandler->getUser($_SESSION['xoopsUserId']);
-			$xoopsUser = $user;
-			if(!is_object($xoopsUser)) {
-				$xoopsUser = null;
-				$_SESSION = array();
-			}
-			else {
-				$xoopsUser->setGroups($_SESSION['xoopsUserGroups']);
-			}
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: xoops2jp/html/modules/user/kernel/UserEventFunction.class.php
diff -u xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.11 xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:removed
--- xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.11	Fri Apr 21 12:03:57 2006
+++ xoops2jp/html/modules/user/kernel/UserEventFunction.class.php	Wed Jul 19 19:30:32 2006
@@ -1,200 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * Static methods' collection for delegates.
- */
-class UserEventFunction
-{
-	/**
-	 * @param $sender Base_Controller
-	 */
-	function AccessToUserinfo(&$controller,&$eventArgs)
-	{
-		// $controller=(Base_Controller)$sender;
-		$uid=isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
-		if($uid>0) {
-			$url=XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$uid;
-		}
-		else {
-			$xoopsUser=&$controller->getXoopsUser();
-			if(is_object($xoopsUser))
-				$url=XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid');
-		}
-
-		$controller->executeForward($url);
-	}
-
-	/**
-	 * @param $sender Base_Controller
-	 */
-	function AccessToEdituser(&$controller,&$eventArgs)
-	{
-		// $controller=(Base_Controller)$sender;
-		$uid=isset($_REQUEST['uid']) ? intval($_REQUEST['uid']) : 0;
-
-		$url=XOOPS_URL;
-		if($uid>0) {
-			$url=XOOPS_MODULE_URL."/user/index.php?action=EditUser&uid=".$uid;
-		}
-		else {
-			$xoopsUser=&$controller->getXoopsUser();
-			if(is_object($xoopsUser))
-				$url=XOOPS_MODULE_URL."/user/index.php?action=EditUser&uid=".$xoopsUser->get('uid');
-		}
-
-		$controller->executeForward($url);
-	}
-
-	/**
-	 * @param $sender Base_Controller
-	 */
-	function AccessToUser(&$controller,&$eventArgs)
-	{
-		// $controller=(Base_Controller)$sender;
-		$op=isset($_REQUEST['op']) ? trim($_REQUEST['op']) : "main";
-		$xoopsUser=&$controller->getXoopsUser();
-		
-		switch($op) {
-			case "main":
-				$url=is_object($xoopsUser) ? XOOPS_MODULE_URL."/user/index.php?action=UserInfo&uid=".$xoopsUser->get('uid')
-				                             : XOOPS_MODULE_URL."/user/index.php"; 
-				$controller->executeForward($url);
-				break;
-				
-			case "login":
-				$checkLoginEventArgs = new CheckLoginEventArgs();
-				$controller->mRoot->mEventManager->raiseEvent("Site.CheckLogin",$controller,$checkLoginEventArgs);
-				break;
-			
-			case "logout":
-				$args=array();
-				$args['successFlag']=false;
-				$controller->mRoot->mEventManager->raiseEvent("Site.Logout",$controller,$args);
-				break;
-		}
-	}
-
-	/**
-	 * @param $sender Base_Controller
-	 */
-	function AccessToRegister(&$controller,&$eventArgs)
-	{
-		$xoopsUser =& $controller->getXoopsUser();
-		if (is_object($xoopsUser)) {
-			$controller->executeForward(XOOPS_URL);
-		}
-		else {
-			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=UserRegister");
-		}
-	}
-	
-	function CheckLogin(&$controller,&$eventArgs)
-	{
-		if($eventArgs->isSuccess())
-			return;
-
-		$controller->mRoot->mLanguageManager->loadModuleLanguage('user');
-
-		$userHandler =& xoops_gethandler('user');
-		
-		$criteria =& new CriteriaCompo();
-		$criteria->add(new Criteria('uname', xoops_getrequest('uname')));
-		$criteria->add(new Criteria('pass', md5(xoops_getrequest('pass'))));
-		
-		$userArr =& $userHandler->getObjects($criteria);
-		
-		if (count($userArr) != 1) {
-			$eventArgs->setRedirectUrl(XOOPS_URL."/user.php");
-			$eventArgs->setRedirectMessage(_US_INCORRECTLOGIN);
-			return;
-		}
-		
-		$user =& $userArr[0];
-			
-		if($user->get('level')==0) {
-			$eventArgs->setRedirectUrl(XOOPS_URL);
-			$eventArgs->setRedirectMessage(_US_NOACTTPADM);
-			return;
-		}
-	
-		// Regist to session
-		$_SESSION = array();
-		$_SESSION['xoopsUserId'] = $user->get('uid');
-		$_SESSION['xoopsUserGroups'] = $user->getGroups();
-		
-		if (!empty($_POST['xoops_redirect']) && !strpos($_POST['xoops_redirect'], 'register')) {
-			$parsed = parse_url(XOOPS_URL);
-			$url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
-			if (isset($parsed['host'])) {
-				$url .= isset($parsed['port']) ?$parsed['host'].':'.$parsed['port'].trim($_POST['xoops_redirect']): $parsed['host'].trim($_POST['xoops_redirect']);
-			} else {
-				$url .= xoops_getenv('HTTP_HOST').trim($_POST['xoops_redirect']);
-			}
-		} else {
-			$url = XOOPS_URL.'/index.php';
-		}
-		
-		$eventArgs->setXoopsUser($user);
-
-		$eventArgs->setRedirectUrl($url);
-		$eventArgs->setSuccessFlag(true);
-	}
-
-	function Logout(&$controller,&$eventArgs)
-	{
-		// @Todo: this function depends global variable
-		global $xoopsConfig;
-		global $xoopsUser;
-
-		$controller->mRoot->mLanguageManager->loadModuleLanguage('user');
-
-		// Reset session
-		$_SESSION = array();
-		session_destroy();
-
-		if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
-			setcookie($xoopsConfig['session_name'], '', time()- 3600, '/',  '', 0);
-		}
-
-		// clear entry from online users table
-		if (is_object($xoopsUser)) {
-			$onlineHandler =& xoops_gethandler('online');
-			$onlineHandler->destroy($xoopsUser->get('uid'));
-		}
-		
-		$eventArgs['successFlag']=true;
-    }
-    
-	/**
-	 * Update last login time
-	 */
-    function CheckLoginSuccess(&$sender,&$eventArgs)
-    {
-		if(is_object($eventArgs['xoopsUser'])) {
-			$userHandler=&xoops_gethandler('user');
-			$eventArgs['xoopsUser']->setVar('last_login', time());
-			$userHandler->insert($eventArgs['xoopsUser']);
-		}
-	}
-
-	/**
-	 * If the current user is registered user, kick out to the top page.
-	 * Else, forward to the lost-pass page.
-	 */
-	function AccessToLostpass(&$controller, &$eventArgs)
-	{
-		$xoopsUser =& $controller->getXoopsUser();
-		if (is_object($xoopsUser)) {
-			$controller->executeForward(XOOPS_URL);
-		}
-		else {
-			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
-		}
-	}
-
-}
-
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 19 20:00:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 20:00:51 +0900
Subject: [xoops-cvslog 3628] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060719110051.4A2D92AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.3 xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php:1.1.2.3	Wed Jul 19 19:21:16 2006
+++ xoops2jp/html/modules/user/class/LostPassMailBuilder.class.php	Wed Jul 19 20:00:51 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LostPassMailBuilder.class.php,v 1.1.2.3 2006/07/19 10:21:16 minahito Exp $
+ * @version $Id: LostPassMailBuilder.class.php,v 1.1.2.4 2006/07/19 11:00:51 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -98,7 +98,7 @@
  * second mail at procedure of the password regenerated, and written about the
  * new generated password of the user.
  */
-class User_LostPass2MailBuilder extends LostPass1MailBuilder
+class User_LostPass2MailBuilder extends User_LostPass1MailBuilder
 {
 	function setTemplate()
 	{

From minahito ＠ users.sourceforge.jp  Wed Jul 19 20:01:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 20:01:00 +0900
Subject: [xoops-cvslog 3629] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060719110100.16F5E2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.2 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.3
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.2	Wed Jul 19 19:28:35 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Wed Jul 19 20:00:59 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.2 2006/07/19 10:28:35 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.3 2006/07/19 11:00:59 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -80,16 +80,16 @@
 	 * directly. If the current user is registered user, kick out to the top
 	 * page. Else, forward to the lost-pass page.
 	 */
-	function AccessToLostpass()
+	function lostpass()
 	{
 		$root =& XCube_Root::getSingleton();
 		$xoopsUser =& $root->mController->getXoopsUser();
 
 		if (is_object($xoopsUser)) {
-			$controller->executeForward(XOOPS_URL);
+			$root->mController->executeForward(XOOPS_URL);
 		}
 		else {
-			$controller->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
+			$root->mController->executeForward(XOOPS_MODULE_URL . "/user/index.php?action=LostPass");
 		}
 	}
 

From minahito ＠ users.sourceforge.jp  Wed Jul 19 20:01:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Jul 2006 20:01:52 +0900
Subject: [xoops-cvslog 3630] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060719110152.11DF82AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/RegistMailBuilder.class.php
diff -u xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.6 xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.7
--- xoops2jp/html/modules/user/class/RegistMailBuilder.class.php:1.1.2.6	Wed Jul 19 19:21:16 2006
+++ xoops2jp/html/modules/user/class/RegistMailBuilder.class.php	Wed Jul 19 20:01:51 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: RegistMailBuilder.class.php,v 1.1.2.6 2006/07/19 10:21:16 minahito Exp $
+ * @version $Id: RegistMailBuilder.class.php,v 1.1.2.7 2006/07/19 11:01:51 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -111,7 +111,7 @@
  * mail which this class builds, requests activating the new registration for
  * administrators.
  */
-class User_RegistUserAdminActivateMailBuilder extends RegistUserActivateMailBuilder
+class User_RegistUserAdminActivateMailBuilder extends User_RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
@@ -154,7 +154,7 @@
  * 
  * @todo Implement setTemplate()
  */
-class User_RegistUserNotifyMailBuilder extends RegistUserActivateMailBuilder
+class User_RegistUserNotifyMailBuilder extends User_RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{
@@ -181,7 +181,7 @@
  * This class is a builder which uses activated.tpl as the template. The mail
  * which this class builds, reports completed activation for a new user.
  */
-class User_RegistAdminCommitMailBuilder extends RegistUserActivateMailBuilder
+class User_RegistAdminCommitMailBuilder extends User_RegistUserActivateMailBuilder
 {
 	function setTemplate()
 	{

From minahito ＠ users.sourceforge.jp  Thu Jul 20 01:02:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 01:02:45 +0900
Subject: [xoops-cvslog 3631] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060719160245.6DD802AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.48 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.49
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.48	Wed Jul 19 19:18:27 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Thu Jul 20 01:02:45 2006
@@ -778,11 +778,11 @@
 		if (is_object($xoopsUser)) {
 			$this->mLogout->call(new XCube_Ref($successFlag), $xoopsUser);
 			if ($successFlag) {
-				XCube_DelegateUtils::call("Site.Logout.Success");
+				XCube_DelegateUtils::call("Site.Logout.Success", $xoopsUser);
 				$this->executeRedirect(XOOPS_URL, 1, array(_US_LOGGEDOUT, _US_THANKYOUFORVISIT));
 			}
 			else {
-				XCube_DelegateUtils::call("Site.Logout.Fail");
+				XCube_DelegateUtils::call("Site.Logout.Fail", $xoopsUser);
 			}
 		}
 		else {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 01:13:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 01:13:18 +0900
Subject: [xoops-cvslog 3632] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060719161318.D45B12AC05D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.13 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.14
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.13	Sat Jul  1 16:24:42 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Thu Jul 20 01:13:18 2006
@@ -202,10 +202,10 @@
 		}
 		else {
 			if (is_object($this->mModule)) {
-				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mModule->get('name')));
 			}
 			else {
-				$this->mModule->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mDirname));
+				$this->mLog->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_INSTALLATION_MODULE_FAILURE, $this->mDirname));
 			}
 		}
 	}

From minahito ＠ users.sourceforge.jp  Thu Jul 20 01:43:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 01:43:58 +0900
Subject: [xoops-cvslog 3633] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060719164358.B299B2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.49 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.50
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.49	Thu Jul 20 01:02:45 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Thu Jul 20 01:43:58 2006
@@ -761,7 +761,7 @@
 			}
 		}
 		else {
-			$this->executeFoward(XOOPS_URL);
+			$this->executeForward(XOOPS_URL);
 		}
 	}
 	

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:10:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:10:20 +0900
Subject: [xoops-cvslog 3634] CVS update: xoops2jp/html/class
Message-ID: <20060720081020.0A5622AC041@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_LanguageManager.class.php
diff -u xoops2jp/html/class/XCube_LanguageManager.class.php:1.1.2.2 xoops2jp/html/class/XCube_LanguageManager.class.php:removed
--- xoops2jp/html/class/XCube_LanguageManager.class.php:1.1.2.2	Mon Nov 14 18:02:17 2005
+++ xoops2jp/html/class/XCube_LanguageManager.class.php	Thu Jul 20 17:10:19 2006
@@ -1,58 +0,0 @@
-<?php
-// $Id: XCube_LanguageManager.class.php,v 1.1.2.2 2005/11/14 09:02:17 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-class XCube_LanguageManager
-{
-	var $mLanguageName;
-
-	function XCube_LanguageManager($languageName)
-	{
-		$this->mLanguageName=$languageName;
-	}
-	
-	function loadMainLanguage()
-	{
-	}
-	
-	/**
-	 Load language for module controller.
-	 @param $dirname module directory name
-	 */
-	function loadModuleLanguage($dirname)
-	{
-	}
-
-	function loadModuleAdminLanguage($dirname)
-	{
-	}
-
-	function loadBlockLanguage($dirname)
-	{
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:10:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:10:58 +0900
Subject: [xoops-cvslog 3635] CVS update: xoops2jp/html/kernel
Message-ID: <20060720081058.19B052AC041@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.12 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.13
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.12	Tue Jul 11 19:05:26 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Thu Jul 20 17:10:57 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package XCube
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.13 2006/07/20 08:10:57 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -105,15 +109,14 @@
 
 		$this->_setupDB();
 
+        $this->_setupLanguage();
+
 		$this->_setupConfig();
 		
 		$this->_setupDebugger();
 
 		$this->_processPreBlockFilter();	// What's !?
 
-		$languageManager =& $this->_createLanguageManager();
-		$this->mRoot->setLanguageManager($languageManager);
-
 		$this->_processHostAbstractLayer();
 
 		$this->_setupSession();

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:11:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:11:48 +0900
Subject: [xoops-cvslog 3636] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060720081148.D67E62AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.50 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.51
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.50	Thu Jul 20 01:43:58 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Thu Jul 20 17:11:48 2006
@@ -59,6 +59,11 @@
 	 */
 	var $mLogout = null;
 	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mCreateLanguageManager = null;
+	
 	function Legacy_Controller()
 	{
 		//
@@ -75,6 +80,9 @@
 		
 		$this->mLogout =& new XCube_NewDelegate();
 		$this->mLogout->register("Site.Logout");
+		
+		$this->mCreateLanguageManager =& new XCube_NewDelegate();
+		$this->mCreateLanguageManager->register("Legacy_Controller.CreateLanguageManager");
 				
 		set_magic_quotes_runtime(0);	// ^^;
 		
@@ -127,8 +135,8 @@
 
 		$this->_processPreBlockFilter();	// What's !?
 
-		$languageManager =& $this->_createLanguageManager();
-		$this->mRoot->setLanguageManager($languageManager);
+		// $languageManager =& $this->_createLanguageManager();
+		// $this->mRoot->setLanguageManager($languageManager);
 
 		$this->_processHostAbstractLayer();
 
@@ -401,27 +409,88 @@
 	 */
 	function _setupLanguage()
 	{
-	    if (!$this->mLanguage) {
-            $configHandler =& xoops_gethandler('config');
-            $criteria =& new CriteriaCompo(new Criteria('conf_modid', 0));
-            $criteria->add(new Criteria('conf_catid', XOOPS_CONF));
-            $criteria->add(new Criteria('conf_name', 'language'));
-            $configs =& $configHandler->getConfigs($criteria);
-            if (count($configs)) {
-                $this->mLanguage = $configs[0]->getVar('conf_value', 'none');
-            }
+		require_once XOOPS_BASE_PATH."/kernel/Legacy_LanguageManager.class.php";
+		
+		$language = "english";
+		
+		$handler =& xoops_gethandler('config');
+		$criteria =& new CriteriaCompo(new Criteria('conf_modid', 0));
+		$criteria->add(new Criteria('conf_catid', XOOPS_CONF));
+		$criteria->add(new Criteria('conf_name', 'language'));
+		$configs =& $handler->getConfigs($criteria);
+		
+		if (count($configs) > 0) {
+			$language = $configs[0]->get('conf_value', 'none');
         }
 		
-		//
-		// Load the additional file to control DB.
-	    if ($this->mLanguage) {
-	        $filename = XOOPS_MODULE_PATH . '/base/language/' . $this->mLanguage . '/charset_' . XOOPS_DB_TYPE . '.php';
-	        if (file_exists($filename)) {
-	            require_once($filename);
-	        }
-	    }
+		$this->mRoot->mLanguageManager =& $this->_createLanguageManager($language);
+		$this->mRoot->mLanguageManager->setLanguage($language);
+		$this->mRoot->mLanguageManager->prepare();
+
+		$this->mRoot->mLanguageManager->loadGlobalMessageCatalog();
+		
+		// If you use special page, load message catalog for it.
+		if (isset($xoopsOption['pagetype'])) {
+			$this->mRoot->mLanguageManager->loadPageTypeMessageCatalog($xoopsOption['pagetype']);
+		}
     }
-	
+
+	/**
+	 * Factory for the language manager. At first, this member function
+	 * delegates to get a instance of LanguageManager. If it can't get it, do
+	 * the following process: 
+	 * 
+	 * 1) Try creating a instance of 'Legacy_LanguageManager_' . ucfirst($language)
+	 * 2) If the class doesn't exist, try loading  'LanguageManager.class.php' 
+	 *    in the specified language.
+	 * 3) Re-try creating the instance.
+	 * 
+	 * If it can't create any instances, create a instance of
+	 * Legacy_LanguageManager as default.
+	 * 
+	 * @access protected
+	 * @param string $language 
+	 * @return Legacy_LanguageManager
+	 */	
+	function &_createLanguageManager($language)
+	{
+		require_once XOOPS_BASE_PATH . "/kernel/Legacy_LanguageManager.class.php";
+
+		$languageManager = null;
+		
+		$this->mCreateLanguageManager->call(new XCube_Ref($languageManager), $language);
+		
+		if (!is_object($languageManager)) {
+			$className = "Legacy_LanguageManager_" . ucfirst(strtolower($language));
+			
+			//
+			// If the class exists, create a instance. Else, load the file, and
+			// try creating a instance again.
+			//
+			if (class_exists($className)) {
+				$languageManager =& new $className();
+			}
+			else {
+				$filePath = XOOPS_ROOT_PATH . "/language/" . $language . "/LanguageManager.class.php";
+				if (file_exists($filePath)) {
+					require_once $filePath;
+				}
+				
+				if (class_exists($className)) {
+					$languageManager =& new $className();
+				}
+				else {
+					//
+					// Default
+					//
+					$languageManager =& new Legacy_LanguageManager();
+				}
+			}
+		}
+		
+		return $languageManager;
+	}
+
 	function _setupConfig()
 	{
 		$configHandler=&xoops_gethandler('config');
@@ -504,22 +573,6 @@
 		session_start();
 	}
 
-	function &_createLanguageManager()
-	{
-		global $xoopsOption;
-
-		require_once XOOPS_BASE_PATH."/kernel/Legacy_LanguageManager.class.php";
-		
-		$languageManager =& new Legacy_LanguageManager($this->mConfig['language']);
-		$languageManager->loadMainLanguage();
-		
-		// If you use special page, load message catalog for it.
-		if (isset($xoopsOption['pagetype']))
-			$languageManager->loadSpecialTypeLanguage($xoopsOption['pagetype']);
-
-		return $languageManager;
-	}
-
 	/**
 	 * @deprecated
 	 */	
@@ -747,7 +800,7 @@
 					}
 				}
 				
-				$this->mRoot->mLanguageManager->loadModuleLanguage('base');
+				$this->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
 
 				$this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_BASE_MESSAGE_LOGIN_SUCCESS, $this->mXoopsUser->get('uname')));
 			}

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:13:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:13:54 +0900
Subject: [xoops-cvslog 3637] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060720081354.DBBDE2AC10E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.3 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.4
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.3	Wed Jul 19 20:00:59 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Thu Jul 20 17:13:54 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.3 2006/07/19 11:00:59 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.4 2006/07/20 08:13:54 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -127,7 +127,7 @@
 		}
 
 		$root =& XCube_Root::getSingleton();
-		$root->mLanguageManager->loadModuleLanguage('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
 
 		$userHandler =& xoops_gethandler('user');
 		

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:14:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:14:05 +0900
Subject: [xoops-cvslog 3638] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060720081405.66F2A2AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.7 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.8
--- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.7	Fri Jul 14 14:24:18 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php	Thu Jul 20 17:14:05 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: GroupPropertyAction.class.php,v 1.1.2.7 2006/07/14 05:24:18 minahito Exp $
+ * @version $Id: GroupPropertyAction.class.php,v 1.1.2.8 2006/07/20 08:14:05 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -33,8 +33,8 @@
 		}
 
 		$root =& XCube_Root::getSingleton();
-		$root->mLanguageManager->loadModuleAdminLanguage("system");
-		$root->mLanguageManager->loadManifestoLanguage("system");
+		$root->mLanguageManager->loadModuleAdminMessageCatalog("system");
+		$root->mLanguageManager->loadModinfoMessageCatalog("system");
 
 		//
 		// Get member list

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:14:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:14:13 +0900
Subject: [xoops-cvslog 3639] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060720081413.199CC2AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php
diff -u xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.4 xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php:1.1.2.4	Thu Jul 13 19:46:32 2006
+++ xoops2jp/html/modules/user/admin/actions/UserEditAction.class.php	Thu Jul 20 17:14:12 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserEditAction.class.php,v 1.1.2.4 2006/07/13 10:46:32 minahito Exp $
+ * @version $Id: UserEditAction.class.php,v 1.1.2.5 2006/07/20 08:14:12 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -76,7 +76,7 @@
 		// TODO Because abstract message catalog style is not decided, we load directly.
 		//
 		$root =& XCube_Root::getSingleton();
-		require_once XOOPS_ROOT_PATH . "/language/" . $root->mController->getConfig('language') . "/notification.php";
+		$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 		require_once XOOPS_ROOT_PATH . "/include/notification_constants.php";
 
 		$methodOptions = array(XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:14:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:14:28 +0900
Subject: [xoops-cvslog 3640] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060720081428.2977B2AC10F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.9 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.10
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.9	Wed Jul 19 19:20:33 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php	Thu Jul 20 17:14:28 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: EditUserAction.class.php,v 1.1.2.9 2006/07/19 10:20:33 minahito Exp $
+ * @version $Id: EditUserAction.class.php,v 1.1.2.10 2006/07/20 08:14:28 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -94,7 +94,7 @@
 		// TODO Because abstract message catalog style is not decided, we load directly.
 		//
 		$root =& XCube_Root::getSingleton();
-		require_once XOOPS_ROOT_PATH . "/language/" . $root->mController->getConfig('language') . "/notification.php";
+		$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 		require_once XOOPS_ROOT_PATH . "/include/notification_constants.php";
 
 		$methodOptions = array(XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:15:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:15:41 +0900
Subject: [xoops-cvslog 3641] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060720081541.1B5BD2AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.5 xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.6
--- xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php:1.1.2.5	Tue Mar 28 22:30:15 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_LanguageManager.class.php	Thu Jul 20 17:15:40 2006
@@ -1,88 +1,107 @@
 <?php
-// $Id: Legacy_LanguageManager.class.php,v 1.1.2.5 2006/03/28 13:30:15 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @package legacy
+ * @version $Id: Legacy_LanguageManager.class.php,v 1.1.2.6 2006/07/20 08:15:40 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_ROOT_PATH . "/class/XCube_LanguageManager.class.php";
+require_once XOOPS_ROOT_PATH . "/kernel/XCube_LanguageManager.class.php";
 
 class Legacy_LanguageManager extends XCube_LanguageManager
 {
-	var $mLanguageName;
+	function prepare()
+	{
+		parent::prepare();
+		
+		//
+		// Load the additional file to control DB.
+		//
+		$filename = XOOPS_MODULE_PATH . '/base/language/' . $this->mLanguageName . '/charset_' . XOOPS_DB_TYPE . '.php';
+		if (file_exists($filename)) {
+			require_once($filename);
+		}
+	}
 
-	function loadMainLanguage()
+	function loadGlobalMessageCatalog()
 	{
 		if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/base/language/" . $this->mLanguageName . "/global.php")) {
-			$this->_loadFile(XOOPS_ROOT_PATH."/modules/base/language/english/global.php");
+			$this->_loadFile(XOOPS_ROOT_PATH . "/modules/base/language/english/global.php");
 		}
 
+		//
 		// Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it.
+		//
 		if (!defined("XOOPS_USE_MULTIBYTES")) {
-			define("XOOPS_USE_MULTIBYTES",0);
+			define("XOOPS_USE_MULTIBYTES", 0);
 		}
 	}
 
-	function loadSpecialTypeLanguage($type)
+	/**
+	 * Load the special message catalog which is defined has been the XOOPS2
+	 * generation.
+	 * 
+	 * @access public
+	 * @param string $type
+	 */
+	function loadPageTypeMessageCatalog($type)
 	{
-		if (strpos($type,'.') === false) {
+		if (strpos($type, '.') === false) {
 			$filename = XOOPS_ROOT_PATH . "/language/" . $this->mLanguageName . "/" . $type . ".php";
 			if (!$this->_loadFile($filename)) {
-				$filename = XOOPS_ROOT_PATH . "/language/english/" . $type . ".php";
+				$filename = XOOPS_ROOT_PATH . "/language/" . $this->getFallbackLanguage() . "/" . $type . ".php";
 				$this->_loadFile($filename);
 			}
 		}
 	}
 
 	/**
-	 Load language for module controller.
-	 @param $dirname module directory name
+	 * Load the message catalog of the specified module.
+	 * 
+	 * @access public
+	 * @param $dirname A dirname of module.
 	 */
-	function loadModuleLanguage($dirname)
+	function loadModuleMessageCatalog($moduleName)
 	{
-		$this->_loadLanguage($dirname, "main");
+		$this->_loadLanguage($moduleName, "main");
 	}
-
-	function loadModuleAdminLanguage($dirname)
+	
+	/**
+	 * Load the message catalog of the specified module for admin.
+	 * 
+	 * @access public
+	 * @param $dirname A dirname of module.
+	 */
+	function loadModuleAdminMessageCatalog($dirname)
 	{
 		$this->_loadLanguage($dirname, "admin");
 	}
 
+	/**
+	 * Load the message catalog of the specified module for block.
+	 * 
+	 * @access public
+	 * @param $dirname A dirname of module.
+	 */
 	function loadBlockLanguage($dirname)
 	{
 		$this->_loadLanguage($dirname, "blocks");
 	}
 
-	function loadManifestoLanguage($dirname)
+	/**
+	 * Load the message catalog of the specified module for modinfo.
+	 * 
+	 * @access public
+	 * @param $dirname A dirname of module.
+	 */
+	function loadModinfoMessageCatalog($dirname)
 	{
 		$this->_loadLanguage($dirname, "modinfo");
 	}
 
 	/**
-	 * @access private
-	 * @param $dirname module directory name
+	 * @access protected
+	 * @param $dirname      module directory name
 	 * @param $fileBodyName language file body name
 	 */
 	function _loadLanguage($dirname, $fileBodyName)
@@ -96,7 +115,7 @@
 
 
 	/**
-	 * @access private
+	 * @access protected
 	 */
 	function _loadFile($filename)
 	{
@@ -111,6 +130,76 @@
 
 		return false;
 	}
+	
+	/**
+	 * check the exstence of the specified file in the specified section.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return bool
+	 */	
+	function existFile($section, $filename)
+	{
+		if ($section != null) {
+			$filePath = XOOPS_ROOT_PATH . "/languages/" . $this->mLanguageName . "/${section}/${filename}";
+		}
+		else {
+			$filePath = XOOPS_ROOT_PATH . "/languages/" . $this->mLanguageName . "/${filename}";
+		}
+		
+		return file_exists($filePath);
+	}
+	
+	/**
+	 * Return the file path by the specified section and the specified file.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return string
+	 */	
+	function getFilepath($section, $filename)
+	{
+		$filepath = null;
+		if ($section != null) {
+			$filepath = XOOPS_ROOT_PATH . "/languages/" . $this->mLanguageName . "/${section}/${filename}";
+		}
+		else {
+			$filepath = XOOPS_ROOT_PATH . "/languages/" . $this->mLanguageName . "/${filename}";
+		}
+		
+		if (file_exists($filepath)) {
+			return $filepath;
+		}
+		else {
+			if ($section != null) {
+				return XOOPS_ROOT_PATH . "/languages/" . $this->getFallbackLanguage() . "/${section}/${filename}";
+			}
+			else {
+				return XOOPS_ROOT_PATH . "/languages/" . $this->getFallbackLanguage() . "/${filename}";
+			}
+		}
+	}
+
+	/**
+	 * Get file contents and return it.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return string
+	 */	
+	function loadTextFile($section, $filename)
+	{
+		$filepath = $this->getFilepath($section, $filename);
+		return file_get_contents($filepath);
+	}
+	
+	function getFallbackLanguage()
+	{
+		return "english";
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:16:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:16:36 +0900
Subject: [xoops-cvslog 3642] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060720081636.2EEEA2AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/commentstatus.php
diff -u xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.1 xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.2
--- xoops2jp/html/modules/base/class/commentstatus.php:1.1.2.1	Thu Mar 30 12:54:17 2006
+++ xoops2jp/html/modules/base/class/commentstatus.php	Thu Jul 20 17:16:36 2006
@@ -22,7 +22,7 @@
 	{
 		$root =& XCube_Root::getSingleton();
 		$language = $root->mController->getConfig('language');
-		include_once XOOPS_ROOT_PATH . '/language/' . $language . '/comment.php';
+		$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
 
 		$this->_mResults[XOOPS_COMMENT_PENDING] =& $this->create();
 		$this->_mResults[XOOPS_COMMENT_PENDING]->setVar('id', XOOPS_COMMENT_PENDING);

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:16:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:16:45 +0900
Subject: [xoops-cvslog 3643] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20060720081645.6D40D2AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/blocks/legacy_notification.php
diff -u xoops2jp/html/modules/base/blocks/legacy_notification.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_notification.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_notification.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_notification.php	Thu Jul 20 17:16:45 2006
@@ -3,7 +3,10 @@
 {
     global $xoopsConfig, $xoopsUser, $xoopsModule;
     include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-    include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/notification.php';
+	
+	$root =& XCube_Root::getSingleton();
+	$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
+	
     // Notification must be enabled, and user must be logged in
     if (empty($xoopsUser) || !notificationEnabled('block')) {
         return false; // do not display block

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:17:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:17:02 +0900
Subject: [xoops-cvslog 3644] CVS update: xoops2jp/html/include
Message-ID: <20060720081702.31D462AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/calendarjs.php
diff -u xoops2jp/html/include/calendarjs.php:1.1.8.1 xoops2jp/html/include/calendarjs.php:1.1.8.2
--- xoops2jp/html/include/calendarjs.php:1.1.8.1	Wed Oct 19 02:19:03 2005
+++ xoops2jp/html/include/calendarjs.php	Thu Jul 20 17:17:02 2006
@@ -2,7 +2,10 @@
 if (!defined('XOOPS_ROOT_PATH')) {
     exit();
 }
-include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
+
+$root =& XCube_Root::getSingleton();
+$root->mLanguageManager->loadPageTypeMessageCatalog('calendar');
+
 ?>
 <link rel="stylesheet" type="text/css" media="all" href="<?php echo XOOPS_URL;?>/include/calendar-blue.css" />
 <script type="text/javascript" src="<?php echo XOOPS_URL.'/include/calendar.js';?>"></script>

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:17:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:17:15 +0900
Subject: [xoops-cvslog 3645] CVS update: xoops2jp/html/include
Message-ID: <20060720081715.8888C2AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_delete.php
diff -u xoops2jp/html/include/comment_delete.php:1.2.8.1 xoops2jp/html/include/comment_delete.php:1.2.8.2
--- xoops2jp/html/include/comment_delete.php:1.2.8.1	Wed Oct 19 02:19:03 2005
+++ xoops2jp/html/include/comment_delete.php	Thu Jul 20 17:17:15 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_delete.php,v 1.2.8.1 2005/10/18 17:19:03 minahito Exp $
+// $Id: comment_delete.php,v 1.2.8.2 2006/07/20 08:17:15 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -105,7 +105,8 @@
     exit();
 }
 
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+$root =& XCube_Root::getSingleton();
+$root->mLanguageManager->loadPageTypeMessageCatalog('comment');	///< Is this must?
 
 switch ($op) {
 case 'delete_one':

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:17:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:17:38 +0900
Subject: [xoops-cvslog 3646] CVS update: xoops2jp/html/include
Message-ID: <20060720081738.7706D2AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_edit.php
diff -u xoops2jp/html/include/comment_edit.php:1.2.8.1 xoops2jp/html/include/comment_edit.php:1.2.8.2
--- xoops2jp/html/include/comment_edit.php:1.2.8.1	Tue Jan 24 23:20:39 2006
+++ xoops2jp/html/include/comment_edit.php	Thu Jul 20 17:17:38 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_edit.php,v 1.2.8.1 2006/01/24 14:20:39 minahito Exp $
+// $Id: comment_edit.php,v 1.2.8.2 2006/07/20 08:17:38 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -46,13 +46,14 @@
 $root =& XCube_Root::getSingleton();
 
 $langManager =& $root->getLanguageManager();
-$langManager->loadModuleLanguage("base");
+$langManager->loadModuleMessageCatalog("base");
 
 if ('system' != $xoopsModule->getVar('dirname') && XOOPS_COMMENT_APPROVENONE == $xoopsModuleConfig['com_rule']) {
 	exit();
 }
 
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
+
 $com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
 $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';
 if ($com_mode == '') {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:17:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:17:46 +0900
Subject: [xoops-cvslog 3647] CVS update: xoops2jp/html/include
Message-ID: <20060720081746.22AA02AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_new.php
diff -u xoops2jp/html/include/comment_new.php:1.2.8.2 xoops2jp/html/include/comment_new.php:1.2.8.3
--- xoops2jp/html/include/comment_new.php:1.2.8.2	Tue Jan 24 23:21:10 2006
+++ xoops2jp/html/include/comment_new.php	Thu Jul 20 17:17:45 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_new.php,v 1.2.8.2 2006/01/24 14:21:10 minahito Exp $
+// $Id: comment_new.php,v 1.2.8.3 2006/07/20 08:17:45 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -43,8 +43,7 @@
 //
 $root =& XCube_Root::getSingleton();
 
-$langManager =& $root->getLanguageManager();
-$langManager->loadModuleLanguage("base");
+$root->mLanguageManager->loadModuleMessageCatalog("base");
 
 
 require_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
@@ -52,7 +51,8 @@
 	exit();
 }
 
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+$root->mLanguageManager->loadPageTypeMessageCatalog('comment');	///< Is this must?
+
 $com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
 
 if ($com_itemid > 0) {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:17:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:17:59 +0900
Subject: [xoops-cvslog 3648] CVS update: xoops2jp/html/include
Message-ID: <20060720081759.2BED92AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_post.php
diff -u xoops2jp/html/include/comment_post.php:1.2.8.2 xoops2jp/html/include/comment_post.php:1.2.8.3
--- xoops2jp/html/include/comment_post.php:1.2.8.2	Mon Feb 20 19:52:44 2006
+++ xoops2jp/html/include/comment_post.php	Thu Jul 20 17:17:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_post.php,v 1.2.8.2 2006/02/20 10:52:44 minahito Exp $
+// $Id: comment_post.php,v 1.2.8.3 2006/07/20 08:17:59 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -32,9 +32,15 @@
 if (!defined('XOOPS_ROOT_PATH') || !is_object($xoopsModule)) {
     exit();
 }
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+
+$root =& XCube_Root::getSingleton();
+$root->mLanguageManager->loadPageTypeMessageCatalog("comment");	///< @todo Is this must?
+
 include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
 
+//
+// @TODO We have to remove the next line!
+//
 require_once XOOPS_ROOT_PATH . "/modules/system/constants.php";
 
 $com_id = isset($_POST['com_id']) ? intval($_POST['com_id']) : 0;

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:07 +0900
Subject: [xoops-cvslog 3649] CVS update: xoops2jp/html/include
Message-ID: <20060720081807.71A112AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2.8.2 xoops2jp/html/include/comment_reply.php:1.2.8.3
--- xoops2jp/html/include/comment_reply.php:1.2.8.2	Tue Jan 24 23:21:10 2006
+++ xoops2jp/html/include/comment_reply.php	Thu Jul 20 17:18:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2.8.2 2006/01/24 14:21:10 minahito Exp $
+// $Id: comment_reply.php,v 1.2.8.3 2006/07/20 08:18:07 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -45,10 +45,9 @@
 //
 $root =& XCube_Root::getSingleton();
 
-$langManager =& $root->getLanguageManager();
-$langManager->loadModuleLanguage("base");
+$root->mLanguageManager->loadModuleMessageCatalog("base");
+$root->mLanguageManager->loadPageTypeMessageCatalog("comment");	///< @todo Is this must?
 
-require_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
 
 $com_id = isset($_GET['com_id']) ? intval($_GET['com_id']) : 0;
 $com_mode = isset($_GET['com_mode']) ? htmlspecialchars(trim($_GET['com_mode']), ENT_QUOTES) : '';

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:16 +0900
Subject: [xoops-cvslog 3650] CVS update: xoops2jp/html/include
Message-ID: <20060720081816.7D8BA2AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_view.php
diff -u xoops2jp/html/include/comment_view.php:1.2.8.3 xoops2jp/html/include/comment_view.php:1.2.8.4
--- xoops2jp/html/include/comment_view.php:1.2.8.3	Tue Feb 21 20:37:49 2006
+++ xoops2jp/html/include/comment_view.php	Thu Jul 20 17:18:16 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_view.php,v 1.2.8.3 2006/02/21 11:37:49 minahito Exp $
+// $Id: comment_view.php,v 1.2.8.4 2006/07/20 08:18:16 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -45,7 +45,8 @@
 	$groups = ( $xoopsUser ) ? $xoopsUser -> getGroups() : XOOPS_GROUP_ANONYMOUS;
 	$xoopsTpl->assign( 'xoops_iscommentadmin', $gperm_handler->checkRight( 'system_admin', XOOPS_SYSTEM_COMMENT, $groups) );
 
- 	require_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/comment.php';
+	$root =& XCube_Root::getSingleton();
+	$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
 	$comment_config = $xoopsModule->getInfo('comments');
 	$com_itemid = (trim($comment_config['itemName']) != '' && isset($_GET[$comment_config['itemName']])) ? intval($_GET[$comment_config['itemName']]) : 0;
 

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:22 +0900
Subject: [xoops-cvslog 3651] CVS update: xoops2jp/html/include
Message-ID: <20060720081822.A6B4C2AC041@users.sourceforge.jp>

Index: xoops2jp/html/include/notification_select.php
diff -u xoops2jp/html/include/notification_select.php:1.2.8.1 xoops2jp/html/include/notification_select.php:1.2.8.2
--- xoops2jp/html/include/notification_select.php:1.2.8.1	Tue Nov 15 01:50:21 2005
+++ xoops2jp/html/include/notification_select.php	Thu Jul 20 17:18:22 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification_select.php,v 1.2.8.1 2005/11/14 16:50:21 minahito Exp $
+// $Id: notification_select.php,v 1.2.8.2 2006/07/20 08:18:22 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,7 +33,8 @@
 $xoops_notification = array();
 $xoops_notification['show'] = isset($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
 if ($xoops_notification['show']) {
-	include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
+	$root =& XCube_Root::getSignleton();
+	$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 	$categories =& notificationSubscribableCategoryInfo();
 	$event_count = 0;
 	if (!empty($categories)) {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:31 +0900
Subject: [xoops-cvslog 3652] CVS update: xoops2jp/html/kernel
Message-ID: <20060720081831.3592C2AC041@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.8 xoops2jp/html/kernel/block.php:1.2.8.9
--- xoops2jp/html/kernel/block.php:1.2.8.8	Sat Jul  1 13:17:28 2006
+++ xoops2jp/html/kernel/block.php	Thu Jul 20 17:18:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.8 2006/07/01 04:17:28 minahito Exp $
+// $Id: block.php,v 1.2.8.9 2006/07/20 08:18:31 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -171,8 +171,7 @@
             // must get lang files b4 execution of the function
             if ( file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')) ) {
                 $root=&XCube_Root::getSingleton();
-                $languageManager=$root->getLanguageManager();
-                $languageManager->loadBlockLanguage($this->getVar('dirname'));
+                $root->mLanguageManager->loadBlockLanguage($this->getVar('dirname'));
 
                 require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
                 $options = explode('|', $this->getVar('options'));
@@ -246,11 +245,9 @@
                 return false;
             }
             if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'))) {
-                if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php')) {
-                    include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php';
-                } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php')) {
-                    include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/language/english/blocks.php';
-                }
+				$root =& XCube_Root::getSingleton();
+				$root->mLanguageManager->loadBlockMessageCatalog($this->getVar('dirname'));
+				
                 include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
                 $options = explode('|', $this->getVar('options'));
                 $edit_form = $edit_func($options);

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:39 +0900
Subject: [xoops-cvslog 3653] CVS update: xoops2jp/html/kernel
Message-ID: <20060720081839.A56082AC029@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.12 xoops2jp/html/kernel/module.php:1.2.8.13
--- xoops2jp/html/kernel/module.php:1.2.8.12	Sun Jul 16 15:41:33 2006
+++ xoops2jp/html/kernel/module.php	Thu Jul 20 17:18:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.12 2006/07/16 06:41:33 minahito Exp $
+// $Id: module.php,v 1.2.8.13 2006/07/20 08:18:39 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -197,11 +197,9 @@
 			return;
 		}
 		
-        if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
-            include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/'.$xoopsConfig['language'].'/modinfo.php';
-        } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/english/modinfo.php')) {
-            include_once XOOPS_ROOT_PATH.'/modules/'.$dirname.'/language/english/modinfo.php';
-        }
+		$root =& XCube_Root::getSingleton();
+		$root->mLanguageManager->loadModinfoMessageCatalog($dirname);
+		
         if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php')) {
             include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/xoops_version.php';
         } else {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:46 +0900
Subject: [xoops-cvslog 3654] CVS update: xoops2jp/html/kernel
Message-ID: <20060720081846.0978F2AC029@users.sourceforge.jp>

Index: xoops2jp/html/kernel/timezone.php
diff -u xoops2jp/html/kernel/timezone.php:1.1.2.1 xoops2jp/html/kernel/timezone.php:1.1.2.2
--- xoops2jp/html/kernel/timezone.php:1.1.2.1	Sun Jan  8 17:02:33 2006
+++ xoops2jp/html/kernel/timezone.php	Thu Jul 20 17:18:45 2006
@@ -22,7 +22,7 @@
 		//
 		// Because abstract language style is not decided, we load directly. But we must fix.
 		//
-		require_once XOOPS_ROOT_PATH . '/language/' . $root->mController->mConfig['language'] . '/timezone.php';
+		$root->mLanguageManager->loadPageTypeMessageCatalog('timezone');
 
 		//
 		// This handler not connects to database.

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:18:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:18:55 +0900
Subject: [xoops-cvslog 3655] CVS update: xoops2jp/html/kernel
Message-ID: <20060720081855.4AD942AC10B@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_LanguageManager.class.php
diff -u /dev/null xoops2jp/html/kernel/XCube_LanguageManager.class.php:1.1.2.1
--- /dev/null	Thu Jul 20 17:18:55 2006
+++ xoops2jp/html/kernel/XCube_LanguageManager.class.php	Thu Jul 20 17:18:55 2006
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package XCube
+ * @version $Id: XCube_LanguageManager.class.php,v 1.1.2.1 2006/07/20 08:18:55 minahito Exp $
+ */
+
+/**
+ * This class manages resources of each languages. By requests of other
+ * components, this class loads files, or checks the existence of the specified
+ * resource, or composes filepath to access real files. And, it manages some
+ * locale informations.
+ * 
+ * Rules about language are different at each bases. So it's important that a 
+ * base defines the sub class of this class if it can't use this class directly.
+ * 
+ * And, XCube or bases have to make each languages possible to have its sub
+ * class. By that, languages become able to implement their logic to solve
+ * problems.
+ * 
+ * This class calls sub directories of each languages 'section'. 'section' is
+ * used to load image files and etc.
+ */
+class XCube_LanguageManager
+{
+	/**
+	 * @access protected
+	 * @var string
+	 */
+	var $mLanguageName;
+	
+	/**
+	 * @access protected
+	 * @var string
+	 */
+	var $mLocalName;
+	
+	function XCube_LanguageManager()
+	{
+		$this->mLanguageName = $this->getFallbackLanguage();
+		$this->mLocalName = $this->getFallbackLocale();
+	}
+
+	/**
+	 * Normally, this member function is called soon, after constructor.
+	 * To follow the base, initialize.
+	 */	
+	function prepare()
+	{
+	}
+	
+	/**
+	 * Set locale name.
+	 * 
+	 * @param string $local locale name
+	 */
+	function setLocale($locale)
+	{
+		$this->mLanguageName = $locale;
+	}
+	
+	/**
+	 * Set language name.
+	 * 
+	 * @param string $language language name
+	 */
+	function setLanguage($language)
+	{
+		$this->mLanguageName = $language;
+	}
+	
+	/**
+	 * Load the global message catalog which is defined in the base module.
+	 */
+	function loadGlobalMessageCatalog()
+	{
+	}
+	
+	/**
+	 * Load the module message catalog which is defined in the specified
+	 * module.
+	 * 
+	 * @param string $moduleName A name of module.
+	 */
+	function loadModuleMessageCatalog($moduleName)
+	{
+	}
+	
+	/**
+	 * Load the theme message catalog which is defined in the specified module.
+	 * 
+	 * @param string $themeName A name of theme.
+	 */
+	function loadThemeMessageCatalog($themeName)
+	{
+	}
+	
+	/**
+	 * check the exstence of the specified file in the specified section.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return bool
+	 */	
+	function existFile($section, $filename)
+	{
+	}
+	
+	/**
+	 * Return the file path by the specified section and the specified file.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return string
+	 */	
+	function getFilepath($section, $filename)
+	{
+	}
+
+	/**
+	 * Get file contents and return it.
+	 * 
+	 * @access public
+	 * @param string $section  A name of section.
+	 * @param string $filename A name of file
+	 * @return string
+	 */	
+	function loadTextFile($section, $filename)
+	{
+	}
+
+	/**
+	 * Return translated message.
+	 * 
+	 * @param  string $word
+	 * @return string
+	 * 
+	 * @note This member function is test.
+	 */	
+	function translate($word)
+	{
+		return $word;
+	}
+
+	/**
+	 * Return default language name.
+	 * 
+	 * @access protected
+	 * @return string
+	 */
+	function getFallbackLanguage()
+	{
+		return "eng";
+	}
+
+	/**
+	 * Return default locale name.
+	 * 
+	 * @access protected
+	 * @return string
+	 */
+	function getFallbackLocale()
+	{
+		return "EG";
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:19:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:19:34 +0900
Subject: [xoops-cvslog 3656] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060720081934.B5B0A2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/ImageListAction.class.php
diff -u xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/actions/ImageListAction.class.php:1.1.2.2	Tue May 30 12:54:54 2006
+++ xoops2jp/html/modules/base/actions/ImageListAction.class.php	Thu Jul 20 17:19:34 2006
@@ -15,7 +15,7 @@
 		$controller->setDialogMode(true);
 		
 		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleLanguage('base');
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
 	}
 	
 	function &_getHandler()
Index: xoops2jp/html/modules/base/actions/SearchResultsAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.3	Mon May 29 13:52:12 2006
+++ xoops2jp/html/modules/base/actions/SearchResultsAction.class.php	Thu Jul 20 17:19:34 2006
@@ -15,7 +15,7 @@
 	function prepare(&$controller, &$xoopsUser)
 	{
 		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleLanguage('base');
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
 		
 		$handler =& xoops_gethandler('config');
 		$this->mConfig =& $handler->getConfigsByCat(XOOPS_CONF_SEARCH);
Index: xoops2jp/html/modules/base/actions/ImageUploadAction.class.php
diff -u xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/actions/ImageUploadAction.class.php:1.1.2.2	Tue May 30 12:54:54 2006
+++ xoops2jp/html/modules/base/actions/ImageUploadAction.class.php	Thu Jul 20 17:19:34 2006
@@ -15,7 +15,7 @@
 		$controller->setDialogMode(true);
 		
 		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleLanguage('base');
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
 	}
 	
 	function &_getHandler()

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:19:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:19:49 +0900
Subject: [xoops-cvslog 3657] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060720081949.9ACBE2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SslloginAction.class.php
diff -u xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.2	Tue Mar 28 22:28:25 2006
+++ xoops2jp/html/modules/base/actions/SslloginAction.class.php	Thu Jul 20 17:19:49 2006
@@ -18,7 +18,7 @@
 		// Because this action's template uses USER message catalog, load it.
 		//
 		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleLanguage('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
 
 		$render->setTemplateName("legacy_misc_ssllogin.html");
 		$render->setAttribute("message", @sprintf(_US_LOGGINGU, $xoopsUser->getVar('uname')));
Index: xoops2jp/html/modules/base/actions/SmiliesAction.class.php
diff -u xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.3	Tue Mar 28 22:28:25 2006
+++ xoops2jp/html/modules/base/actions/SmiliesAction.class.php	Thu Jul 20 17:19:49 2006
@@ -42,7 +42,7 @@
 		// Because this action's template uses BASE message catalog, load it.
 		//
 		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleLanguage('base');
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
 		
 		$render->setTemplateName("legacy_misc_smilies.html");
 		$render->setAttribute("objects", $this->mObjects);

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:20:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:20:10 +0900
Subject: [xoops-cvslog 3658] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060720082010.839772AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.7	Mon Jun  5 00:29:15 2006
+++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php	Thu Jul 20 17:20:10 2006
@@ -201,7 +201,7 @@
 		// Load constants
 		//
 		$root =& XCube_Root::getSingleton();
-		$root->mLanguageManager->loadManifestoLanguage($this->_mMaster->mModule->get('dirname'));
+		$root->mLanguageManager->loadModinfoMessageCatalog($this->_mMaster->mModule->get('dirname'));
 		
 		$this->_mMaster->mPreparedFlag = true;
 	}

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:20:22 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:20:22 +0900
Subject: [xoops-cvslog 3659] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060720082022.56FB02AC10C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.15 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.16
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.15	Thu Jun 22 14:55:36 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php	Thu Jul 20 17:20:22 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.15 2006/06/22 05:55:36 minahito Exp $
+// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.16 2006/07/20 08:20:22 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -164,9 +164,9 @@
 	
 	function setupLanguage()
 	{
-		$languageManager=&$this->mController->mRoot->getLanguageManager();
-		$languageManager->loadModuleAdminLanguage($this->mModuleObject->getVar('dirname'));
-		$languageManager->loadManifestoLanguage($this->mModuleObject->getVar('dirname'));
+		$languageManager =& $this->mController->mRoot->getLanguageManager();
+		$languageManager->loadModuleAdminMessageCatalog($this->mModuleObject->getVar('dirname'));
+		$languageManager->loadModinfoMessageCatalog($this->mModuleObject->getVar('dirname'));
 	}
 	
 	function _processErrorModuleNotExist()

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:20:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:20:42 +0900
Subject: [xoops-cvslog 3660] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060720082042.26F702AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.9
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.8	Mon Jun 12 12:55:14 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Thu Jul 20 17:20:42 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: HelpAction.class.php,v 1.1.2.8 2006/06/12 03:55:14 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.9 2006/07/20 08:20:42 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -93,6 +93,20 @@
 	 */
 	var $_mDirname = null;
 	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mCreateHelpSmarty = null;
+	
+	function Legacy_HelpAction($flag)
+	{
+		parent::Legacy_Action($flag);
+		
+		$this->mCreateHelpSmarty =& new XCube_NewDelegate();
+		$this->mCreateHelpSmarty->add(array(&$this, '_createHelpSmarty'));
+		$this->mCreateHelpSmarty->register('Legacy_HelpAction.CreateHelpSmarty');
+	}
+	
 	function hasPerm(&$controller, &$xoopsUser)
 	{
 		$this->_mDirname = xoops_getrequest('dirname');
@@ -120,7 +134,8 @@
 		//
 		// Smarty
 		//
-		$smarty =& new Legacy_HelpSmarty();
+		$smarty = null;
+		$this->mCreateHelpSmarty->call(new XCube_Ref($smarty));
 		$smarty->setDirname($this->_mDirname);
 
 		//
@@ -141,6 +156,13 @@
 		return LEGACY_FRAME_VIEW_SUCCESS;
 	}
 
+	function _createHelpSmarty(&$smarty)
+	{
+		if (!is_object($smarty)) {
+			$smarty = new Legacy_HelpSmarty();
+		}
+	}
+	
 	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
 	{
 		$renderer->setTemplateName("help.html");

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:20:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:20:54 +0900
Subject: [xoops-cvslog 3661] CVS update: xoops2jp/html/class
Message-ID: <20060720082054.5B9CA2AC029@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopslists.php
diff -u xoops2jp/html/class/xoopslists.php:1.2.8.3 xoops2jp/html/class/xoopslists.php:1.2.8.4
--- xoops2jp/html/class/xoopslists.php:1.2.8.3	Tue May 16 22:25:06 2006
+++ xoops2jp/html/class/xoopslists.php	Thu Jul 20 17:20:54 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopslists.php,v 1.2.8.3 2006/05/16 13:25:06 nobunobu Exp $
+// $Id: xoopslists.php,v 1.2.8.4 2006/07/20 08:20:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -36,7 +36,8 @@
     {
         function &getTimeZoneList()
         {
-            include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/timezone.php';
+			$root =& XCube_Root::getSingleton();
+			$root->mLanguageManager->loadPageTypeMessageCatalog('timezone');
             $time_zone_list = array ("-12" => _TZ_GMTM12, "-11" => _TZ_GMTM11, "-10" => _TZ_GMTM10, "-9" => _TZ_GMTM9, "-8" => _TZ_GMTM8, "-7" => _TZ_GMTM7, "-6" => _TZ_GMTM6, "-5" => _TZ_GMTM5, "-4" => _TZ_GMTM4, "-3.5" => _TZ_GMTM35, "-3" => _TZ_GMTM3, "-2" => _TZ_GMTM2, "-1" => _TZ_GMTM1, "0" => _TZ_GMT0, "1" => _TZ_GMTP1, "2" => _TZ_GMTP2, "3" => _TZ_GMTP3, "3.5" => _TZ_GMTP35, "4" => _TZ_GMTP4, "4.5" => _TZ_GMTP45, "5" => _TZ_GMTP5, "5.5" => _TZ_GMTP55, "6" => _TZ_GMTP6, "7" => _TZ_GMTP7, "8" => _TZ_GMTP8, "9" => _TZ_GMTP9, "9.5" => _TZ_GMTP95, "10" => _TZ_GMTP10, "11" => _TZ_GMTP11, "12" => _TZ_GMTP12);
             return $time_zone_list;
         }

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:21:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:21:00 +0900
Subject: [xoops-cvslog 3662] CVS update: xoops2jp/html/class
Message-ID: <20060720082100.2C6432AC029@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopscomments.php
diff -u xoops2jp/html/class/xoopscomments.php:1.2.8.1 xoops2jp/html/class/xoopscomments.php:1.2.8.2
--- xoops2jp/html/class/xoopscomments.php:1.2.8.1	Wed Oct 19 02:16:40 2005
+++ xoops2jp/html/class/xoopscomments.php	Thu Jul 20 17:21:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopscomments.php,v 1.2.8.1 2005/10/18 17:16:40 minahito Exp $
+// $Id: xoopscomments.php,v 1.2.8.2 2006/07/20 08:21:00 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,7 +33,9 @@
 }
 include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
 require_once XOOPS_ROOT_PATH.'/class/xoopsobject.php';
-include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/comment.php';
+
+$root =& XCube_Root::getSingleton();
+$root->mLanguageManager->loadPageTypeMessageCatalog('comment');
 
 class XoopsComments extends XoopsObject
 {

From minahito ＠ users.sourceforge.jp  Thu Jul 20 17:21:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 20 Jul 2006 17:21:32 +0900
Subject: [xoops-cvslog 3663] CVS update: xoops2jp/html
Message-ID: <20060720082132.85C802AC029@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Tue Jul 25 18:07:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 18:07:54 +0900
Subject: [xoops-cvslog 3664] CVS update: xoops2jp/html/include
Message-ID: <20060725090754.7B51C2AC060@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.2.8.4 xoops2jp/html/include/checklogin.php:1.2.8.5
--- xoops2jp/html/include/checklogin.php:1.2.8.4	Mon Nov 14 18:03:28 2005
+++ xoops2jp/html/include/checklogin.php	Tue Jul 25 18:07:54 2006
@@ -3,7 +3,7 @@
  @package base
  @deprecated
  */
-// $Id: checklogin.php,v 1.2.8.4 2005/11/14 09:03:28 minahito Exp $
+// $Id: checklogin.php,v 1.2.8.5 2006/07/25 09:07:54 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
@@ -29,15 +29,10 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-if (!defined('XOOPS_ROOT_PATH'))
-    exit();
+if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_ROOT_PATH."/class/XCube_EventArgs.class.php";
-
-$root=&XCube_Root::getSingleton();
-$checkLoginEventArgs = new CheckLoginEventArgs();
-
-$root->mEventManager->raiseEvent("Site.CheckLogin",$root->mController,$checkLoginEventArgs);
+$root =& XCube_Root::getSingleton();
+$root->mController->checkLogin();
 
 //
 // ToDo Add after care!

From minahito ＠ users.sourceforge.jp  Tue Jul 25 19:03:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 19:03:16 +0900
Subject: [xoops-cvslog 3665] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060725100316.C8F2B2AC124@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.9
--- xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php:1.1.2.8	Thu Jul 20 17:20:10 2006
+++ xoops2jp/html/modules/base/admin/actions/PreferenceEditAction.class.php	Tue Jul 25 19:03:15 2006
@@ -16,6 +16,9 @@
 
 	function prepare(&$controller, &$xoopsUser)
 	{
+		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('comment');
+		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('notification');
+
 		$state = (xoops_getrequest('confmod_id') > 0) ? new Legacy_ModulePreferenceEditState($this) : new Legacy_PreferenceEditState($this);
 		$state->prepare($controller, $xoopsUser);
 		
@@ -171,6 +174,8 @@
 {
 	function prepare(&$controller, &$xoopsUser)
 	{
+		parent::prepare($controller, $xoopsUser);
+		
 		$handler =& xoops_gethandler('configcategory');
 		$this->_mMaster->mCategory =& $handler->get(intval(xoops_getrequest('confcat_id')));
 		
@@ -188,6 +193,8 @@
 {
 	function prepare(&$controller, &$xoopsUser)
 	{
+		parent::prepare($controller, $xoopsUser);
+		
 		$handler =& xoops_gethandler('module');
 		$this->_mMaster->mModule =& $handler->get(intval(xoops_getrequest('confmod_id')));
 

From minahito ＠ users.sourceforge.jp  Tue Jul 25 19:08:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 19:08:42 +0900
Subject: [xoops-cvslog 3666] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060725100842.C67112AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php:1.1.2.7	Sat Jul  1 16:24:17 2006
+++ xoops2jp/html/modules/base/admin/class/AbstractModuleInstaller.class.php	Tue Jul 25 19:08:42 2006
@@ -33,6 +33,15 @@
 	{
 		$this->mDirname = $dirname;
 		$this->mLog =& new Legacy_ModuleUtilsSimpleLog();
+		
+		//
+		// Load message catalog for the required module installer of 'common'
+		// process.
+		//
+		$root =& XCube_Root::getSingleton();
+		if (is_object($root->mLanguageManager)) {
+			$root->mLanguageManager->loadModuleAdminMessageCatalog('base');
+		}
 	}
 	
 	/**
@@ -73,6 +82,12 @@
 			$this->_processReport();
 			return false;
 		}
+		
+		$this->_installNotification();
+		if (!$this->mForceMode && $this->mLog->hasError()) {
+			$this->_processReport();
+			return false;
+		}
 
 		$this->_installPreference();
 		if (!$this->mForceMode && $this->mLog->hasError()) {
@@ -131,6 +146,16 @@
 	}
 	
 	/**
+	 * Install or uninstall notifications, this member function is called by
+	 * own execute().
+	 * 
+	 * @access protected
+	 */
+	function _installNotification()
+	{
+	}
+	
+	/**
 	 * Install or uninstall blocks and their preference, this function is called by own execute().
 	 */
 	function _installPreference()

From minahito ＠ users.sourceforge.jp  Tue Jul 25 19:10:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 19:10:44 +0900
Subject: [xoops-cvslog 3667] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060725101044.5B6F42AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.14 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.15
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.14	Thu Jul 20 01:13:18 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Tue Jul 25 19:10:44 2006
@@ -176,6 +176,10 @@
         }
     }
 
+	function _installNotification()
+	{
+	}
+	
     function _installPreference()
     {
         Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);

From minahito ＠ users.sourceforge.jp  Tue Jul 25 19:15:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 19:15:56 +0900
Subject: [xoops-cvslog 3668] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060725101556.DD8F22AC041@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.18 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.19
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.18	Sat Jul  1 16:25:12 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Tue Jul 25 19:15:56 2006
@@ -44,8 +44,8 @@
 }
 
 /**
- * This provides static methods for the module installation. Methods of this class 
- * may move to base class of installers. 
+ * This provides static methods for the module installation. Methods of this
+ * class may move to base class of installers. 
  */
 class Legacy_ModuleUtils
 {
@@ -405,9 +405,59 @@
 			                   );
 		}
 
-		// TODO comment
-		
-		// TODO notification
+		//
+		// Insert comment config by old style.
+		//
+		if ($this->mModule->get('hasnotification') != 0) {
+			require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+			require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			
+			$t_options = array();
+			$t_options['_NOT_CONFIG_DISABLE'] = XOOPS_NOTIFICATION_DISABLE;
+			$t_options['_NOT_CONFIG_ENABLEBLOCK'] = XOOPS_NOTIFICATION_ENABLEBLOCK;
+			$t_options['_NOT_CONFIG_ENABLEINLINE'] = XOOPS_NOTIFICATION_ENABLEINLINE;
+			$t_options['_NOT_CONFIG_ENABLEBOTH'] = XOOPS_NOTIFICATION_ENABLEBOTH;
+			
+			$configInfos[] = array(
+				'name' => 'notification_enabled',
+				'title' => '_NOT_CONFIG_ENABLE',
+				'description' => '_NOT_CONFIG_ENABLEDSC',
+				'formtype' => 'select',
+				'valuetype' => 'int',
+				'default' => XOOPS_NOTIFICATION_ENABLEBOTH,
+				'options' => $t_options
+			);
+			
+			//
+			// FIXME: doesn't work when update module... can't read back the
+			//        array of options properly...  " changing to &quot;
+			//
+			
+			unset ($t_options);
+			
+			$t_options = array();
+			$t_categoryArr =& notificationCategoryInfo('', $this->mModule->get('mid'));
+			foreach ($t_categoryArr as $t_category) {
+				$t_eventArr =& notificationEvents($t_category['name'], false, $module->get('mid'));
+				foreach ($t_eventArr as $t_event) {
+					if (!empty($event['invisible'])) {
+						continue;
+					}
+					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
+					$t_options[$t_optionName] = $category['name'] . '-' . $t_event['name'];
+				}
+				
+				$configInfos[] = array(
+					'name' => 'notification_events',
+					'title' => '_NOT_CONFIG_EVENTS',
+					'description' => '_NOT_CONFIG_EVENTSDSC',
+					'formtype' => 'select_multi',
+					'valuetype' => 'array',
+					'default' => array_values($t_options),
+					'options' => $t_options
+				);
+			}
+		}
 
 		$configHandler =& xoops_gethandler('config');
 

From minahito ＠ users.sourceforge.jp  Tue Jul 25 19:22:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Jul 2006 19:22:47 +0900
Subject: [xoops-cvslog 3669] CVS update:
	xoops2jp/html/modules/base/preload/Primary
Message-ID: <20060725102247.B4C372AC979@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.1 xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.2
--- xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.1	Tue Jun 27 18:11:38 2006
+++ xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php	Tue Jul 25 19:22:47 2006
@@ -8,7 +8,7 @@
 	{
         if(($this->mController->mConfig['closesite']==1)||is_array(XCube_Utils::checkSystemModules())) {
 			$this->mController->mRoot->mDelegateManager->add("Site.Login", array(&$this, "callbackSiteLogin"), XCUBE_DELEGATE_PRIORITY_FINAL);
-			$this->mController->mRoot->mEventManager->add("Site.CheckLogin.Success",new XCube_InstanceDelegate($this,"callbackCheckLoginSuccess"));
+			$this->mController->mRoot->mDelegateManager->add("Site.CheckLogin.Success",array(&$this,"callbackCheckLoginSuccess"));
 		}
 	}
 
@@ -21,7 +21,8 @@
             if (is_array($retArray)) {
     			define('XOOPS_CPFUNC_LOADED',1);
     		}
-	        require_once XOOPS_ROOT_PATH.'/include/checklogin.php';
+
+			$this->mController->checkLogin();
 			return;
 	    } elseif(is_object($this->mController->mXoopsUser)) {
 			foreach ($this->mController->mXoopsUser->getGroups() as $group) {
@@ -155,29 +156,30 @@
 	    }
 	}
 	
-	function callbackCheckLoginSuccess(&$controller,&$eventArgs)
+	function callbackCheckLoginSuccess(&$xoopsUser)
 	{
 		//
 		// This check is not needed. :)
 		//
-		if(!is_object($eventArgs['xoopsUser']))
+		if(!is_object($xoopsUser)) {
 			return;
+		}
 
 		$user=&$eventArgs['xoopsUser'];
 
 		// Site close
-		if($controller->getConfig('closesite')) {
+		if($this->mController->getConfig('closesite')) {
 			$accessAllowed=false;
 
 			foreach($user->getGroups() as $group) {
-				if(in_array($group,$controller->getConfig('closesite_okgrp')) || ($group==XOOPS_GROUP_ADMIN)) {
+				if(in_array($group,$this->mController->getConfig('closesite_okgrp')) || ($group==XOOPS_GROUP_ADMIN)) {
 					$accessAllowed=true;
 					break;
 				}
 			}
 
 			if(!$accessAllowed) {
-				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);
+				$this->mController->redirectHeader(XOOPS_URL,1,_NOPERM);
 			}
 		}
 	}

From minahito ＠ users.sourceforge.jp  Wed Jul 26 11:54:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 11:54:44 +0900
Subject: [xoops-cvslog 3670] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060726025444.7128C2AC175@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.6 xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.7
--- xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.6	Thu Jun 22 14:36:58 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php	Wed Jul 26 11:54:44 2006
@@ -1,5 +1,8 @@
 <?php
-// $Id: Legacy_ModuleController.class.php,v 1.1.2.6 2006/06/22 05:36:58 minahito Exp $
+/**
+ * @package legacy
+ */
+// $Id: Legacy_ModuleController.class.php,v 1.1.2.7 2006/07/26 02:54:44 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPS Cube - PHP Content Management System                   //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
@@ -34,32 +37,36 @@
 	var $mModuleObject;
 
 	var $mController;
+	
 	var $mConfig;
 	
 	function Legacy_ModuleController(&$controller)
 	{
-		$this->mController=&$controller;
+		$this->mController =& $controller;
 	}
 
-	function getConfig($key=null)
+	function getConfig($key = null)
 	{
-		if($key!=null)
+		if($key != null) {
 			return isset($this->mConfig[$key]) ? $this->mConfig[$key] : null;
-		else
+		}
+		else {
 			return $this->mConfig;
+		}
 	}
-	
 
 	function prepare()
 	{
 		// Is this request module process?
-		if(!$this->isModuleProcess())
+		if (!$this->isModuleProcess()) {
 			return;
+		}
 
 		$this->_createModuleObject();
 			
-		if(!$this->isActive())
+		if (!$this->isActive()) {
 			return;
+		}
 
 		//
 		// Set config values for this module
@@ -122,7 +129,7 @@
 	function _createModuleObject()
 	{
 		$moduleHandler=&xoops_gethandler('module');
-		$this->mModuleObject=&$moduleHandler->getByDirname($this->_getDirname());
+		$this->mModuleObject =& $moduleHandler->getByDirname($this->_getDirname());
 	}
 
 
@@ -135,7 +142,7 @@
 	function setupLanguage()
 	{
 		$languageManager=&$this->mController->mRoot->getLanguageManager();
-		$languageManager->loadModuleLanguage($this->mModuleObject->getVar('dirname'));
+		$languageManager->loadModuleMessageCatalog($this->mModuleObject->getVar('dirname'));
 	}
 	
 	function _processErrorModuleNotExist()

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:49:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:49:31 +0900
Subject: [xoops-cvslog 3671] CVS update: xoops2jp/html
Message-ID: <20060726104931.5840B2AC0D8@users.sourceforge.jp>

Index: xoops2jp/html/notifications.php
diff -u xoops2jp/html/notifications.php:1.2.8.1 xoops2jp/html/notifications.php:1.2.8.2
--- xoops2jp/html/notifications.php:1.2.8.1	Wed Oct 19 02:13:23 2005
+++ xoops2jp/html/notifications.php	Wed Jul 26 19:49:31 2006
@@ -1,222 +1,11 @@
 <?php
-// $Id: notifications.php,v 1.2.8.1 2005/10/18 17:13:23 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @version $Id: notifications.php,v 1.2.8.2 2006/07/26 10:49:31 minahito Exp $
+ */
 
-$xoopsOption['pagetype'] = 'notification';
-include 'mainfile.php';
+require_once "mainfile.php";
+require_once XOOPS_ROOT_PATH . "/header.php";
 
-if (empty($xoopsUser)) {
-    redirect_header('index.php', 3, _NOT_NOACCESS);
-    exit();
-}
-
-$uid = $xoopsUser->getVar('uid');
-
-$op = 'list';
-
-if (isset($_POST['op'])) {
-    $op = trim($_POST['op']);
-} elseif (isset($_GET['op'])) {
-    $op = trim($_GET['op']);
-}
-if (isset($_POST['delete'])) {
-    $op = 'delete';
-} elseif (isset($_GET['delete'])) {
-    $op = 'delete';
-}
-if (isset($_POST['delete_ok'])) {
-    $op = 'delete_ok';
-}
-if (isset($_POST['delete_cancel'])) {
-    $op = 'cancel';
-}
-
-switch ($op) {
-
-case 'cancel':
-
-    // FIXME: does this always go back to correct location??
-    redirect_header ('index.php');
-    break;
-
-case 'list':
-
-// Do we allow other users to see our notifications?  Nope, but maybe
-// see who else is monitoring a particular item (or at least how many)?
-// Well, maybe admin can see all...
-
-// TODO: need to span over multiple pages...???
-
-    // Get an array of all notifications for the selected user
-
-    $criteria = new Criteria ('not_uid', $uid);
-    $criteria->setSort ('not_modid,not_category,not_itemid');
-    $notification_handler =& xoops_gethandler('notification');
-    $notifications =& $notification_handler->getObjects($criteria);
-
-    // Generate the info for the template
-
-    $module_handler =& xoops_gethandler('module');
-    include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-
-    $modules = array();
-    $prev_modid = -1;
-    $prev_category = -1;
-    $prev_item = -1;
-    foreach ($notifications as $n) {
-        $modid = $n->getVar('not_modid');
-        if ($modid != $prev_modid) {
-            $prev_modid = $modid;
-            $prev_category = -1;
-            $prev_item = -1;
-            $module =& $module_handler->get($modid);
-            $modules[$modid] = array ('id'=>$modid, 'name'=>$module->getVar('name'), 'categories'=>array());
-            // TODO: note, we could auto-generate the url from the id
-            // and category info... (except when category has multiple
-            // subscription scripts defined...)
-            // OR, add one more option to xoops_version 'view_from'
-            // which tells us where to redirect... BUT, e.g. forums, it
-            // still wouldn't give us all the required info... e.g. the
-            // topic ID doesn't give us the ID of the forum which is
-            // a required argument...
-
-            // Get the lookup function, if exists
-            $not_config = $module->getInfo('notification');
-            $lookup_func = '';
-            if (!empty($not_config['lookup_file'])) {
-                $lookup_file = XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/' . $not_config['lookup_file'];
-                if (file_exists($lookup_file)) {
-                    include_once $lookup_file;
-                    if (!empty($not_config['lookup_func']) && function_exists($not_config['lookup_func'])) {
-                        $lookup_func = $not_config['lookup_func'];
-                    }
-                }
-            }
-        }
-        $category = $n->getVar('not_category');
-        if ($category != $prev_category) {
-            $prev_category = $category;
-            $prev_item = -1;
-            $category_info =& notificationCategoryInfo($category, $modid);
-            $modules[$modid]['categories'][$category] = array ('name'=>$category, 'title'=>$category_info['title'], 'items'=>array());
-        }
-        $item = $n->getVar('not_itemid');
-        if ($item != $prev_item) {
-            $prev_item = $item;
-            if (!empty($lookup_func)) {
-                $item_info = $lookup_func($category, $item);
-            } else {
-                $item_info = array ('name'=>'['._NOT_NAMENOTAVAILABLE.']', 'url'=>'');
-            }
-            $modules[$modid]['categories'][$category]['items'][$item] = array ('id'=>$item, 'name'=>$item_info['name'], 'url'=>$item_info['url'], 'notifications'=>array());
-        }
-        $event_info =& notificationEventInfo($category, $n->getVar('not_event'), $n->getVar('not_modid'));
-        $modules[$modid]['categories'][$category]['items'][$item]['notifications'][] = array ('id'=>$n->getVar('not_id'), 'module_id'=>$n->getVar('not_modid'), 'category'=>$n->getVar('not_category'), 'category_title'=>$category_info['title'], 'item_id'=>$n->getVar('not_itemid'), 'event'=>$n->getVar('not_event'), 'event_title'=>$event_info['title'], 'user_id'=>$n->getVar('not_uid'));
-    }
-    $xoopsOption['template_main'] = 'system_notification_list.html';
-    include XOOPS_ROOT_PATH.'/header.php';
-    $xoopsTpl->assign ('modules', $modules);    
-    $user_info = array ('uid' => $xoopsUser->getVar('uid'));
-    $xoopsTpl->assign ('user', $user_info);
-    $xoopsTpl->assign ('lang_cancel', _CANCEL);
-    $xoopsTpl->assign ('lang_clear', _NOT_CLEAR);
-    $xoopsTpl->assign ('lang_delete', _DELETE);
-    $xoopsTpl->assign ('lang_checkall', _NOT_CHECKALL);
-    $xoopsTpl->assign ('lang_module', _NOT_MODULE);
-    $xoopsTpl->assign ('lang_event', _NOT_EVENT);
-    $xoopsTpl->assign ('lang_events', _NOT_EVENTS);
-    $xoopsTpl->assign ('lang_category', _NOT_CATEGORY);
-    $xoopsTpl->assign ('lang_itemid', _NOT_ITEMID);
-    $xoopsTpl->assign ('lang_itemname', _NOT_ITEMNAME);
-    $xoopsTpl->assign ('lang_activenotifications', _NOT_ACTIVENOTIFICATIONS);
-    include XOOPS_ROOT_PATH.'/footer.php';
-
-// TODO: another display mode... instead of one notification per line,
-// show one line per item_id, with checkboxes for the available options...
-// and an update button to change them...  And still have the delete box
-// to delete all notification for that item
-
-// How about one line per ID, showing category, name, id, and list of
-// events...
-
-// TODO: it would also be useful to provide links to other available
-// options so we can say switch from new_message to 'bookmark' if we
-// are receiving too many emails.  OR, if we click on 'change options' 
-// we get a form for that page...
-
-// TODO: option to specify one-time??? or other modes??
-
-    break;
-
-case 'delete':
-    if (empty($_POST['del_not'])||!is_array($_POST['del_not'])) {
-        redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-    }
-    $del_notifications = array();
-    foreach($_POST['del_not'] as $not_modid => $not_ids) {
-        if (!is_array($not_ids)) {
-            redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-        }
-        foreach ($not_ids as $not_id) {
-            $del_notifications[] = intval($not_modid).'|'.intval($not_id);
-        }
-    }
-    $del_not = implode(',', $del_notifications);
-    include XOOPS_ROOT_PATH.'/header.php';
-    $hidden_vars = array('delete_ok'=>1, 'del_not'=>$del_not);
-    print '<h4>'._NOT_DELETINGNOTIFICATIONS.'</h4>';
-    xoops_confirm($hidden_vars, xoops_getenv('PHP_SELF'), _NOT_RUSUREDEL);
-    include XOOPS_ROOT_PATH.'/footer.php';
-    break;
-
-case 'delete_ok':
-    if(!xoops_confirm_validate()) {
-        redirect_header('notifications.php',2,'Ticket Error');
-    }
-    if (empty($_POST['del_not'])) {
-        redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-    }
-    $del_notifications = explode(',', $_POST['del_not']);
-    if (!is_array($del_notifications) || count($del_notifications)==0) {
-        redirect_header('notifications.php', 2, _NOT_NOTHINGTODELETE);
-    }
-    $notification_handler =& xoops_gethandler('notification');
-    foreach ($del_notifications as $del_notification) {
-        $del_notification_items = explode('|',$del_notification);
-        if (is_array($del_notification_items) && (count($del_notification_items)==2) && !empty($del_notification_items[0]) && !empty($del_notification_items[1])) {
-            $notification =& $notification_handler->get(intval($del_notification_items[1]));
-            if (!empty($notification) && ($notification->getVar('not_uid') == $uid) && ($notification->getVar('not_modid') == intval($del_notification_items[0]))) {
-                $notification_handler->delete($notification);
-            }
-        }
-    }
-    redirect_header('notifications.php', 2, _NOT_DELETESUCCESS);
-    break;
-default:
-    break;
-}
+XCube_DelegateUtils::call('Legacypage.Notifications.Access');
 
 ?>

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:50:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:50:06 +0900
Subject: [xoops-cvslog 3672] CVS update: xoops2jp/html/class
Message-ID: <20060726105006.2EB222AC0D8@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ActionForm.class.php
diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.35 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.36
--- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.35	Wed Jun  7 17:59:03 2006
+++ xoops2jp/html/class/XCube_ActionForm.class.php	Wed Jul 26 19:50:06 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package XCube
+ * @version $Id: XCube_ActionForm.class.php,v 1.1.2.36 2006/07/26 10:50:06 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -22,6 +26,8 @@
  * developer to use this. You can learn more full-scale action forms from JAVA
  * and .NET and other PHP. And, you must use auto-generating tool when you need
  * to ActionForm that is sub-class of this class.
+ * 
+ * @package XCube
  */
 class XCube_ActionForm
 {
@@ -29,13 +35,13 @@
 	 * @var array of XCube_FormProperty
 	 * @access protected
 	 */
-	var $mFormProperties;
+	var $mFormProperties = array();
 
 	/**
 	 * @var array of XCube_FieldProperty
 	 * @access protected
 	 */
-	var $mFieldProperties;
+	var $mFieldProperties = array();
 	
 	/**
 	 * NOTICE: This is temporary until we will decide the method of managing error.

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:51:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:51:37 +0900
Subject: [xoops-cvslog 3673] CVS update: xoops2jp/html/include
Message-ID: <20060726105137.5DA952AC175@users.sourceforge.jp>

Index: xoops2jp/html/include/notification_functions.php
diff -u xoops2jp/html/include/notification_functions.php:1.2.8.2 xoops2jp/html/include/notification_functions.php:1.2.8.3
--- xoops2jp/html/include/notification_functions.php:1.2.8.2	Tue Jan 24 22:08:06 2006
+++ xoops2jp/html/include/notification_functions.php	Wed Jul 26 19:51:37 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification_functions.php,v 1.2.8.2 2006/01/24 13:08:06 minahito Exp $
+// $Id: notification_functions.php,v 1.2.8.3 2006/07/26 10:51:37 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -82,7 +82,7 @@
  * @param  int     $module_id  ID of the module (default current module)
  * @return mixed
  */
-function &notificationCategoryInfo ($category_name='', $module_id=null)
+function &notificationCategoryInfo ($category_name = null, $module_id = null)
 {
 	if (!isset($module_id)) {
 		global $xoopsModule;
@@ -93,7 +93,7 @@
 		$module =& $module_handler->get($module_id);
 	}
 	$not_config =& $module->getInfo('notification');
-	if (empty($category_name)) {
+	if ($category_name == null) {
 		return $not_config['category'];
 	}
 	foreach ($not_config['category'] as $category) {
@@ -188,8 +188,10 @@
 			}
 		}
 	}
+	
 
-	include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/notification.php';
+	$root =& XCube_Root::getSingleton();
+	$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 
 	// Insert comment info if applicable
 	
@@ -256,7 +258,6 @@
 		}	
 	}
 
-
 	return $event_array;
 	
 }
@@ -277,9 +278,9 @@
 {
 	$config_handler =& xoops_gethandler('config');
 	$mod_config = $config_handler->getConfigsByCat(0,$module->getVar('mid'));
-
+	
 	$option_name = notificationGenerateConfig ($category, $event, 'option_name');
-	if (is_array($option_name) && in_array($option_name, $mod_config['notification_events'])) {
+	if (is_array($mod_config['notification_events']) && in_array($option_name, $mod_config['notification_events'])) {
 		return true;
 	}
 	$notification_handler =& xoops_gethandler('notification');
@@ -328,7 +329,6 @@
 	$sub_categories = array();
 
 	foreach ($all_categories as $category) {
-
 		// Check the script name
 
 		$subscribe_from = $category['subscribe_from'];

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:52:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:52:17 +0900
Subject: [xoops-cvslog 3674] CVS update: xoops2jp/html/include
Message-ID: <20060726105217.7A3DC2AC221@users.sourceforge.jp>

Index: xoops2jp/html/include/notification_select.php
diff -u xoops2jp/html/include/notification_select.php:1.2.8.2 xoops2jp/html/include/notification_select.php:1.2.8.3
--- xoops2jp/html/include/notification_select.php:1.2.8.2	Thu Jul 20 17:18:22 2006
+++ xoops2jp/html/include/notification_select.php	Wed Jul 26 19:52:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification_select.php,v 1.2.8.2 2006/07/20 08:18:22 minahito Exp $
+// $Id: notification_select.php,v 1.2.8.3 2006/07/26 10:52:17 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,7 +33,7 @@
 $xoops_notification = array();
 $xoops_notification['show'] = isset($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
 if ($xoops_notification['show']) {
-	$root =& XCube_Root::getSignleton();
+	$root =& XCube_Root::getSingleton();
 	$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 	$categories =& notificationSubscribableCategoryInfo();
 	$event_count = 0;
@@ -81,6 +81,8 @@
 	}
 }
 
-if(isset($xoopsTpl)&&is_object($xoopsTpl))
+if(isset($xoopsTpl)&&is_object($xoopsTpl)) {
 	$xoopsTpl->assign('xoops_notification', $xoops_notification);
+}
+
 ?>

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:52:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:52:46 +0900
Subject: [xoops-cvslog 3675] CVS update: xoops2jp/html/modules/base
Message-ID: <20060726105246.9B6452AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/xoops_version.php
diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.24 xoops2jp/html/modules/base/xoops_version.php:1.1.2.25
--- xoops2jp/html/modules/base/xoops_version.php:1.1.2.24	Tue May 30 13:08:55 2006
+++ xoops2jp/html/modules/base/xoops_version.php	Wed Jul 26 19:52:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.24 2006/05/30 04:08:55 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.25 2006/07/26 10:52:46 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -94,6 +94,12 @@
 $modversion['templates'][22]['description'] = '';
 $modversion['templates'][23]['file'] = 'legacy_search_showallbyuser.html';
 $modversion['templates'][23]['description'] = '';
+$modversion['templates'][24]['file'] = 'legacy_notification_list.html';
+$modversion['templates'][24]['description'] = '';
+$modversion['templates'][25]['file'] = 'legacy_notification_delete.html';
+$modversion['templates'][25]['description'] = '';
+$modversion['templates'][26]['file'] = 'legacy_notification_select_form.html';
+$modversion['templates'][26]['description'] = '';
 
 // Menu
 $modversion['hasMain'] = 0;

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:53:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:53:00 +0900
Subject: [xoops-cvslog 3676] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060726105300.4F1EB2AC175@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php:1.1.2.1
--- /dev/null	Wed Jul 26 19:53:00 2006
+++ xoops2jp/html/modules/base/actions/NotifyCancelAction.class.php	Wed Jul 26 19:53:00 2006
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: NotifyCancelAction.class.php,v 1.1.2.1 2006/07/26 10:53:00 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class Legacy_NotifyCancelAction extends Legacy_Action
+{
+	function getDefaultView(&$contoller, &$xoopsUser)
+	{
+		$contoller->executeForward(XOOPS_URL);
+	}
+
+	function execute(&$contoller, &$xoopsUser)
+	{
+		$contoller->executeForward(XOOPS_URL);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php:1.1.2.1
--- /dev/null	Wed Jul 26 19:53:00 2006
+++ xoops2jp/html/modules/base/actions/NotifyDeleteAction.class.php	Wed Jul 26 19:53:00 2006
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: NotifyDeleteAction.class.php,v 1.1.2.1 2006/07/26 10:53:00 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/include/notification_functions.php";
+
+require_once XOOPS_MODULE_PATH . "/base/forms/NotifyDeleteForm.class.php";
+
+/**
+ * List up notifications. This action is like notifications.php (when $op is
+ * 'list').
+ */
+class Legacy_NotifyDeleteAction extends Legacy_Action
+{
+	var $mModules = array();
+	var $mActionForm = null;
+	
+	var $mErrorMessage = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('notification');
+		$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
+		
+		$this->mActionForm =& new Legacy_NotifyDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function hasPerm(&$controller, &$xoopsUser)
+	{
+		return is_object($xoopsUser);
+	}
+
+	/**
+	 * This member function is a special case. Because the confirm is must, it
+	 * uses token error for displaying confirm.
+	 */	
+	function execute(&$contoller, &$xoopsUser)
+	{
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		//
+		// If input values are error, the action form returns fatal error flag.
+		// If it's not fatal, display confirm form.
+		//
+		if ($this->mActionForm->hasError()) {
+			return $this->mActionForm->mFatalError ? LEGACY_FRAME_VIEW_ERROR : LEGACY_FRAME_VIEW_INPUT;
+		}
+
+		//
+		// Execute deleting.
+		//
+		$successFlag = true;
+		$handler =& xoops_gethandler('notification');
+		foreach ($this->mActionForm->mNotifiyIds as $t_idArr) {
+			$t_notify =& $handler->get($t_idArr['id']);
+			if (is_object($t_notify) && $t_notify->get('not_uid') == $xoopsUser->get('uid') && $t_notify->get('not_modid') == $t_idArr['modid']) {
+				$successFlag = $successFlag & $handler->delete($t_notify);
+			}
+		}
+		
+		return $successFlag ? LEGACY_FRAME_VIEW_SUCCESS : LEGACY_FRAME_VIEW_ERROR;
+	}
+		
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("legacy_notification_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward(XOOPS_URL . "/notifications.php");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeRedirect(XOOPS_URL . "/notifications.php", 2, _NOT_NOTHINGTODELETE);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/actions/NotifyListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/NotifyListAction.class.php:1.1.2.1
--- /dev/null	Wed Jul 26 19:53:00 2006
+++ xoops2jp/html/modules/base/actions/NotifyListAction.class.php	Wed Jul 26 19:53:00 2006
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: NotifyListAction.class.php,v 1.1.2.1 2006/07/26 10:53:00 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/include/notification_functions.php";
+
+require_once XOOPS_MODULE_PATH . "/base/forms/NotifyDeleteForm.class.php";
+
+/**
+ * List up notifications. This action is like notifications.php (when $op is
+ * 'list').
+ */
+class Legacy_NotifyListAction extends Legacy_Action
+{
+	var $mModules = array();
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$root =& $controller->mRoot;
+		$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
+		
+		$this->mActionForm =& new Legacy_NotifyDeleteForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function hasPerm(&$controller, &$xoopsUser)
+	{
+		return is_object($xoopsUser);
+	}
+
+	function getDefaultView(&$contoller, &$xoopsUser)
+	{
+		$criteria =& new Criteria('not_uid', $xoopsUser->get('uid'));
+		$criteria->setSort('not_modid, not_category, not_itemid');
+		
+		$handler =& xoops_gethandler('notification');
+		$notificationArr =& $handler->getObjects($criteria);
+
+		$moduleHandler =& xoops_gethandler('module');
+		
+		$prev_modid = -1;
+		$prev_category = -1;
+		$prev_item = -1;
+		foreach ($notificationArr as $notify) {
+			$t_modid = $notify->get('not_modid');
+			if ($t_modid != $prev_modid) {
+				$prev_modid = $t_modid;
+				$prev_category = -1;
+				$prev_item = -1;
+				
+				$module =& $moduleHandler->get($t_modid);
+				$this->mModules[$t_modid] = array (
+					'id' => $t_modid,
+					'name' => $module->getShow('name'),
+					'categories' => array()
+				);
+
+
+				//
+				// [ToDo] (Original)
+				// note, we could auto-generate the url from the id
+				// and category info... (except when category has multiple
+				// subscription scripts defined...)
+				// OR, add one more option to xoops_version 'view_from'
+				// which tells us where to redirect... BUT, e.g. forums, it
+				// still wouldn't give us all the required info... e.g. the
+				// topic ID doesn't give us the ID of the forum which is
+				// a required argument...
+				
+				//
+				// Get the lookup function, if exists
+				//
+				$notifyConfig = $module->getInfo('notification');
+				$lookupFunc = '';
+				if (!empty($notifyConfig['lookup_file'])) {
+					$t_filepath = XOOPS_ROOT_PATH . '/modules/' . $module->get('dirname') . '/' . $notifyConfig['lookup_file'];
+					if (file_exists($t_filepath)) {
+						require_once $t_filepath;
+						if (!empty($notifyConfig['lookup_func']) && function_exists($notifyConfig['lookup_func'])) {
+							$lookupFunc = $notifyConfig['lookup_func'];
+						}
+					}
+				}
+			}
+			
+			$t_category = $notify->get('not_category');
+			if ($t_category != $prev_category) {
+				$prev_category = $t_category;
+				$prev_item = -1;
+				$categoryInfo =& notificationCategoryInfo($t_category, $t_modid);
+			}
+			
+			$t_item = $notify->get('not_itemid');
+			if ($t_item != $prev_item) {
+				$prev_item = $t_item;
+				if (!empty($lookupFunc)) {
+					$itemInfo = $lookupFunc($t_category, $t_item);
+				}
+				else {
+					$itemInfo = array ('name' => '[' . _NOT_NAMENOTAVAILABLE . ']', 'url' => '');
+				}
+				$this->mModules[$t_modid]['categories'][$t_category]['items'][$t_item] = array(
+					'id' => $t_item,
+					'name' => $itemInfo['name'],
+					'url' => $itemInfo['url'],
+					'notifications' => array()
+				);
+			}
+			
+			$eventInfo =& notificationEventInfo($t_category, $notify->get('not_event'), $notify->get('not_modid'));
+			$this->mModules[$t_modid]['categories'][$t_category]['items'][$t_item]['notifications'][] = array(
+				'id' => $notify->get('not_id'),
+				'module_id' => $notify->get('not_modid'),
+				'category' => $notify->get('not_category'),
+				'category_title' => $categoryInfo['title'],
+				'item_id' => $notify->get('not_itemid'),
+				'event' => $notify->get('not_event'),
+				'event_title' => $eventInfo['title'],
+				'user_id' => $notify->get('not_uid')
+			);
+		}
+		
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("legacy_notification_list.html");
+		
+		$render->setAttribute('modules', $this->mModules);
+		$render->setAttribute('currentUser', $xoopsUser);
+		$render->setAttribute('actionForm', $this->mActionForm);
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?Action=ImageList");
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:53:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:53:34 +0900
Subject: [xoops-cvslog 3677] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060726105334.F3C252AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.19 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.20
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.19	Tue Jul 25 19:15:56 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Wed Jul 26 19:53:34 2006
@@ -444,7 +444,7 @@
 						continue;
 					}
 					$t_optionName = $t_category['title'] . ' : ' . $t_event['title'];
-					$t_options[$t_optionName] = $category['name'] . '-' . $t_event['name'];
+					$t_options[$t_optionName] = $t_category['name'] . '-' . $t_event['name'];
 				}
 				
 				$configInfos[] = array(
@@ -488,7 +488,10 @@
 					}
 				}
 				
-				if (!$configHandler->insertConfig($config)) {
+				if ($configHandler->insertConfig($config)) {
+					$log->addReport(XCube_Utils::formatMessage(_AD_BASE_MESSAGE_INSERT_CONFIG, $configInfo['name']));
+				}
+				else {
 					$log->addError(XCube_Utils::formatMessage(_AD_BASE_ERROR_COULD_NOT_INSERT_CONFIG, $configInfo['name']));
 				}
 				

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:54:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:54:02 +0900
Subject: [xoops-cvslog 3678] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060726105402.C8B012AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.7 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.8
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.7	Fri Jun 23 10:28:54 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Wed Jul 26 19:54:02 2006
@@ -14,12 +14,27 @@
 define ("LEGACY_FRAME_VIEW_INDEX", 4);
 define ("LEGACY_FRAME_VIEW_INPUT", 5);
 
+//
+// Constatns for the mode of the frame.
+//
+define ("LEGACY_FRAME_MODE_MISC", "Misc");
+define ("LEGACY_FRAME_MODE_NOTIFY", "Notify");
+define ("LEGACY_FRAME_MODE_IMAGE", "Image");
+
 class Legacy_ActionFrame extends XCube_ActionStrategy
 {
 	var $mActionName = null;
 	var $mAction = null;
 	var $mAdminFlag = null;
 
+	/**
+	 * Mode. The rule refers this property to load a file and create an
+	 * instance in execute().
+	 * 
+	 * @var string
+	 */	
+	var $mMode = null;
+
 	function Legacy_ActionFrame($admin)
 	{
 		$this->mAdminFlag = $admin;
@@ -29,12 +44,27 @@
 	{
 		$this->mActionName = $name;
 	}
+	
+	/**
+	 * Set mode.
+	 * 
+	 * @param string $mode   Use constants (LEGACY_FRAME_MODE_MISC and more...)
+	 */
+	function setMode($mode)
+	{
+		$this->mMode = $mode;
+	}
 
 	function execute(&$controller)
 	{
 		if (!preg_match("/^\w+$/", $this->mActionName)) {
 			die();
 		}
+		
+		//
+		// Add mode.
+		//
+		$this->mActionName = $this->mMode . $this->mActionName;
 	
 		//
 		// Create action object by mActionName

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:54:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:54:13 +0900
Subject: [xoops-cvslog 3679] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20060726105413.E1F892AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php:1.1.2.1
--- /dev/null	Wed Jul 26 19:54:13 2006
+++ xoops2jp/html/modules/base/forms/NotifyDeleteForm.class.php	Wed Jul 26 19:54:13 2006
@@ -0,0 +1,43 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+
+class Legacy_NotifyDeleteForm extends XCube_ActionForm
+{
+	var $mNotifiyIds = array();
+	var $mFatalError = false;
+	
+	function getTokenName()
+	{
+		return $_SERVER['REQUEST_METHOD'] == 'POST' ? "module.base.NotifyDeleteForm.TOKEN" : null;
+	}
+
+	function fetch()
+	{
+		parent::fetch();
+		
+		$t_arr = $_REQUEST['del_not'];
+		
+		if (!is_array($t_arr)) {
+			$this->addErrorMessage(_MD_BASE_LANG_ERROR);
+			$this->mFatalError = true;
+			return;
+		}
+		
+		foreach ($t_arr as $t_modid => $t_idArr) {
+			if (!is_array($t_idArr)) {
+				$this->addErrorMessage(_MD_BASE_LANG_ERROR);
+				$this->mFatalError = true;
+				return;
+			}
+			foreach ($t_idArr as $t_id) {
+				$this->mNotifiyIds[] = array('modid' => intval($t_modid), 'id' => intval($t_id));
+			}
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:54:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:54:43 +0900
Subject: [xoops-cvslog 3680] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060726105443.BF18C2AC175@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.51 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.52
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.51	Thu Jul 20 17:11:48 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Wed Jul 26 19:54:43 2006
@@ -673,6 +673,7 @@
 		
 		$renderTarget=&$this->mRenderSystem->getRenderTarget();
 
+		// require_once XOOPS_ROOT_PATH . '/include/notification_select.php';
 
 		// Wmm...
 		if($renderTarget->getTemplateName()==null) {
@@ -754,6 +755,16 @@
 		return $manager;
 	}
 	
+	function &_createDelegateManager()
+	{
+		$manager =& parent::_createDelegateManager();
+		
+		$manager->add('Legacypage.Notifications.Access', 'Legacy_NotificationFunctions::notifications', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
+		$manager->add('Legacyfunction.Notificatins.Select', 'Legacy_NotificationFunctions::notifications_select', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
+		
+		return $manager;
+	}
+	
 	function &_createServiceManager()
 	{
 		$manager =& parent::_createServiceManager();

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:55:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:55:07 +0900
Subject: [xoops-cvslog 3681] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060726105507.5CC382AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php
diff -u /dev/null xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php:1.1.2.1
--- /dev/null	Wed Jul 26 19:55:07 2006
+++ xoops2jp/html/modules/base/kernel/NotificationFunctions.class.php	Wed Jul 26 19:55:07 2006
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: NotificationFunctions.class.php,v 1.1.2.1 2006/07/26 10:55:07 minahito Exp $
+ */
+
+class Legacy_NotificationFunctions
+{
+	function notifications()
+	{
+		require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+		
+		$root =& XCube_Root::getSingleton();
+
+		//
+		// 'Notify' is prefix to guard accessing from misc.php.
+		//
+		$actionName = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "List";
+		if (isset($_REQUEST['delete'])) {
+			$actionName = "Delete";
+		}
+		if (isset($_REQUEST['delete_cancel'])) {
+			$actionName = "Cancel";
+		}
+
+		$moduleRunner = new Legacy_ActionFrame(false);
+		$moduleRunner->setMode(LEGACY_FRAME_MODE_NOTIFY);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->setActionStrategy($moduleRunner);
+
+		$root->mController->executeAction();
+
+		$root->mController->executeView();
+	}
+	
+	/**
+	 * This functions is add to 'Legacyfunction.Notificatins.Select'.
+	 * 
+	 * @param XCube_RenderBuffer $render
+	 */
+	function notifications_select(&$render)
+	{
+		require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+		require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+
+		$root =& XCube_Root::getSingleton();
+		$xoopsModule =& $root->mController->mModuleController->mModuleObject;
+		$moduleConfig =& $root->mController->mModuleController->mConfig;
+		$xoopsUser =& $root->mController->getXoopsUser();
+
+		$xoops_notification = array();
+		$xoops_notification['show'] = is_object($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
+		
+		if ($xoops_notification['show']) {
+			$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
+			$categories =& notificationSubscribableCategoryInfo();
+			$event_count = 0;
+			if (!empty($categories)) {
+				$notification_handler =& xoops_gethandler('notification');
+				foreach ($categories as $category) {
+					$section['name'] = $category['name'];
+					$section['title'] = $category['title'];
+					$section['description'] = $category['description'];
+					$section['itemid'] = $category['item_id'];
+					$section['events'] = array();
+					$subscribed_events =& $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoopsModule->get('mid'), $xoopsUser->get('uid'));
+					foreach (notificationEvents($category['name'], true) as $event) {
+						if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+							continue;
+						}
+						if (!empty($event['invisible'])) {
+							continue;
+						}
+						$subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
+						$section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
+						$event_count ++;
+					}
+					$xoops_notification['categories'][$category['name']] = $section;
+				}
+				$xoops_notification['target_page'] = "notification_update.php";
+				$xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF');
+				$render->setAttribute('editprofile_url', XOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
+				switch ($xoopsUser->getVar('notify_method')) {
+				case XOOPS_NOTIFICATION_METHOD_DISABLE:
+					$render->setAttribute('user_method', _NOT_DISABLE);
+					break;
+				case XOOPS_NOTIFICATION_METHOD_PM:
+					$render->setAttribute('user_method', _NOT_PM);
+					break;
+				case XOOPS_NOTIFICATION_METHOD_EMAIL:
+					$render->setAttribute('user_method', _NOT_EMAIL);
+					break;
+				}
+			} else {
+				$xoops_notification['show'] = 0;
+			}
+			if ($event_count == 0) {
+				$xoops_notification['show'] = 0;
+			}
+		}
+		
+		$render->setAttribute('xoops_notification', $xoops_notification);
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:55:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:55:26 +0900
Subject: [xoops-cvslog 3682] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060726105526.E25452AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.40 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.41
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.40	Sat Jul  1 16:26:24 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Wed Jul 26 19:55:26 2006
@@ -156,6 +156,7 @@
 define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "データベーステーブルのセットアップを終了しました");
 define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "モジュール情報をデータベースから削除しました");
 define('_AD_BASE_MESSAGE_DROP_TABLE', "テーブル {0} をドロップしました");
+define('_AD_BASE_MESSAGE_INSERT_CONFIG', "コンフィグ {0} を追加しました");
 define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのインストールに成功しました");
 define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "テンプレート {0} をインストールしました");
 define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "{0} モジュールのアンインストールに成功しました");
Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.17 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.18
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.17	Wed Jul 19 19:19:42 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Wed Jul 26 19:55:26 2006
@@ -41,6 +41,7 @@
 define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
 define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
 define('_MD_BASE_LANG_EMOTION', "emotion");
+define('_MD_BASE_LANG_ERROR', "error");
 define('_MD_BASE_LANG_FUNC_FILE', "func file");
 define('_MD_BASE_LANG_FUNC_NUM', "func num");
 define('_MD_BASE_LANG_ID', "ID");

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:55:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:55:27 +0900
Subject: [xoops-cvslog 3683] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060726105527.15AFF2AC0D8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.16 xoops2jp/html/modules/base/language/english/main.php:1.1.2.17
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.16	Wed Jul 19 19:19:46 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Wed Jul 26 19:55:26 2006
@@ -41,6 +41,7 @@
 define('_MD_BASE_LANG_DOXCODE', "enable XOOPS code");
 define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
 define('_MD_BASE_LANG_EMOTION', "emotion");
+define('_MD_BASE_LANG_ERROR', "error");
 define('_MD_BASE_LANG_FUNC_FILE', "func file");
 define('_MD_BASE_LANG_FUNC_NUM', "func num");
 define('_MD_BASE_LANG_ID', "ID");
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.33 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.34
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.33	Sat Jul  1 16:26:24 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Wed Jul 26 19:55:26 2006
@@ -156,6 +156,7 @@
 define('_AD_BASE_MESSAGE_DATABASE_SETUP_FINISHED', "Database table setup finished.");
 define('_AD_BASE_MESSAGE_DELETE_MODULEINFO_FROM_DB', "Delete module information from XOOPS database.");
 define('_AD_BASE_MESSAGE_DROP_TABLE', "Drop table {0}");
+define('_AD_BASE_MESSAGE_INSERT_CONFIG', "Config {0} added.");
 define('_AD_BASE_MESSAGE_INSTALLATION_MODULE_SUCCESSFUL', "Installation of '{1}' module has been successful");
 define('_AD_BASE_MESSAGE_TEMPLATE_INSTALLED', "Template '{1}' has been installed.");
 define('_AD_BASE_MESSAGE_UNINSTALLATION_MODULE_SUCCESSFUL', "Uninstallation of '{1}' module has been successful");

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:55:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:55:37 +0900
Subject: [xoops-cvslog 3684] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060726105537.6B55C2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_notification_select.html
diff -u xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.1	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_select.html	Wed Jul 26 19:55:37 2006
@@ -1,3 +1,5 @@
+<{legacy_notifications_select}>
+
 <{if $xoops_notification.show}>
 <form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
 <h4 style="text-align:center;"><{$lang_activenotifications}></h4>
Index: xoops2jp/html/modules/base/templates/legacy_notification_list.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_notification_list.html:1.1.2.1
--- /dev/null	Wed Jul 26 19:55:37 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_list.html	Wed Jul 26 19:55:37 2006
@@ -0,0 +1,40 @@
+<h4><{$smarty.const._NOT_ACTIVENOTIFICATIONS}></h4>
+<form name="notificationlist" action="notifications.php" method="post">
+  <{xoops_token form=$actionForm}>
+  <table class="outer">
+    <tr>
+      <th><input name="allbox" id="allbox" onclick="xoopsCheckAll('notificationlist', 'allbox');" type="checkbox" value="<{$smarty.const._NOT_CHECKALL}>" /></th>
+      <th><{$smarty.const._NOT_EVENT}></th>
+      <th><{$smarty.const._NOT_CATEGORY}></th>
+      <th><{$smarty.const._NOT_ITEMID}></th>
+      <th><{$smarty.const._NOT_ITEMNAME}></th>
+    </tr>
+    <{foreach item=module from=$modules}>
+      <tr>
+        <td class="head"><input name="del_mod[<{$module.id}>]" id="del_mod[<{$module.id}>]" onclick="xoopsCheckGroup('notificationlist', 'del_mod[<{$module.id}>]', 'del_not[<{$module.id}>][]');" type="checkbox" value="<{$module.id}>" /></td>
+        <td class="head" colspan="4"><{$smarty.const._NOT_MODULE}>: <{$module.name}></td>
+      </tr>
+      <{foreach item=category from=$module.categories}>
+        <{foreach item=item from=$category.items}>
+          <{foreach item=notification from=$item.notifications}>
+            <tr>
+              <{cycle values=odd,even assign=class}>
+              <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>][]" value="<{$notification.id}>" /></td>
+              <td class="<{$class}>"><{$notification.event_title}></td>
+              <td class="<{$class}>"><{$notification.category_title}></td>
+              <td class="<{$class}>"><{if $item.id != 0}><{$item.id}><{/if}></td>
+              <td class="<{$class}>"><{if $item.id != 0}><{if $item.url != ''}><a href="<{$item.url}>"><{/if}><{$item.name}><{if $item.url != ''}></a><{/if}><{/if}></td>
+            </tr>
+          <{/foreach}>
+        <{/foreach}>
+      <{/foreach}>
+    <{/foreach}>
+  <tr>
+    <td class="foot" colspan="5">
+      <input type="submit" name="delete_cancel" value="<{$smarty.const._CANCEL}>" />
+      <input type="reset" name="delete_reset" value="<{$smarty.const._NOT_CLEAR}>" />
+      <input type="submit" name="delete" value="<{$smarty.const._DELETE}>" />
+    </td>
+  </tr>
+  </table>
+</form>
Index: xoops2jp/html/modules/base/templates/legacy_notification_select_form.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_notification_select_form.html:1.1.2.1
--- /dev/null	Wed Jul 26 19:55:37 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_select_form.html	Wed Jul 26 19:55:37 2006
@@ -0,0 +1,35 @@
+<{if $xoops_notification.show}>
+<form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
+<h4 style="text-align:center;"><{$smarty.const._NOT_ACTIVENOTIFICATIONS}></h4>
+<input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
+<table class="outer">
+  <tr><th colspan="3"><{$smarty.const._NOT_NOTIFICATIONOPTIONS}></th></tr>
+  <tr>
+    <td class="head"><{$smarty.const._NOT_CATEGORY}></td>
+    <td class="head"><input name="allbox" id="allbox" onclick="xoopsCheckAll('notification_select','allbox');" type="checkbox" value="<{$smarty.const._NOT_CHECKALL}>" /></td>
+    <td class="head"><{$smarty.const._NOT_EVENT}></td>
+  </tr>
+  <{foreach name=outer item=category from=$xoops_notification.categories}>
+  <{foreach name=inner item=event from=$category.events}>
+  <tr>
+    <{if $smarty.foreach.inner.first}>
+    <td class="even" rowspan="<{$smarty.foreach.inner.total}>"><{$category.title}></td>
+    <{/if}>
+    <td class="odd">
+    <{counter assign=index}>
+    <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
+    <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
+    </td>
+    <td class="odd"><{$event.caption}></td>
+  </tr>
+  <{/foreach}>
+  <{/foreach}>
+  <tr>
+    <td class="foot" colspan="3" align="center"><input type="submit" name="not_submit" value="<{$smarty.const._NOT_UPDATENOW}>" /></td>
+  </tr>
+</table>
+<div align="center">
+<{$smarty.const._NOT_NOTIFICATIONMETHODIS}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url}>"><{$smarty.const._NOT_CHANGE}></a>]
+</div>
+</form>
+<{/if}>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_notification_delete.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_notification_delete.html:1.1.2.1
--- /dev/null	Wed Jul 26 19:55:37 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_delete.html	Wed Jul 26 19:55:37 2006
@@ -0,0 +1,9 @@
+<h4><{$smarty.const._NOT_DELETINGNOTIFICATIONS}></h4>
+<form action="notifications.php" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=delete value=1}>
+  <{foreach item=ids from=$actionForm->mNotifiyIds}>
+    <input type="hidden" name="del_not[<{$ids.modid|escape}>][]" value="<{$ids.id|escape}>" />
+  <{/foreach}>
+  <input type="submit" name="delete" value="<{$smarty.const._DELETE}>" />
+</form>

From minahito ＠ users.sourceforge.jp  Wed Jul 26 19:56:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 19:56:35 +0900
Subject: [xoops-cvslog 3685] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20060726105635.625302AC0D8@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.18 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.19
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.18	Tue Jul 11 11:58:47 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Wed Jul 26 19:56:35 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.18 2006/07/11 02:58:47 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.19 2006/07/26 10:56:35 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -46,7 +46,8 @@
 
 		// XoopsTpl default setup
 		$this->mXoopsTpl =& new XoopsTpl();
-		
+		$this->mXoopsTpl->register_function("legacy_notifications_select", "LegacyRender_smartyfunction_notifications_select");
+
 		// compatible
 		$GLOBALS['xoopsTpl'] =& $this->mXoopsTpl;
 		
@@ -393,4 +394,19 @@
 	}
 }
 
+function LegacyRender_smartyfunction_notifications_select($params, &$smarty)
+{
+	$renderTarget =& new XCube_RenderTarget();
+	$renderTarget->setType(XCUBE_RENDER_TARGET_TYPE_MAIN);
+	$renderTarget->setTemplateName("legacy_notification_select_form.html");
+
+	XCube_DelegateUtils::call('Legacyfunction.Notificatins.Select', new XCube_Ref($renderTarget));
+
+	$root =& XCube_Root::getSingleton();
+	$renderSystem =& $root->getRenderSystem('Legacy_RenderSystem');
+	$renderSystem->renderWithTarget($renderTarget);
+	
+	return $renderTarget->getResult();
+}
+
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Wed Jul 26 20:04:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 26 Jul 2006 20:04:37 +0900
Subject: [xoops-cvslog 3686] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060726110437.E894C2AC02E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_notification_select.html
diff -u xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.2 xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.3
--- xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.2	Wed Jul 26 19:55:37 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_select.html	Wed Jul 26 20:04:37 2006
@@ -1,37 +1 @@
 <{legacy_notifications_select}>
-
-<{if $xoops_notification.show}>
-<form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
-<h4 style="text-align:center;"><{$lang_activenotifications}></h4>
-<input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
-<table class="outer">
-  <tr><th colspan="3"><{$lang_notificationoptions}></th></tr>
-  <tr>
-    <td class="head"><{$lang_category}></td>
-    <td class="head"><input name="allbox" id="allbox" onclick="xoopsCheckAll('notification_select','allbox');" type="checkbox" value="<{$lang_checkall}>" /></td>
-    <td class="head"><{$lang_events}></td>
-  </tr>
-  <{foreach name=outer item=category from=$xoops_notification.categories}>
-  <{foreach name=inner item=event from=$category.events}>
-  <tr>
-    <{if $smarty.foreach.inner.first}>
-    <td class="even" rowspan="<{$smarty.foreach.inner.total}>"><{$category.title}></td>
-    <{/if}>
-    <td class="odd">
-    <{counter assign=index}>
-    <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
-    <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
-    </td>
-    <td class="odd"><{$event.caption}></td>
-  </tr>
-  <{/foreach}>
-  <{/foreach}>
-  <tr>
-    <td class="foot" colspan="3" align="center"><input type="submit" name="not_submit" value="<{$lang_updatenow}>" /></td>
-  </tr>
-</table>
-<div align="center">
-<{$lang_notificationmethodis}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url}>"><{$lang_change}></a>]
-</div>
-</form>
-<{/if}>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 08:49:42 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 08:49:42 +0900
Subject: [xoops-cvslog 3687] CVS update: xoops2jp/extras
Message-ID: <20060726234942.7B92C2AC317@users.sourceforge.jp>

Index: xoops2jp/extras/login.php
diff -u xoops2jp/extras/login.php:1.4 xoops2jp/extras/login.php:1.4.2.1
--- xoops2jp/extras/login.php:1.4	Mon May  1 11:37:24 2006
+++ xoops2jp/extras/login.php	Thu Jul 27 08:49:42 2006
@@ -62,6 +62,8 @@
         $user->setVar('last_login', time());
         if (!$member_handler->insertUser($user)) {
         }
+        require_once XOOPS_ROOT_PATH . '/include/session.php';
+        xoops_session_regenerate();
         $_SESSION = array();
         $_SESSION['xoopsUserId'] = $user->getVar('uid');
         $_SESSION['xoopsUserGroups'] = $user->getGroups();

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 08:49:42 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 08:49:42 +0900
Subject: [xoops-cvslog 3688] CVS update: xoops2jp/html/include
Message-ID: <20060726234942.AB6E72AC324@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.5 xoops2jp/html/include/checklogin.php:1.5.2.1
--- xoops2jp/html/include/checklogin.php:1.5	Mon May  1 11:37:26 2006
+++ xoops2jp/html/include/checklogin.php	Thu Jul 27 08:49:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: checklogin.php,v 1.5 2006/05/01 02:37:26 onokazu Exp $
+// $Id: checklogin.php,v 1.5.2.1 2006/07/26 23:49:42 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -63,6 +63,8 @@
     $user->setVar('last_login', time());
     if (!$member_handler->insertUser($user)) {
     }
+    require_once XOOPS_ROOT_PATH . '/include/session.php';
+    xoops_session_regenerate();
     $_SESSION = array();
     $_SESSION['xoopsUserId'] = $user->getVar('uid');
     $_SESSION['xoopsUserGroups'] = $user->getGroups();
Index: xoops2jp/html/include/session.php
diff -u /dev/null xoops2jp/html/include/session.php:1.1.2.1
--- /dev/null	Thu Jul 27 08:49:42 2006
+++ xoops2jp/html/include/session.php	Thu Jul 27 08:49:42 2006
@@ -0,0 +1,36 @@
+<?php
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit();
+}
+
+if (!function_exists('session_regenerate_id')) {
+    if (!defined('XOOPS_SALT')) {
+        define('XOOPS_SALT', substr(md5(XOOPS_DB_PREFIX . XOOPS_DB_USER . XOOPS_ROOT_PATH), 5, 8));
+    }
+    // session_regenerate_id compatible function for PHP Version< PHP4.3.2
+    function session_regenerate_id() {
+        srand(microtime() * 100000);
+        $random = md5(XOOPS_SALT . uniqid(rand(), true));
+        if (session_id($random)) {
+           return true;
+        } else {
+           return false;
+        }
+    }
+}
+
+// Regenerate New Session ID & Delete OLD Session
+function xoops_session_regenerate() {
+    $old_sessid = session_id();
+    session_regenerate_id();
+    $new_sessid = session_id();
+    session_id($old_sessid);
+    session_destroy();
+    $old_session = $_SESSION;
+    session_id($new_sessid);
+    $sess_handler =& xoops_gethandler('session');
+    session_set_save_handler(array(&$sess_handler, 'open'), array(&$sess_handler, 'close'), array(&$sess_handler, 'read'), array(&$sess_handler, 'write'), array(&$sess_handler, 'destroy'), array(&$sess_handler, 'gc'));
+    session_start();
+    $_SESSION = $old_session;
+}
+?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 08:52:33 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 08:52:33 +0900
Subject: [xoops-cvslog 3689] CVS update: xoops2jp/html/install/class
Message-ID: <20060726235233.F31552AC317@users.sourceforge.jp>

Index: xoops2jp/html/install/class/settingmanager.php
diff -u xoops2jp/html/install/class/settingmanager.php:1.2 xoops2jp/html/install/class/settingmanager.php:1.2.18.1
--- xoops2jp/html/install/class/settingmanager.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/settingmanager.php	Thu Jul 27 08:52:33 2006
@@ -29,7 +29,7 @@
 * setting manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: settingmanager.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+* @version $Id: settingmanager.php,v 1.2.18.1 2006/07/26 23:52:33 onokazu Exp $
 * @access public
 **/
 class setting_manager {
@@ -72,7 +72,8 @@
             if ( substr($filepath, -1) == "/" ) {
                 $filepath = substr($filepath, 0, -1);
             }
-            $protocol = ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
+            $protocol = 
+(!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) ? 'https://' : 'http://';
             $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST'];
         }
     }
@@ -268,7 +269,7 @@
 
     function getDBList()
     {
-		return array('mysql');
+        return array('mysql');
         //$dirname = '../class/database/';
         //$dirlist = array();
         //if (is_dir($dirname) && $handle = opendir($dirname)) {

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 08:53:13 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 08:53:13 +0900
Subject: [xoops-cvslog 3690] CVS update: xoops2jp/html/include
Message-ID: <20060726235313.190992AC324@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.13.2.1 xoops2jp/html/include/version.php:1.13.2.2
--- xoops2jp/html/include/version.php:1.13.2.1	Fri Jun  9 09:14:14 2006
+++ xoops2jp/html/include/version.php	Thu Jul 27 08:53:12 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.13.2.1 2006/06/09 00:14:14 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.15 JP");
+// $Id: version.php,v 1.13.2.2 2006/07/26 23:53:12 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.16 JP");
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:09:34 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:09:34 +0900
Subject: [xoops-cvslog 3691] CVS update: xoops2jp/extras
Message-ID: <20060727000934.CE7682AC07D@users.sourceforge.jp>

Index: xoops2jp/extras/login.php
diff -u xoops2jp/extras/login.php:1.4.2.1 xoops2jp/extras/login.php:1.4.2.2
--- xoops2jp/extras/login.php:1.4.2.1	Thu Jul 27 08:49:42 2006
+++ xoops2jp/extras/login.php	Thu Jul 27 09:09:34 2006
@@ -62,8 +62,6 @@
         $user->setVar('last_login', time());
         if (!$member_handler->insertUser($user)) {
         }
-        require_once XOOPS_ROOT_PATH . '/include/session.php';
-        xoops_session_regenerate();
         $_SESSION = array();
         $_SESSION['xoopsUserId'] = $user->getVar('uid');
         $_SESSION['xoopsUserGroups'] = $user->getGroups();

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:09:34 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:09:34 +0900
Subject: [xoops-cvslog 3692] CVS update: xoops2jp/html/include
Message-ID: <20060727000935.00FB82AC328@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.5.2.1 xoops2jp/html/include/checklogin.php:1.5.2.2
--- xoops2jp/html/include/checklogin.php:1.5.2.1	Thu Jul 27 08:49:42 2006
+++ xoops2jp/html/include/checklogin.php	Thu Jul 27 09:09:34 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: checklogin.php,v 1.5.2.1 2006/07/26 23:49:42 onokazu Exp $
+// $Id: checklogin.php,v 1.5.2.2 2006/07/27 00:09:34 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -63,8 +63,6 @@
     $user->setVar('last_login', time());
     if (!$member_handler->insertUser($user)) {
     }
-    require_once XOOPS_ROOT_PATH . '/include/session.php';
-    xoops_session_regenerate();
     $_SESSION = array();
     $_SESSION['xoopsUserId'] = $user->getVar('uid');
     $_SESSION['xoopsUserGroups'] = $user->getGroups();
Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.13.2.2 xoops2jp/html/include/version.php:1.13.2.3
--- xoops2jp/html/include/version.php:1.13.2.2	Thu Jul 27 08:53:12 2006
+++ xoops2jp/html/include/version.php	Thu Jul 27 09:09:34 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.13.2.2 2006/07/26 23:53:12 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.16 JP");
+// $Id: version.php,v 1.13.2.3 2006/07/27 00:09:34 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.15 JP");
 ?>
\ No newline at end of file
Index: xoops2jp/html/include/session.php
diff -u xoops2jp/html/include/session.php:1.1.2.1 xoops2jp/html/include/session.php:removed
--- xoops2jp/html/include/session.php:1.1.2.1	Thu Jul 27 08:49:42 2006
+++ xoops2jp/html/include/session.php	Thu Jul 27 09:09:34 2006
@@ -1,36 +0,0 @@
-<?php
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
-
-if (!function_exists('session_regenerate_id')) {
-    if (!defined('XOOPS_SALT')) {
-        define('XOOPS_SALT', substr(md5(XOOPS_DB_PREFIX . XOOPS_DB_USER . XOOPS_ROOT_PATH), 5, 8));
-    }
-    // session_regenerate_id compatible function for PHP Version< PHP4.3.2
-    function session_regenerate_id() {
-        srand(microtime() * 100000);
-        $random = md5(XOOPS_SALT . uniqid(rand(), true));
-        if (session_id($random)) {
-           return true;
-        } else {
-           return false;
-        }
-    }
-}
-
-// Regenerate New Session ID & Delete OLD Session
-function xoops_session_regenerate() {
-    $old_sessid = session_id();
-    session_regenerate_id();
-    $new_sessid = session_id();
-    session_id($old_sessid);
-    session_destroy();
-    $old_session = $_SESSION;
-    session_id($new_sessid);
-    $sess_handler =& xoops_gethandler('session');
-    session_set_save_handler(array(&$sess_handler, 'open'), array(&$sess_handler, 'close'), array(&$sess_handler, 'read'), array(&$sess_handler, 'write'), array(&$sess_handler, 'destroy'), array(&$sess_handler, 'gc'));
-    session_start();
-    $_SESSION = $old_session;
-}
-?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:09:35 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:09:35 +0900
Subject: [xoops-cvslog 3693] CVS update: xoops2jp/html/install/class
Message-ID: <20060727000935.2C9FD2AC07D@users.sourceforge.jp>

Index: xoops2jp/html/install/class/settingmanager.php
diff -u xoops2jp/html/install/class/settingmanager.php:1.2.18.1 xoops2jp/html/install/class/settingmanager.php:1.2.18.2
--- xoops2jp/html/install/class/settingmanager.php:1.2.18.1	Thu Jul 27 08:52:33 2006
+++ xoops2jp/html/install/class/settingmanager.php	Thu Jul 27 09:09:35 2006
@@ -29,7 +29,7 @@
 * setting manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: settingmanager.php,v 1.2.18.1 2006/07/26 23:52:33 onokazu Exp $
+* @version $Id: settingmanager.php,v 1.2.18.2 2006/07/27 00:09:35 onokazu Exp $
 * @access public
 **/
 class setting_manager {
@@ -72,8 +72,7 @@
             if ( substr($filepath, -1) == "/" ) {
                 $filepath = substr($filepath, 0, -1);
             }
-            $protocol = 
-(!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) ? 'https://' : 'http://';
+            $protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
             $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST'];
         }
     }

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:17 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:17 +0900
Subject: [xoops-cvslog 3694] CVS update: xoops2jp/docs
Message-ID: <20060727001717.4B4552AC32B@users.sourceforge.jp>

Index: xoops2jp/docs/CHANGES.txt
diff -u xoops2jp/docs/CHANGES.txt:1.12 xoops2jp/docs/CHANGES.txt:1.13
--- xoops2jp/docs/CHANGES.txt:1.12	Mon May  1 11:37:23 2006
+++ xoops2jp/docs/CHANGES.txt	Thu Jul 27 09:17:17 2006
@@ -1,6 +1,17 @@
 XOOPS v2 Changelog
 ============================
 
+2006/ 6/ 9: Version 2.0.15 JP
+===============================
+ - Fixed user message not being sent to PM when over 100 users to send(modules/system/mailusers/mailusers.php)
+ - Fixed port number always being added to the Host HTTP header(class/snoopy.php)
+ - Fixed some reference notice errors
+ - Fixed some typos
+ - Added patch for possible SQL injection attack(class/criteira.php)
+ - Added patch (of 2.0.14a) for local file inclusion vulnerability(header.php, index.php, misc.php)
+ - Added fix for mail encoding problems in PHP4.4.0/4.4.1(language/japanese/xoopsmailerlocal.php)
+
+
 2006/ 4/29: Version 2.0.14 JP
 ===============================
 - Fixed installation failure problem with PHP 5.1.x

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:17 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:17 +0900
Subject: [xoops-cvslog 3695] CVS update: xoops2jp/html/class
Message-ID: <20060727001717.774972AC32C@users.sourceforge.jp>

Index: xoops2jp/html/class/criteria.php
diff -u xoops2jp/html/class/criteria.php:1.5 xoops2jp/html/class/criteria.php:1.6
--- xoops2jp/html/class/criteria.php:1.5	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/criteria.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: criteria.php,v 1.5 2005/08/03 12:39:11 onokazu Exp $
+// $Id: criteria.php,v 1.6 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -341,9 +341,7 @@
     function render() {
         $value = $this->value;
         if (!in_array(strtoupper($this->operator), array('IN', 'NOT IN'))) {
-            if ( (substr($value, 0, 1) != '`') && (substr($value, -1) != '`') ) {
-                $value = "'".$value."'";
-            }
+            $value = "'".$value."'";
         }
         $clause = (!empty($this->prefix) ? "{$this->prefix}." : "") . $this->column;
         if ( !empty($this->function) ) {
Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.7 xoops2jp/html/class/module.textsanitizer.php:1.8
--- xoops2jp/html/class/module.textsanitizer.php:1.7	Mon May  1 11:37:24 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.7 2006/05/01 02:37:24 onokazu Exp $
+// $Id: module.textsanitizer.php,v 1.8 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -381,7 +381,7 @@
         if ($br != 0) {
             $text =& $this->nl2Br($text);
         }
-        $text =& $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $this->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
         return $text;
     }
 
Index: xoops2jp/html/class/snoopy.php
diff -u xoops2jp/html/class/snoopy.php:1.2 xoops2jp/html/class/snoopy.php:1.3
--- xoops2jp/html/class/snoopy.php:1.2	Mon May  1 11:37:24 2006
+++ xoops2jp/html/class/snoopy.php	Thu Jul 27 09:17:17 2006
@@ -43,6 +43,7 @@
 
 	var $host			=	"www.php.net";		// host name we are connecting to
 	var $port			=	80;					// port we are connecting to
+	var $host_port		=	"";					// port for Host Header
 	var $proxy_host		=	"";					// proxy host to use
 	var $proxy_port		=	"";					// proxy port to use
 	var $proxy_user		=	"";					// proxy user to use
@@ -144,8 +145,10 @@
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if(!empty($URI_PARTS["port"])) {
 					$this->port = $URI_PARTS["port"];
+					$this->host_port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
@@ -208,8 +211,10 @@
 				    if (!is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if(!empty($URI_PARTS["port"])) {
 					$this->port = $URI_PARTS["port"];
+					$this->host_port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
@@ -296,8 +301,10 @@
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if(!empty($URI_PARTS["port"])) {
 					$this->port = $URI_PARTS["port"];
+					$this->host_port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
@@ -367,8 +374,10 @@
 				    if (!is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if(!empty($URI_PARTS["port"])) {
 					$this->port = $URI_PARTS["port"];
+					$this->host_port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
@@ -807,8 +816,8 @@
 			$headers .= "User-Agent: ".$this->agent."\r\n";
 		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port))
-				$headers .= ":".$this->port;
+			if(!empty($this->host_port))
+				$headers .= ":".$this->host_port;
 			$headers .= "\r\n";
 		}
 		if(!empty($this->accept))
@@ -884,7 +893,9 @@
 				if(!preg_match("|\:\/\/|",$matches[2]))
 				{
 					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host;
+        			if(!empty($this->host_port))
+        			    $this->_redirectaddr .= ":".$this->host_port;
 					// eliminate double slash
 					if(!preg_match("|^/|",$matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
@@ -971,8 +982,8 @@
 		if(!empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
 		if(!empty($this->host))
-			if(!empty($this->port))
-				$headers[] = "Host: ".$this->host.":".$this->port;
+			if(!empty($this->host_port))
+				$headers[] = "Host: ".$this->host.":".$this->host_port;
 			else
 				$headers[] = "Host: ".$this->host;
 		if(!empty($this->accept))
@@ -1053,7 +1064,9 @@
 				if(!preg_match("|\:\/\/|",$matches[2]))
 				{
 					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host;
+        			if(!empty($this->host_port))
+        			    $this->_redirectaddr .= ":".$this->host_port;
 					// eliminate double slash
 					if(!preg_match("|^/|",$matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:17 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:17 +0900
Subject: [xoops-cvslog 3696] CVS update: xoops2jp/html
Message-ID: <20060727001717.A64ED2AC32B@users.sourceforge.jp>

Index: xoops2jp/html/header.php
diff -u xoops2jp/html/header.php:1.6 xoops2jp/html/header.php:1.7
--- xoops2jp/html/header.php:1.6	Mon May  1 11:37:26 2006
+++ xoops2jp/html/header.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: header.php,v 1.6 2006/05/01 02:37:26 onokazu Exp $
+// $Id: header.php,v 1.7 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -30,6 +30,14 @@
 }
 include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 if ($xoopsConfig['theme_set'] != 'default' && file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/theme.php')) {
+    //
+    // Fall back on simple protector of common.php by checking the constant that
+    // is defined in common.php
+    //
+    if (!defined("XOOPS_CACHE_PATH")) {
+        die();
+    }
+
     // the old way..
     $xoopsOption['theme_use_smarty'] = 0;
     if (file_exists(XOOPS_THEME_PATH.'/'.$xoopsConfig['theme_set'].'/language/lang-'.$xoopsConfig['language'].'.php')) {
Index: xoops2jp/html/index.php
diff -u xoops2jp/html/index.php:1.2 xoops2jp/html/index.php:1.3
--- xoops2jp/html/index.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/index.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: index.php,v 1.3 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -34,6 +34,14 @@
  **/
 include "mainfile.php";
 
+//
+// Fall back on simple protector of common.php by checking the constant that
+// is defined in common.php
+//
+if (!defined("XOOPS_CACHE_PATH")) {
+    die();
+}
+
 //check if start page is defined
 if ( isset($xoopsConfig['startpage']) && $xoopsConfig['startpage'] != "" && $xoopsConfig['startpage'] != "--" ) {
 	header('Location: '.XOOPS_URL.'/modules/'.$xoopsConfig['startpage'].'/');
Index: xoops2jp/html/misc.php
diff -u xoops2jp/html/misc.php:1.6 xoops2jp/html/misc.php:1.7
--- xoops2jp/html/misc.php:1.6	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/misc.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: misc.php,v 1.6 2005/10/24 11:44:16 onokazu Exp $
+// $Id: misc.php,v 1.7 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,7 +26,18 @@
 //  ------------------------------------------------------------------------ //
 
 include "mainfile.php";
+
+//
+// Fall back on simple protector of common.php by checking the constant that
+// is defined in common.php
+//
+if (!defined("XOOPS_CACHE_PATH")) {
+    die();
+}
+
 include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/misc.php';
+
+
 $action = isset($_GET['action']) ? trim($_GET['action']) : '';
 $action = isset($_POST['action']) ? trim($_POST['action']) : $action;
 $type = isset($_GET['type']) ? trim($_GET['type']) : '';

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:17 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:17 +0900
Subject: [xoops-cvslog 3697] CVS update: xoops2jp/html/include
Message-ID: <20060727001717.C9F872AC32C@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.5 xoops2jp/html/include/checklogin.php:1.6
--- xoops2jp/html/include/checklogin.php:1.5	Mon May  1 11:37:26 2006
+++ xoops2jp/html/include/checklogin.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: checklogin.php,v 1.5 2006/05/01 02:37:26 onokazu Exp $
+// $Id: checklogin.php,v 1.6 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.13 xoops2jp/html/include/version.php:1.14
--- xoops2jp/html/include/version.php:1.13	Mon May  1 11:37:26 2006
+++ xoops2jp/html/include/version.php	Thu Jul 27 09:17:17 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.13 2006/05/01 02:37:26 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.14 JP");
+// $Id: version.php,v 1.14 2006/07/27 00:17:17 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.15 JP");
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:18 +0900
Subject: [xoops-cvslog 3698] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060727001718.1E7302AC32C@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/finish.php
diff -u xoops2jp/html/install/language/japanese/finish.php:1.2 xoops2jp/html/install/language/japanese/finish.php:1.3
--- xoops2jp/html/install/language/japanese/finish.php:1.2	Mon May  1 11:37:27 2006
+++ xoops2jp/html/install/language/japanese/finish.php	Thu Jul 27 09:17:17 2006
@@ -5,7 +5,7 @@
 <u><b>XOOPSの使い方について</b></u>
 <p>[未記述]</p>
 <u><b>サポート</b></u>
-<p><a href='http://xoopscube.org/' target='_blank'>XOOPSCube.org</a>XOOPS Cube公式サイト（英語）か、<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>へとご訪問ください。
+<p><a href='http://xoopscube.org/' target='_blank'>XOOPSCube.org（英語）</a>か、<a href='http://xoopscube.jp/' target='_blank'>XOOPSCube.jp(日本語公式サイト）</a>へとご訪問ください。
 </p>
 ";
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:17 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:17 +0900
Subject: [xoops-cvslog 3699] CVS update: xoops2jp/html/install/class
Message-ID: <20060727001717.EED4C2AC32B@users.sourceforge.jp>

Index: xoops2jp/html/install/class/settingmanager.php
diff -u xoops2jp/html/install/class/settingmanager.php:1.2 xoops2jp/html/install/class/settingmanager.php:1.3
--- xoops2jp/html/install/class/settingmanager.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/settingmanager.php	Thu Jul 27 09:17:17 2006
@@ -29,7 +29,7 @@
 * setting manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: settingmanager.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+* @version $Id: settingmanager.php,v 1.3 2006/07/27 00:17:17 onokazu Exp $
 * @access public
 **/
 class setting_manager {
@@ -72,7 +72,7 @@
             if ( substr($filepath, -1) == "/" ) {
                 $filepath = substr($filepath, 0, -1);
             }
-            $protocol = ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
+            $protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
             $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST'];
         }
     }
@@ -268,7 +268,7 @@
 
     function getDBList()
     {
-		return array('mysql');
+        return array('mysql');
         //$dirname = '../class/database/';
         //$dirlist = array();
         //if (is_dir($dirname) && $handle = opendir($dirname)) {
Index: xoops2jp/html/install/class/textsanitizer.php
diff -u xoops2jp/html/install/class/textsanitizer.php:1.2 xoops2jp/html/install/class/textsanitizer.php:1.3
--- xoops2jp/html/install/class/textsanitizer.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/textsanitizer.php	Thu Jul 27 09:17:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: textsanitizer.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: textsanitizer.php,v 1.3 2006/07/27 00:17:17 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -34,227 +34,239 @@
 class TextSanitizer
 {
 
-	/*
-	* Constructor of this class
-	* Gets allowed html tags from admin config settings
-	* <br> should not be allowed since nl2br will be used
-	* when storing data
-	*/
-	function TextSanitizer()
-	{
-
-	}
-
-	function &getInstance()
-	{
-		static $instance;
-		if (!isset($instance)) {
-			$instance = new TextSanitizer();
-		}
-		return $instance;
-	}
-
-	function &makeClickable(&$text)
-	{
-		$patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
-		$replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
-		return preg_replace($patterns, $replacements, $text);
-	}
-
-	function &nl2Br($text)
-	{
-		return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
-	}
-
-	function &addSlashes($text, $force=false)
-	{
-		if ($force) {
-			return addslashes($text);
-		}
-		if (!get_magic_quotes_gpc()) {
-			$text =& addslashes($text);
-		}
-		return $text;
-	}
-
-	/*
-	* if magic_quotes_gpc is on, stirip back slashes
-	*/
-	function &stripSlashesGPC($text)
-	{
-		if (get_magic_quotes_gpc()) {
-			$text =& stripslashes($text);
-		}
-		return $text;
-	}
-
-	/*
-	*  for displaying data in html textbox forms
-	*/
-	function &htmlSpecialChars($text)
-	{
-		return preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
-	}
-
-	function &undoHtmlSpecialChars(&$text)
-	{
-		return preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
-	}
-
-	/*
-	*  Filters textarea form data in DB for display
-	*/
-	function &displayText($text, $html=false)
-	{
-		if (! $html) {
-			// html not allowed
-			$text =& $this->htmlSpecialChars($text);
-		}
-		$text =& $this->makeClickable($text);
-		$text =& $this->nl2Br($text);
-		return $text;
-	}
-
-	/*
-	*  Filters textarea form data submitted for preview
-	*/
-	function &previewText($text, $html=false)
-	{
-		$text =& $this->stripSlashesGPC($text);
-		return $this->displayText($text, $html);
-	}
+    /*
+    * Constructor of this class
+    * Gets allowed html tags from admin config settings
+    * <br> should not be allowed since nl2br will be used
+    * when storing data
+    */
+    function TextSanitizer()
+    {
+
+    }
+
+    function &getInstance()
+    {
+        static $instance;
+        if (!isset($instance)) {
+            $instance = new TextSanitizer();
+        }
+        return $instance;
+    }
+
+    function &makeClickable(&$text)
+    {
+        $patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
+        $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
+        $ret = preg_replace($patterns, $replacements, $text);
+        return $ret;
+    }
+
+    function &nl2Br($text)
+    {
+        $ret = preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        return $ret;
+    }
+
+    function &addSlashes($text, $force=false)
+    {
+        if ($force) {
+            $ret = addslashes($text);
+            return $ret;
+        }
+        if (!get_magic_quotes_gpc()) {
+            $text = addslashes($text);
+        }
+        return $text;
+    }
+
+    /*
+    * if magic_quotes_gpc is on, stirip back slashes
+    */
+    function &stripSlashesGPC($text)
+    {
+        if (get_magic_quotes_gpc()) {
+            $text = stripslashes($text);
+        }
+        return $text;
+    }
+
+    /*
+    *  for displaying data in html textbox forms
+    */
+    function &htmlSpecialChars($text)
+    {
+        $ret = preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
+        return $ret;
+    }
+
+    function &undoHtmlSpecialChars(&$text)
+    {
+        $ret = preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
+        return $ret;
+    }
+
+    /*
+    *  Filters textarea form data in DB for display
+    */
+    function &displayText($text, $html=false)
+    {
+        if (! $html) {
+            // html not allowed
+            $text =& $this->htmlSpecialChars($text);
+        }
+        $text =& $this->makeClickable($text);
+        $text =& $this->nl2Br($text);
+        return $text;
+    }
+
+    /*
+    *  Filters textarea form data submitted for preview
+    */
+    function &previewText($text, $html=false)
+    {
+        $text =& $this->stripSlashesGPC($text);
+        $ret = $this->displayText($text, $html);
+        return $ret;
+    }
 
 ##################### Deprecated Methods ######################
 
-	function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-	{
-		if ( $allowhtml == 0 ) {
-			$text = $this->htmlSpecialChars($text);
-		} else {
-			//$config =& $GLOBALS['xoopsConfig'];
-			//$allowed = $config['allowed_html'];
-			//$text = strip_tags($text, $allowed);
-			$text = $this->makeClickable($text);
-		}
-		if ( $smiley == 1 ) {
-			$text = $this->smiley($text);
-		}
-		if ( $bbcode == 1 ) {
-			$text = $this->xoopsCodeDecode($text);
-		}
-		$text = $this->nl2Br($text);
-		return $text;
-	}
-
-	function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-	{
-		$text = $this->oopsStripSlashesGPC($text);
-		if ( $allowhtml == 0 ) {
-			$text = $this->htmlSpecialChars($text);
-		} else {
-			//$config =& $GLOBALS['xoopsConfig'];
-			//$allowed = $config['allowed_html'];
-			//$text = strip_tags($text, $allowed);
-			$text = $this->makeClickable($text);
-		}
-		if ( $smiley == 1 ) {
-			$text = $this->smiley($text);
-		}
-		if ( $bbcode == 1 ) {
-			$text = $this->xoopsCodeDecode($text);
-		}
-		$text = $this->nl2Br($text);
-		return $text;
-	}
-
-	function makeTboxData4Save($text)
-	{
-		//$text = $this->undoHtmlSpecialChars($text);
-		return $this->addSlashes($text);
-	}
-
-	function makeTboxData4Show($text, $smiley=0)
-	{
-		$text = $this->htmlSpecialChars($text);
-		return $text;
-	}
-
-	function makeTboxData4Edit($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function makeTboxData4Preview($text, $smiley=0)
-	{
-		$text = $this->stripSlashesGPC($text);
-		$text = $this->htmlSpecialChars($text);
-		return $text;
-	}
-
-	function makeTboxData4PreviewInForm($text)
-	{
-		$text = $this->stripSlashesGPC($text);
-		return $this->htmlSpecialChars($text);
-	}
-
-	function makeTareaData4Save($text)
-	{
-		return $this->addSlashes($text);
-	}
-
-	function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
-	{
-		return $this->displayTarea($text, $html, $smiley, $xcode);
-	}
-
-	function makeTareaData4Edit($text)
-	{
-		return htmlSpecialChars($text, ENT_QUOTES);
-	}
-
-	function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
-	{
-		return $this->previewTarea($text, $html, $smiley, $xcode);
-	}
-
-	function makeTareaData4PreviewInForm($text)
-	{
-		//if magic_quotes_gpc is on, do stipslashes
-		$text = $this->stripSlashesGPC($text);
-		return htmlSpecialChars($text, ENT_QUOTES);
-	}
-
-	function makeTareaData4InsideQuotes($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function &oopsStripSlashesGPC($text)
-	{
-		return $this->stripSlashesGPC($text);
-	}
-
-	function &oopsStripSlashesRT($text)
-	{
-		if (get_magic_quotes_runtime()) {
-			$text =& stripslashes($text);
-		}
-		return $text;
-	}
-
-	function &oopsAddSlashes($text)
-	{
-		return $this->addSlashes($text);
-	}
-
-	function &oopsHtmlSpecialChars($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function &oopsNl2Br($text)
-	{
-		return $this->nl2br($text);
-	}
+    function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        $text = $this->oopsStripSlashesGPC($text);
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function makeTboxData4Save($text)
+    {
+        //$text = $this->undoHtmlSpecialChars($text);
+        return $this->addSlashes($text);
+    }
+
+    function makeTboxData4Show($text, $smiley=0)
+    {
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4Edit($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTboxData4Preview($text, $smiley=0)
+    {
+        $text = $this->stripSlashesGPC($text);
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4PreviewInForm($text)
+    {
+        $text = $this->stripSlashesGPC($text);
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTareaData4Save($text)
+    {
+        return $this->addSlashes($text);
+    }
+
+    function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        $ret = $this->displayTarea($text, $html, $smiley, $xcode);
+        return $ret;
+    }
+
+    function makeTareaData4Edit($text)
+    {
+        return htmlSpecialChars($text, ENT_QUOTES);
+    }
+
+    function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        $ret = $this->previewTarea($text, $html, $smiley, $xcode);
+        return $ret;
+    }
+
+    function makeTareaData4PreviewInForm($text)
+    {
+        //if magic_quotes_gpc is on, do stipslashes
+        $text = $this->stripSlashesGPC($text);
+        return htmlSpecialChars($text, ENT_QUOTES);
+    }
+
+    function makeTareaData4InsideQuotes($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &oopsStripSlashesGPC($text)
+    {
+        $ret = $this->stripSlashesGPC($text);
+        return $ret;
+    }
+
+    function &oopsStripSlashesRT($text)
+    {
+        if (get_magic_quotes_runtime()) {
+            $text = stripslashes($text);
+        }
+        return $text;
+    }
+
+    function &oopsAddSlashes($text)
+    {
+        $ret = $this->addSlashes($text);
+        return $ret;
+    }
+
+    function &oopsHtmlSpecialChars($text)
+    {
+        $ret = $this->htmlSpecialChars($text);
+        return $ret;
+    }
+
+    function &oopsNl2Br($text)
+    {
+        $ret = $this->nl2br($text);
+        return $ret;
+    }
 }
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:18 +0900
Subject: [xoops-cvslog 3700] CVS update: xoops2jp/html/kernel
Message-ID: <20060727001718.463292AC32D@users.sourceforge.jp>

Index: xoops2jp/html/kernel/object.php
diff -u xoops2jp/html/kernel/object.php:1.5 xoops2jp/html/kernel/object.php:1.6
--- xoops2jp/html/kernel/object.php:1.5	Mon May  1 11:37:28 2006
+++ xoops2jp/html/kernel/object.php	Thu Jul 27 09:17:18 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: object.php,v 1.5 2006/05/01 02:37:28 onokazu Exp $
+// $Id: object.php,v 1.6 2006/07/27 00:17:18 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -345,7 +345,7 @@
             }
             break;
         case XOBJ_DTYPE_ARRAY:
-            $ret =& unserialize($ret);
+            $ret = unserialize($ret);
             break;
         case XOBJ_DTYPE_SOURCE:
             switch (strtolower($format)) {

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:18 +0900
Subject: [xoops-cvslog 3701] CVS update: xoops2jp/html/language/japanese
Message-ID: <20060727001718.6D1032AC32B@users.sourceforge.jp>

Index: xoops2jp/html/language/japanese/xoopsmailerlocal.php
diff -u xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.2 xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.3
--- xoops2jp/html/language/japanese/xoopsmailerlocal.php:1.2	Mon Sep  5 05:46:09 2005
+++ xoops2jp/html/language/japanese/xoopsmailerlocal.php	Thu Jul 27 09:17:18 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmailerlocal.php,v 1.2 2005/09/04 20:46:09 onokazu Exp $
+// $Id: xoopsmailerlocal.php,v 1.3 2006/07/27 00:17:18 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -35,6 +35,7 @@
         $this->reset();
         $this->charSet = 'iso-2022-jp';
         $this->encoding = '7bit';
+		$this->multimailer->CharSet = $this->charSet;
     }
 
     function encodeFromName($text){
@@ -62,7 +63,7 @@
     --------------------------------------*/
     function STRtoJIS($str, $from_charset){
         if (function_exists('mb_convert_encoding')) { //Use mb_string extension if exists.
-            $str_JIS  = mb_convert_encoding($str, "ISO-2022-JP", $from_charset);
+            $str_JIS  = mb_convert_encoding($str, "ISO-2022-JP", $from_charset);
         } else if ($from_charset=='EUC-JP') {
             $str_JIS = '';
             $mode = 0;
@@ -115,27 +116,71 @@
         }
     }
 
-    function addr_format($addr) {
+    function AddrFormat($addr) {
         if(empty($addr[1])) {
             $formatted = $addr[0];
         } else {
-            $formatted = sprintf('%s <%s>', $this->encode_header($addr[1], 'text', true), $addr[0]);
+            $formatted = $this->EncodeHeader($addr[1], 'text') . " <" . 
+                         $addr[0] . ">";
         }
         return $formatted;
     }
 
-    function encode_header ($str, $position = 'text', $force=false) {
-        if (function_exists('mb_convert_encoding')) { //Use mb_string extension if exists.
-            if ($this->needs_encode || $force) {
-                $encoded = mb_convert_encoding($str, _CHARSET, mb_detect_encoding($str));
-                $encoded = mb_encode_mimeheader($encoded, "ISO-2022-JP", "B", "\n");
+    function EncodeHeader ($str, $position = 'text', $force=false) {
+        if (!preg_match('/^4\.4\.[01]([^0-9]+|$)/',PHP_VERSION)) {
+            if (function_exists('mb_convert_encoding')) { //Use mb_string extension if exists.
+                if ($this->needs_encode || $force) {
+                    $encoded = mb_convert_encoding($str, _CHARSET, mb_detect_encoding($str));
+                    $encoded = mb_encode_mimeheader($encoded, "ISO-2022-JP", "B", "\n");
+                } else {
+                    $encoded = $str;
+                }
             } else {
-                $encoded = $str;
+                $encoded = parent::EncodeHeader($str, $position);
             }
+            return $encoded;
         } else {
-            $encoded = parent::encode_header($str, $position);
-        }
-        return $encoded;
+            //Following Logic are made for recovering PHP4.4.0 and 4.4.1 mb_encode_mimeheader() bug.
+            //TODO: If mb_encode_mimeheader() bug is fixed. Replace this to simple logic.
+            $encode_charset = strtoupper($this->CharSet);
+            if (function_exists('mb_convert_encoding')) { //Using mb_string extension if exists.
+                if ($this->needs_encode || $force) {
+                	$str_encoding = mb_detect_encoding($str, 'ASCII,'.$encode_charset );
+                    if ($str_encoding == 'ASCII') { // Return original if string from only ASCII chars.
+                        return $str;
+                    } else if ($str_encoding != $encode_charset) { // Maybe this case may not occur.
+                        $str = mb_convert_encoding($str, $encode_charset, $str_encoding);
+                    }
+                    $cut_start = 0;
+                    $encoded ='';
+                    $cut_length = floor((76-strlen('Subject: =?'.$encode_charset.'?B?'.'?='))/4)*3;
+                    while($cut_start < strlen($str)) {
+                        $partstr = mb_strcut ( $str, $cut_start, $cut_length, $encode_charset);
+                        $partstr_length = strlen($partstr);
+                        if (!$partstr_length) break;
+                        if ($encode_charset == 'ISO-2022-JP') { 
+                            //Should Adjust next cutting place for SO & SI char insertion.
+                            if ((substr($partstr, 0, 3)===chr(27).'$B') 
+                              && (substr($str, $cut_start, 3) !== chr(27).'$B')) {
+                                $partstr_length -= 3;
+                            }
+                            if ((substr($partstr,-3)===chr(27).'(B') 
+                              && (substr($str, $cut_start+$partstr_length-3, 3) !== chr(27).'(B')) {
+                                $partstr_length -= 3;
+                            }
+                        }
+                        if ($cut_start) $encoded .= "\r\n\t";
+                        $encoded .= '=?' . $encode_charset . '?B?' . base64_encode($partstr) . '?=';
+                        $cut_start += $partstr_length;
+                    }
+                } else {
+                    $encoded = $str;
+                }
+            } else {
+                $encoded = parent::EncodeHeader($str, $position);
+            }
+            return $encoded;
+        }
     }
 }
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:18 +0900
Subject: [xoops-cvslog 3702] CVS update:
	xoops2jp/html/modules/system/admin/mailusers
Message-ID: <20060727001718.91C912AC32C@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/mailusers/mailusers.php
diff -u xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5 xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.6
--- xoops2jp/html/modules/system/admin/mailusers/mailusers.php:1.5	Mon May  1 11:37:30 2006
+++ xoops2jp/html/modules/system/admin/mailusers/mailusers.php	Thu Jul 27 09:17:18 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mailusers.php,v 1.5 2006/05/01 02:37:30 onokazu Exp $
+// $Id: mailusers.php,v 1.6 2006/07/27 00:17:18 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -218,7 +218,6 @@
                 $subject_hidden = new XoopsFormHidden("mail_subject", $myts->makeTboxData4PreviewInForm($_POST['mail_subject']));
                 $body_hidden = new XoopsFormHidden("mail_body", $myts->makeTareaData4PreviewInForm($_POST['mail_body']));
                 $start_hidden = new XoopsFormHidden("mail_start", $mail_end);
-                $to_hidden = new XoopsFormHidden("mail_send_to[]", "mail");
                 $op_hidden = new XoopsFormHidden("op", "send");
                 $submit_button = new XoopsFormButton("", "mail_submit", _AM_SENDNEXT, "submit");
                 $sent_label = new XoopsFormLabel(_AM_SENT, sprintf(_AM_SENTNUM, $_POST['mail_start']+1, $mail_end, $added_count));
@@ -233,7 +232,14 @@
                 $form->addElement($femail_hidden);
                 $form->addElement($subject_hidden);
                 $form->addElement($body_hidden);
-                $form->addElement($to_hidden);
+                if (in_array('mail', $_POST['mail_send_to'])) {
+                    $to_hidden = new XoopsFormHidden('mail_send_to[]', 'mail');
+                    $form->addElement($to_hidden);
+                }
+                if (in_array('pm', $_POST['mail_send_to']) && empty($_POST['mail_inactive'])) {
+                    $to_hidden = new XoopsFormHidden('mail_send_to[]', 'pm');
+                    $form->addElement($to_hidden);
+                }
                 $form->addElement($op_hidden);
                 $form->addElement($start_hidden);
                 $form->addElement($submit_button);

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:17:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:17:18 +0900
Subject: [xoops-cvslog 3703] CVS update:
	xoops2jp/html/modules/system/admin/tplsets
Message-ID: <20060727001718.B723F2AC32B@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/tplsets/main.php
diff -u xoops2jp/html/modules/system/admin/tplsets/main.php:1.5 xoops2jp/html/modules/system/admin/tplsets/main.php:1.6
--- xoops2jp/html/modules/system/admin/tplsets/main.php:1.5	Mon Sep  5 05:46:11 2005
+++ xoops2jp/html/modules/system/admin/tplsets/main.php	Thu Jul 27 09:17:18 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.5 2005/09/04 20:46:11 onokazu Exp $
+// $Id: main.php,v 1.6 2006/07/27 00:17:18 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,7 +99,7 @@
                 }
                 $not_installed = array_diff(array_keys($installed_mods), array_keys($tplstats));
             } else {
-                $not_installed =& array_keys($installed_mods);
+                $not_installed = array_keys($installed_mods);
             }
             foreach ($not_installed as $ni) {
                 $module =& $module_handler->getByDirname($ni);
@@ -286,8 +286,8 @@
         $tplfile =& $tpltpl_handler->get($id, true);
         if (is_object($tplfile)) {
             $tplset = $tplfile->getVar('tpl_tplset');
-	        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
-	        $tplset4url = urlencode($tplset);
+            $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
+            $tplset4url = urlencode($tplset);
             $tform = array('tpl_tplset' => $tplset, 'tpl_id' => $id, 'tpl_file' => $tplfile->getVar('tpl_file'), 'tpl_desc' => $tplfile->getVar('tpl_desc'), 'tpl_lastmodified' => $tplfile->getVar('tpl_lastmodified'), 'tpl_source' => $tplfile->getVar('tpl_source', 'E'), 'tpl_module' => $tplfile->getVar('tpl_module'));
             include_once XOOPS_ROOT_PATH.'/modules/system/admin/tplsets/tplform.php';
             xoops_cp_header();

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:34:59 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:34:59 +0900
Subject: [xoops-cvslog 3704] CVS update: xoops2jp/extras
Message-ID: <20060727003459.BDD1F2AC333@users.sourceforge.jp>

Index: xoops2jp/extras/login.php
diff -u xoops2jp/extras/login.php:1.4 xoops2jp/extras/login.php:1.4.4.1
--- xoops2jp/extras/login.php:1.4	Mon May  1 11:37:24 2006
+++ xoops2jp/extras/login.php	Thu Jul 27 09:34:59 2006
@@ -62,6 +62,8 @@
         $user->setVar('last_login', time());
         if (!$member_handler->insertUser($user)) {
         }
+        require_once XOOPS_ROOT_PATH . '/include/session.php';
+        xoops_session_regenerate();
         $_SESSION = array();
         $_SESSION['xoopsUserId'] = $user->getVar('uid');
         $_SESSION['xoopsUserGroups'] = $user->getGroups();

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:34:59 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:34:59 +0900
Subject: [xoops-cvslog 3705] CVS update: xoops2jp/html/include
Message-ID: <20060727003459.E1E8E2AC337@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.6 xoops2jp/html/include/checklogin.php:1.6.2.1
--- xoops2jp/html/include/checklogin.php:1.6	Thu Jul 27 09:17:17 2006
+++ xoops2jp/html/include/checklogin.php	Thu Jul 27 09:34:59 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: checklogin.php,v 1.6 2006/07/27 00:17:17 onokazu Exp $
+// $Id: checklogin.php,v 1.6.2.1 2006/07/27 00:34:59 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -63,6 +63,8 @@
     $user->setVar('last_login', time());
     if (!$member_handler->insertUser($user)) {
     }
+    require_once XOOPS_ROOT_PATH . '/include/session.php';
+    xoops_session_regenerate();
     $_SESSION = array();
     $_SESSION['xoopsUserId'] = $user->getVar('uid');
     $_SESSION['xoopsUserGroups'] = $user->getGroups();
Index: xoops2jp/html/include/session.php
diff -u /dev/null xoops2jp/html/include/session.php:1.1.4.1
--- /dev/null	Thu Jul 27 09:34:59 2006
+++ xoops2jp/html/include/session.php	Thu Jul 27 09:34:59 2006
@@ -0,0 +1,36 @@
+<?php
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit();
+}
+
+if (!function_exists('session_regenerate_id')) {
+    if (!defined('XOOPS_SALT')) {
+        define('XOOPS_SALT', substr(md5(XOOPS_DB_PREFIX . XOOPS_DB_USER . XOOPS_ROOT_PATH), 5, 8));
+    }
+    // session_regenerate_id compatible function for PHP Version< PHP4.3.2
+    function session_regenerate_id() {
+        srand(microtime() * 100000);
+        $random = md5(XOOPS_SALT . uniqid(rand(), true));
+        if (session_id($random)) {
+           return true;
+        } else {
+           return false;
+        }
+    }
+}
+
+// Regenerate New Session ID & Delete OLD Session
+function xoops_session_regenerate() {
+    $old_sessid = session_id();
+    session_regenerate_id();
+    $new_sessid = session_id();
+    session_id($old_sessid);
+    session_destroy();
+    $old_session = $_SESSION;
+    session_id($new_sessid);
+    $sess_handler =& xoops_gethandler('session');
+    session_set_save_handler(array(&$sess_handler, 'open'), array(&$sess_handler, 'close'), array(&$sess_handler, 'read'), array(&$sess_handler, 'write'), array(&$sess_handler, 'destroy'), array(&$sess_handler, 'gc'));
+    session_start();
+    $_SESSION = $old_session;
+}
+?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:35:47 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:35:47 +0900
Subject: [xoops-cvslog 3706] CVS update: xoops2jp/html/install/class
Message-ID: <20060727003547.7882B2AC31E@users.sourceforge.jp>

Index: xoops2jp/html/install/class/settingmanager.php
diff -u xoops2jp/html/install/class/settingmanager.php:1.3 xoops2jp/html/install/class/settingmanager.php:1.3.2.1
--- xoops2jp/html/install/class/settingmanager.php:1.3	Thu Jul 27 09:17:17 2006
+++ xoops2jp/html/install/class/settingmanager.php	Thu Jul 27 09:35:47 2006
@@ -29,7 +29,7 @@
 * setting manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: settingmanager.php,v 1.3 2006/07/27 00:17:17 onokazu Exp $
+* @version $Id: settingmanager.php,v 1.3.2.1 2006/07/27 00:35:47 onokazu Exp $
 * @access public
 **/
 class setting_manager {
@@ -72,7 +72,7 @@
             if ( substr($filepath, -1) == "/" ) {
                 $filepath = substr($filepath, 0, -1);
             }
-            $protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
+            $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
             $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST'];
         }
     }

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:36:20 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:36:20 +0900
Subject: [xoops-cvslog 3707] CVS update: xoops2jp/docs
Message-ID: <20060727003620.A94352AC31E@users.sourceforge.jp>

Index: xoops2jp/docs/CHANGES.txt
diff -u xoops2jp/docs/CHANGES.txt:1.13 xoops2jp/docs/CHANGES.txt:1.13.2.1
--- xoops2jp/docs/CHANGES.txt:1.13	Thu Jul 27 09:17:17 2006
+++ xoops2jp/docs/CHANGES.txt	Thu Jul 27 09:36:20 2006
@@ -1,6 +1,12 @@
 XOOPS v2 Changelog
 ============================
 
+2006/ 7/27: Version 2.0.16 JP
+===============================
+ - Added routine to regenerate session id after succeessful login (extras/login.php, html/include/checklogin.php, html/include/session.php)
+ - Fixed PHP notice error (html/install/class/settingmanager.php)
+
+
 2006/ 6/ 9: Version 2.0.15 JP
 ===============================
  - Fixed user message not being sent to PM when over 100 users to send(modules/system/mailusers/mailusers.php)

From onokazu ＠ users.sourceforge.jp  Thu Jul 27 09:36:20 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 27 Jul 2006 09:36:20 +0900
Subject: [xoops-cvslog 3708] CVS update: xoops2jp/html/include
Message-ID: <20060727003620.CA62D2AC328@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.14 xoops2jp/html/include/version.php:1.14.2.1
--- xoops2jp/html/include/version.php:1.14	Thu Jul 27 09:17:17 2006
+++ xoops2jp/html/include/version.php	Thu Jul 27 09:36:20 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.14 2006/07/27 00:17:17 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.15 JP");
+// $Id: version.php,v 1.14.2.1 2006/07/27 00:36:20 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.16 JP");
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 14:58:12 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 14:58:12 +0900
Subject: [xoops-cvslog 3709] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060727055812.A5C732AC374@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php:1.1.2.7	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/AbstractModuleInstallAction.class.php	Thu Jul 27 14:58:11 2006
@@ -1,12 +1,14 @@
 <?php
 /**
- * @version
+ * @package Legacy
+ * @version $Id: AbstractModuleInstallAction.class.php,v 1.1.2.8 2006/07/27 05:58:11 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
 
 /**
- * This is abstract class for 3 action classes that are Install, Update and Uninstall.
+ * This is abstract class for 3 action classes that are Install, Update and
+ * Uninstall.
  */
 class Legacy_AbstractModuleInstallAction extends Legacy_Action
 {
@@ -50,6 +52,10 @@
 
 	function execute(&$controller, &$xoopsUser)
 	{
+		if (isset($_REQUEST['_form_control_cancel'])) {
+			return LEGACY_FRAME_VIEW_CANCEL;
+		}
+		
 		$this->mActionForm->fetch();
 		$this->mActionForm->validate();
 		

From minahito ＠ users.sourceforge.jp  Thu Jul 27 14:58:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 14:58:51 +0900
Subject: [xoops-cvslog 3710] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060727055851.954B22AC374@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.10
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.9	Fri Jun 23 10:28:29 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Thu Jul 27 14:58:51 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.9 2006/06/23 01:28:29 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.10 2006/07/27 05:58:51 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -17,6 +17,27 @@
 	var $mLicence;
 	var $mLicenceText;
 
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mInstallSuccess = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mInstallFail = null;
+	
+	function Legacy_ModuleInstallAction($flag)
+	{
+		parent::Legacy_AbstractModuleInstallAction($flag);
+		
+		$this->mInstallSuccess =& new XCube_NewDelegate();
+		$this->mInstallSuccess->register('Legacy_ModuleInstallAction.InstallSuccess');
+		
+		$this->mInstallFail =& new XCube_NewDelegate();
+		$this->mInstallFail->register('Legacy_ModuleInstallAction.InstallFail');
+	}
+	
 	function &_getInstaller($dirname)
 	{
 		$installer =& new Legacy_ModuleInstaller($dirname);
@@ -38,6 +59,9 @@
 		$file = $this->mModuleObject->modinfo['installer']['licence']['file'];
 		$language = $root->mController->getConfig('language');
 
+		//
+		// TODO Replace with language manager.
+		//
 		$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file;
 		if (!file_exists($path)) {
 			$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "/language/english/" . $file;
@@ -51,8 +75,14 @@
 	
 	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
 	{
-		$root =& XCube_Root::getSingleton();
-		$root->mEventManager->raiseEvent("Module.Legacy.ModuleInstall.Success", $this, $this->mModuleObject);
+		if (!$this->mLog->hasError()) {
+			$this->mInstallSuccess->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject));
+		}
+		else {
+			$this->mInstallFail->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleInstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject));
+		}
 
 		$renderer->setTemplateName("module_install_success.html");
 		$renderer->setAttribute('module', $this->mLog->mModuleObject);
@@ -81,6 +111,11 @@
 		$renderer->setAttribute('module', $this->mModuleObject);
 		$renderer->setAttribute('actionForm', $this->mActionForm);
 	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$renderer)
+	{
+		$controller->executeForward("./index.php?action=InstallList");
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 14:58:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 14:58:56 +0900
Subject: [xoops-cvslog 3711] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060727055856.CA6092AC374@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php:1.1.2.5	Tue May 30 12:55:18 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUpdateAction.class.php	Thu Jul 27 14:58:56 2006
@@ -1,6 +1,7 @@
 <?php
 /**
- * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.5 2006/05/30 03:55:18 minahito Exp $
+ * @package Legacy
+ * @version $Id: ModuleUpdateAction.class.php,v 1.1.2.6 2006/07/27 05:58:56 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -11,6 +12,27 @@
 
 class Legacy_ModuleUpdateAction extends Legacy_AbstractModuleInstallAction
 {
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mUpdateSuccess = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mUpdateFail = null;
+
+	function Legacy_ModuleUpdateAction($flag)
+	{
+		parent::Legacy_AbstractModuleInstallAction($flag);
+		
+		$this->mUpdateSuccess =& new XCube_NewDelegate();
+		$this->mUpdateSuccess->register('Legacy_ModuleUpdateAction.UpdateSuccess');
+		
+		$this->mUpdateFail =& new XCube_NewDelegate();
+		$this->mUpdateFail->register('Legacy_ModuleUpdateAction.UpdateFail');
+	}
+
 	function &_getInstaller($dirname)
 	{
 		$installer =& new Legacy_ModuleUpdater($dirname);
@@ -23,20 +45,32 @@
 		$this->mActionForm->prepare();
 	}
 	
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
 	{
-		$root =& XCube_Root::getSingleton();
-		$root->mEventManager->raiseEvent("Module.Legacy.ModuleUpdate.Success", $this, $this->mModuleObject);
+		if (!$this->mLog->hasError()) {
+			$this->mUpdateSuccess->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject));
+		}
+		else {
+			$this->mUpdateFail->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUpdate.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject));
+		}
 		
 		$renderer->setTemplateName("module_update_success.html");
-		$renderer->setAttribute('log',$this->mLog->mMessages);
+		$renderer->setAttribute('module', $this->mLog->mModuleObject);
+		$renderer->setAttribute('log', $this->mLog->mMessages);
 	}
 
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
 	{
 		$renderer->setTemplateName("module_update.html");
-		$renderer->setAttribute('module',$this->mModuleObject);
-		$renderer->setAttribute('actionForm',$this->mActionForm);
+		$renderer->setAttribute('module', $this->mModuleObject);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
+	}
+	
+	function executeViewCancel(&$controller, &$xoopsUser, &$renderer)
+	{
+		$controller->executeForward("./index.php?action=ModuleList");
 	}
 }
 
Index: xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php:1.1.2.5	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleUninstallAction.class.php	Thu Jul 27 14:58:56 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.5 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: ModuleUninstallAction.class.php,v 1.1.2.6 2006/07/27 05:58:56 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -14,6 +14,27 @@
  */
 class Legacy_ModuleUninstallAction extends Legacy_AbstractModuleInstallAction
 {
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mUninstallSuccess = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mUninstallFail = null;
+	
+	function Legacy_ModuleUninstallAction($flag)
+	{
+		parent::Legacy_AbstractModuleInstallAction($flag);
+		
+		$this->mUninstallSuccess =& new XCube_NewDelegate();
+		$this->mUninstallSuccess->register('Legacy_ModuleUninstallAction.UninstallSuccess');
+		
+		$this->mUninstallFail =& new XCube_NewDelegate();
+		$this->mUninstallFail->register('Legacy_ModuleUninstallAction.UninstallFail');
+	}
+
 	function &_getInstaller($dirname)
 	{
 		$installer =& new Legacy_ModuleUninstaller($dirname);
@@ -26,22 +47,37 @@
 		$this->mActionForm->prepare();
 	}
 
-	function executeViewSuccess(&$controller,&$xoopsUser,&$renderer)
+	function executeViewSuccess(&$controller, &$xoopsUser, &$renderer)
 	{
+		if (!$this->mLog->hasError()) {
+			$this->mUninstallSuccess->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Success'), new XCube_Ref($this->mModuleObject));
+		}
+		else {
+			$this->mUninstallFail->call(new XCube_Ref($this->mModuleObject));
+			XCube_DelegateUtils::call('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($this->mModuleObject->get('dirname') . '.Fail'), new XCube_Ref($this->mModuleObject));
+		}
+
 		$renderer->setTemplateName("module_uninstall_success.html");
-		$renderer->setAttribute('log',$this->mLog->mMessages);
+		$renderer->setAttribute('module',$this->mModuleObject);
+		$renderer->setAttribute('log', $this->mLog->mMessages);
 	}
 
-	function executeViewIndex(&$controller,&$xoopsUser,&$renderer)
+	function executeViewIndex(&$controller, &$xoopsUser, &$renderer)
 	{
 		$renderer->setTemplateName("module_uninstall.html");
-		$renderer->setAttribute('actionForm',$this->mActionForm);
-		$renderer->setAttribute('module',$this->mModuleObject);
+		$renderer->setAttribute('actionForm', $this->mActionForm);
+		$renderer->setAttribute('module', $this->mModuleObject);
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$renderer)
+	{
+		$this->executeViewIndex(&$controller, &$xoopsUser, &$renderer);
 	}
 
-	function executeViewInput(&$controller,&$xoopsUser,&$renderer)
+	function executeViewCancel(&$controller, &$xoopsUser, &$renderer)
 	{
-		$this->executeViewIndex(&$controller,&$xoopsUser,&$renderer);
+		$controller->executeForward("./index.php?action=ModuleList");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 27 14:59:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 14:59:14 +0900
Subject: [xoops-cvslog 3712] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060727055914.EBF282AC3A1@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_install.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/module_install.html:1.1.2.4	Wed Jun 14 00:55:25 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install.html	Thu Jul 27 14:59:14 2006
@@ -7,31 +7,31 @@
 
 <h3><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></h3>
 
-<div class="confirm"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}></div>
+<div class="confirm"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_ADVICE|replace:"_%s_":$module->getShow('name','e')}></div>
 
 <form method="POST">
 <{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<input type="hidden" name="dirname" value="<{$module->getShow('dirname')}>" />
 <table class="outer">
   <tr>
     <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODINSTALL_CONF}></th>
   </tr>
   <tr>
     <td class="head" rowspan="6" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" />
       <div><{$module->modinfo.name|escape}></div>
     </td>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getShow('dirname')}></td>
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
+	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->get('version') format="%.2f"}>
+	<{if $module->get('version') != $module->modinfo.version * 100 }>
 	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
 	<{/if}>
 	</td>
@@ -39,8 +39,8 @@
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
 	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('mid')}>
-	    <{$module->getVar('mid')}>
+	  <{if $module->get('mid')}>
+	    <{$module->getShow('mid')}>
 	  <{else}>
 	    --
 	  <{/if}>
@@ -49,8 +49,8 @@
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
 	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+	  <{if $module->get('last_update')}>
+        <{$module->get('last_update')|xoops_formattimestamp:l}>
       <{else}>
         --
       <{/if}>
@@ -62,8 +62,8 @@
   </tr>
   <tr>
     <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+      <input class="formButton" type="submit" value="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" />
+      <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/base/admin/templates/module_update_success.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_update_success.html:1.1.2.5	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update_success.html	Thu Jul 27 14:59:14 2006
@@ -10,11 +10,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li style="color:red;"><{$msg.message}></li>
+    <li style="color:red;"><{$msg.message|escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li style="color:blue;"><{$msg.message}></li>
+    <li style="color:blue;"><{$msg.message|escape}></li>
   <{else}>
-    <li><{$msg.message}></li>
+    <li><{$msg.message|escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/base/admin/templates/module_uninstall.html
diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/module_uninstall.html:1.1.2.1	Thu Feb  2 21:27:06 2006
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall.html	Thu Jul 27 14:59:14 2006
@@ -7,33 +7,34 @@
 <h3><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></h3>
 
 <ul>
-  <li><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getVar('name','e')}>
+  <li><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_ADVICE|replace:"_%s_":$module->getShow('name')}>
 </ul>
 
 <form method="POST">
 <{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<{xoops_input type=hidden name=dirname value=$module->get('dirname')}>
+
 <table class="outer">
   <tr>
     <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUNINSTALL_CONF}></th>
   </tr>
   <tr>
     <td rowspan="6" class="head" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" />
       <div><{$module->modinfo.name|escape}></div>
     </td>
     <td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-    <td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+    <td class="<{cycle values='odd,even'}>"><{$module->getShow('dirname')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-      <{if $module->getVar('version') != $module->modinfo.version * 100 }>
+      <{math equation="v/100" v=$module->get('version') format="%.2f"}>
+      <{if $module->get('version') != $module->modinfo.version * 100 }>
         &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
       <{/if}>
 	</td>
@@ -41,8 +42,8 @@
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
 	<td class="<{cycle values='odd,even'}>">
-      <{if $module->getVar('mid')}>
-        <{$module->getVar('mid')}>
+      <{if $module->get('mid')}>
+        <{$module->getShow('mid')}>
       <{else}>
         --
       <{/if}>
@@ -51,8 +52,8 @@
   <tr>
     <td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
     <td class="<{cycle values='odd,even'}>">
-      <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+      <{if $module->get('last_update')}>
+        <{$module->get('last_update')|xoops_formattimestamp:l}>
       <{else}>
         --
       <{/if}>
@@ -69,7 +70,8 @@
   </tr>
   <tr>
     <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" class="formButton" />
+      <input class="formButton" type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" />
+      <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/base/admin/templates/module_install_success.html
diff -u xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/module_install_success.html:1.1.2.7	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/module_install_success.html	Thu Jul 27 14:59:14 2006
@@ -12,11 +12,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li style="color:red;"><{$msg.message}></li>
+    <li style="color:red;"><{$msg.message|escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li style="color:blue;"><{$msg.message}></li>
+    <li style="color:blue;"><{$msg.message|escape}></li>
   <{else}>
-    <li><{$msg.message}></li>
+    <li><{$msg.message|escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html
diff -u xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html:1.1.2.4	Mon Jan 30 23:53:50 2006
+++ xoops2jp/html/modules/base/admin/templates/module_uninstall_success.html	Thu Jul 27 14:59:14 2006
@@ -10,11 +10,11 @@
 <ul>
 <{foreach item=msg from=$log}>
   <{if $msg.type=="error"}>
-    <li style="color:red;"><{$msg.message}></li>
+    <li style="color:red;"><{$msg.message|escape}></li>
   <{elseif $msg.type=="warning"}>
-    <li style="color:blue;"><{$msg.message}></li>
+    <li style="color:blue;"><{$msg.message|escape}></li>
   <{else}>
-    <li><{$msg.message}></li>
+    <li><{$msg.message|escape}></li>
   <{/if}>
 <{/foreach}>
 </ul>
Index: xoops2jp/html/modules/base/admin/templates/module_update.html
diff -u xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/module_update.html:1.1.2.3	Wed Jun 14 00:55:25 2006
+++ xoops2jp/html/modules/base/admin/templates/module_update.html	Thu Jul 27 14:59:14 2006
@@ -6,31 +6,31 @@
 
 <h3><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></h3>
 
-<div class="confirm"><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getVar('name','e')}></div>
+<div class="confirm"><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_ADVICE|replace:"_%s_":$module->getShow('name')}></div>
 
 <form method="POST">
 <{xoops_token form=$actionForm}>
-<input type="hidden" name="dirname" value="<{$module->getVar('dirname')|escape}>" />
+<{xoops_input type=hidden name=dirname value=$module->get('dirname')}>
 <table class="outer">
   <tr>
     <th colspan="3"><{$smarty.const._MD_A_BASE_LANG_MODUPDATE_CONF}></th>
   </tr>
   <tr>
     <td class="head" rowspan="6" style="text-align:center;">
-      <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" />
+      <img src="<{$xoops_url}>/modules/<{$module->getShow('dirname')}>/<{$module->modinfo.image}>" />
       <div><{$module->modinfo.name|escape}></div>
     </td>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('name',e)}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getShow('name')}></td>
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MOD_DIR_NAME}></td>
-	<td class="<{cycle values='odd,even'}>"><{$module->getVar('dirname',e)}></td>
+	<td class="<{cycle values='odd,even'}>"><{$module->getShow('dirname')}></td>
   </tr>
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_VERSION}></td>
-	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->getVar('version') format="%.2f"}>
-	<{if $module->getVar('version') != $module->modinfo.version * 100 }>
+	<td class="<{cycle values='odd,even'}>"><{math equation="v/100" v=$module->get('version') format="%.2f"}>
+	<{if $module->get('version') != $module->modinfo.version * 100 }>
 	  &raquo; <b style="color:red;"><{math equation=$module->modinfo.version format="%.2f"}></b>
 	<{/if}>
 	</td>
@@ -38,8 +38,8 @@
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_MID}></td>
 	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('mid')}>
-	    <{$module->getVar('mid')}>
+	  <{if $module->get('mid')}>
+	    <{$module->getShow('mid')}>
 	  <{else}>
 	    --
 	  <{/if}>
@@ -48,8 +48,8 @@
   <tr>
 	<td class="head"><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}></td>
 	<td class="<{cycle values='odd,even'}>">
-	  <{if $module->getVar('last_update')}>
-        <{$module->getVar('last_update')|xoops_formattimestamp:l}>
+	  <{if $module->get('last_update')}>
+        <{$module->get('last_update')|xoops_formattimestamp:l}>
       <{else}>
         --
       <{/if}>
@@ -61,8 +61,8 @@
   </tr>
   <tr>
     <td class="foot" colspan="3">
-      <input type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" class="formButton" />
-      <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+      <input class="formButton" type="submit" value="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" />
+      <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
     </td>
   </tr>
 </table>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 14:59:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 14:59:40 +0900
Subject: [xoops-cvslog 3713] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060727055940.452A92AC3A1@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.8 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.9
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.8	Wed Jul 26 19:54:02 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Thu Jul 27 14:59:40 2006
@@ -13,6 +13,8 @@
 define ("LEGACY_FRAME_VIEW_ERROR", 3);
 define ("LEGACY_FRAME_VIEW_INDEX", 4);
 define ("LEGACY_FRAME_VIEW_INPUT", 5);
+define ("LEGACY_FRAME_VIEW_PREVIEW", 6);
+define ("LEGACY_FRAME_VIEW_CANCEL", 7);
 
 //
 // Constatns for the mode of the frame.
@@ -126,6 +128,14 @@
 			case LEGACY_FRAME_VIEW_INPUT:
 				$this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
 				break;
+
+			case LEGACY_FRAME_VIEW_PREVIEW:
+				$this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+
+			case LEGACY_FRAME_VIEW_CANCEL:
+				$this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
 		}
 	}
 }
@@ -189,6 +199,14 @@
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 	}
+
+	function executeViewPreview(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 15:00:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 15:00:23 +0900
Subject: [xoops-cvslog 3714] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060727060023.C2E042AC374@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_notification_select_form.html
diff -u xoops2jp/html/modules/base/templates/legacy_notification_select_form.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_notification_select_form.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_notification_select_form.html:1.1.2.1	Wed Jul 26 19:55:37 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_select_form.html	Thu Jul 27 15:00:23 2006
@@ -29,7 +29,7 @@
   </tr>
 </table>
 <div align="center">
-<{$smarty.const._NOT_NOTIFICATIONMETHODIS}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url}>"><{$smarty.const._NOT_CHANGE}></a>]
+<{$smarty.const._NOT_NOTIFICATIONMETHODIS}>:&nbsp;<{$user_method}>&nbsp;&nbsp;[<a href="<{$editprofile_url|escape}>"><{$smarty.const._NOT_CHANGE}></a>]
 </div>
 </form>
 <{/if}>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 15:11:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 15:11:56 +0900
Subject: [xoops-cvslog 3715] CVS update:
	xoops2jp/html/modules/legacyRender/preload
Message-ID: <20060727061156.57F7F2AC32E@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php
diff -u xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php:1.1.2.1	Sat Jul  8 11:20:47 2006
+++ xoops2jp/html/modules/legacyRender/preload/Cacheclear.class.php	Thu Jul 27 15:11:56 2006
@@ -1,14 +1,19 @@
 <?php
+/**
+ * @package legacyRender
+ * @version $Id: Cacheclear.class.php,v 1.1.2.2 2006/07/27 06:11:56 minahito Exp $
+ */
+
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 class legacyRender_Cacheclear extends XCube_ActionFilter {
     function preBlockFilter()
     {
-        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleInstall.Success', new XCube_Delegate("legacyRender_Cacheclear", "callback"));
-        $this->mController->mRoot->mEventManager->add('Module.Legacy.ModuleUpdate.Success', new XCube_Delegate("legacyRender_Cacheclear", "callback"));
+		$this->mController->mRoot->mDelegateManager->add('Legacy_ModuleInstallAction.InstallSuccess', 'legacyRender_Cacheclear::cacheClear');
+		$this->mController->mRoot->mDelegateManager->add('Legacy_ModuleUpdateAction.UpdateSuccess', 'legacyRender_Cacheclear::cacheClear');
     }
     
-    function callback(&$action, &$module)
+    function cacheClear(&$module)
 	{
 		$handler =& xoops_getmodulehandler('tplfile', 'legacyRender');
 		

From nobunobu ＠ users.sourceforge.jp  Thu Jul 27 15:53:12 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 27 Jul 2006 15:53:12 +0900
Subject: [xoops-cvslog 3716] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060727065312.BCDD62AC3C2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.52 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.53
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.52	Wed Jul 26 19:54:43 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Thu Jul 27 15:53:12 2006
@@ -821,7 +821,7 @@
 				//
 				// Fall back process for login fail.
 				//
-				$this->executeRedirect(XOOPS_ROOT_PATH . "/user.php", 1, _US_INCORRECTLOGIN);
+				$this->executeRedirect(XOOPS_URL . "/user.php", 1, _US_INCORRECTLOGIN);
 			}
 		}
 		else {

From nobunobu ＠ users.sourceforge.jp  Thu Jul 27 15:54:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Thu, 27 Jul 2006 15:54:48 +0900
Subject: [xoops-cvslog 3717] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060727065448.5FF7C2AC3CE@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php
diff -u xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.4 xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.5
--- xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php:1.1.2.4	Thu Jul 20 17:13:54 2006
+++ xoops2jp/html/modules/user/kernel/LegacypageFunctions.class.php	Thu Jul 27 15:54:48 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: LegacypageFunctions.class.php,v 1.1.2.4 2006/07/20 08:13:54 minahito Exp $
+ * @version $Id: LegacypageFunctions.class.php,v 1.1.2.5 2006/07/27 06:54:48 nobunobu Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -171,7 +171,7 @@
 		$root =& XCube_Root::getSingleton();
 		$xoopsConfig = $root->mController->getConfig();
 		
-		$root->mLanguageManager->loadModuleLanguage('user');
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
 
 		// Reset session
 		$_SESSION = array();

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:29:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:29:31 +0900
Subject: [xoops-cvslog 3718] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060727092931.2A6BE2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.53 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.54
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.53	Thu Jul 27 15:53:12 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Thu Jul 27 18:29:30 2006
@@ -740,41 +740,33 @@
 		}
 	}
 
-	function &_createEventManager()
-	{
-		$manager=&parent::_createEventManager();
-
-		require_once XOOPS_ROOT_PATH."/modules/base/kernel/MiscEventFunctions.class.php";
-		$manager->setAnchorDelegate("Legacypage.Misc.Access", new XCube_Delegate("Legacy_MiscEventFunction","AccessToMisc"));
-		
-		require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_EventFunctions.class.php";
-		$manager->setAnchorDelegate("Legacypage.Imagemanager.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToImageManager"));
-		$manager->setAnchorDelegate("Legacypage.Backend.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToBackend"));
-		$manager->setAnchorDelegate("Legacypage.Search.Access", new XCube_Delegate("Legacy_EventFunction", "AccessToSearch"));
-
-		return $manager;
-	}
-	
 	function &_createDelegateManager()
 	{
-		$manager =& parent::_createDelegateManager();
+		$delegateManager =& parent::_createDelegateManager();
 		
-		$manager->add('Legacypage.Notifications.Access', 'Legacy_NotificationFunctions::notifications', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
-		$manager->add('Legacyfunction.Notificatins.Select', 'Legacy_NotificationFunctions::notifications_select', XOOPS_ROOT_PATH . "/modules/base/kernel/NotificationFunctions.class.php");
+		$file = XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_EventFunctions.class.php";
 		
-		return $manager;
+		$delegateManager->add('Legacypage.Notifications.Access', 'Legacy_EventFunction::notifications', $file);
+		$delegateManager->add('Legacyfunction.Notificatins.Select', 'Legacy_EventFunction::notifications_select', $file);
+		$delegateManager->add('Legacypage.Search.Access', 'Legacy_EventFunction::search', $file);
+		$delegateManager->add('Legacypage.Imagemanager.Access', 'Legacy_EventFunction::imageManager', $file);
+		$delegateManager->add('Legacypage.Backend.Access', 'Legacy_EventFunction::backend', $file);
+		$delegateManager->add('Legacypage.Misc.Access', 'Legacy_EventFunction::misc', $file);
+		
+		return $delegateManager;
 	}
 	
 	function &_createServiceManager()
 	{
-		$manager =& parent::_createServiceManager();
+		$serviceManager =& parent::_createServiceManager();
 		
 		require_once XOOPS_ROOT_PATH . "/modules/base/service/LegacySearchService.class.php";
-		$service =& new LegacySearchService();
-		$manager->addXCubeService("LegacySearch", $service);
-		unset($service);
+		$searchService =& new Legacy_SearchService();
+		$searchService->prepare();
+		
+		$serviceManager->addService('LegacySearch', $searchService);
 
-		return $manager;
+		return $serviceManager;
 	}
 	
 	/**

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:30:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:30:24 +0900
Subject: [xoops-cvslog 3719] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060727093024.4D6562AC41C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.7 xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.8
--- xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.7	Tue May 30 12:58:04 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php	Thu Jul 27 18:30:24 2006
@@ -1,55 +1,184 @@
 <?php
 /**
- * @version $Id: Legacy_EventFunctions.class.php,v 1.1.2.7 2006/05/30 03:58:04 minahito Exp $
+ * @package legacy
+ * @version $Id: Legacy_EventFunctions.class.php,v 1.1.2.8 2006/07/27 09:30:24 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
 class Legacy_EventFunction
 {
-	function AccessToImageManager(&$controller,$eventArgs)
+	function imageManager()
 	{
 		require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
 		
+		$root =& XCube_Root::getSingleton();
+	
 		$moduleRunner =& new Legacy_ActionFrame(false);
 		
 		$action = isset($_REQUEST['op']) ? ucfirst(xoops_getrequest('op')) : "List";
-		
-		$moduleRunner->setActionName('Image' . $action);
+		$moduleRunner->setMode(LEGACY_FRAME_MODE_IMAGE);
+		$moduleRunner->setActionName($action);
 
-		$controller->setActionStrategy($moduleRunner);
+		$root->mController->setActionStrategy($moduleRunner);
 
-		$controller->executeAction();
+		$root->mController->executeAction();
 
-		$controller->executeView();
+		$root->mController->executeView();
 	}
 
-	function AccessToBackend(&$controller,$eventArgs)
+	function backend()
 	{
 		require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
 		
+		$root =& XCube_Root::getSingleton();
+		
 		$moduleRunner =& new Legacy_ActionFrame(false);
 		$moduleRunner->setActionName('Backend');
 
-		$controller->setActionStrategy($moduleRunner);
+		$root->mController->setActionStrategy($moduleRunner);
 
-		$controller->executeAction();
+		$root->mController->executeAction();
 
-		$controller->executeView();
+		$root->mController->executeView();
 	}
 
-	function AccessToSearch(&$controller,$eventArgs)
+	function search()
 	{
 		require_once XOOPS_MODULE_PATH . "/base/class/ActionFrame.class.php";
 		
+		$root =& XCube_Root::getSingleton();
+		
 		$moduleRunner =& new Legacy_ActionFrame(false);
-		$moduleRunner->setActionName('Search' . ucfirst(xoops_getrequest('action')));
+		$moduleRunner->setMode(LEGACY_FRAME_MODE_SEARCH);
+		$moduleRunner->setActionName(ucfirst(xoops_getrequest('action')));
+
+		$root->mController->setActionStrategy($moduleRunner);
+
+		$root->mController->executeAction();
+
+		$root->mController->executeView();
+		
+	}
+	
+	function misc()
+	{
+		require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+
+		$root =& XCube_Root::getSingleton();
+		
+		$actionName = isset($_REQUEST['type']) ? ucfirst(xoops_getrequest('type')) : "Smilies";
 
-		$controller->setActionStrategy($moduleRunner);
+		$moduleRunner = new Legacy_ActionFrame(false);
+		$moduleRunner->setMode(LEGACY_FRAME_MODE_MISC);
+		$moduleRunner->setActionName($actionName);
 
-		$controller->executeAction();
+		$root->mController->setActionStrategy($moduleRunner);
 
-		$controller->executeView();
+		$root->mController->setDialogMode(true);
+
+		$root->mController->executeAction();
+
+		$root->mController->executeView();
+	}
+
+	function notifications()
+	{
+		require_once XOOPS_BASE_PATH . "/class/ActionFrame.class.php";
+		
+		$root =& XCube_Root::getSingleton();
+
+		//
+		// 'Notify' is prefix to guard accessing from misc.php.
+		//
+		$actionName = isset($_REQUEST['op']) ? trim(xoops_getrequest('op')) : "List";
+		if (isset($_REQUEST['delete'])) {
+			$actionName = "Delete";
+		}
+		if (isset($_REQUEST['delete_cancel'])) {
+			$actionName = "Cancel";
+		}
+
+		$moduleRunner = new Legacy_ActionFrame(false);
+		$moduleRunner->setMode(LEGACY_FRAME_MODE_NOTIFY);
+		$moduleRunner->setActionName($actionName);
+
+		$root->mController->setActionStrategy($moduleRunner);
+
+		$root->mController->executeAction();
+
+		$root->mController->executeView();
+	}
+	
+	/**
+	 * This functions is add to 'Legacyfunction.Notificatins.Select'.
+	 * 
+	 * @param XCube_RenderBuffer $render
+	 */
+	function notifications_select(&$render)
+	{
+		require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+		require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+
+		$root =& XCube_Root::getSingleton();
+		$xoopsModule =& $root->mController->mModuleController->mModuleObject;
+		$moduleConfig =& $root->mController->mModuleController->mConfig;
+		$xoopsUser =& $root->mController->getXoopsUser();
+
+		$xoops_notification = array();
+		$xoops_notification['show'] = is_object($xoopsModule) && is_object($xoopsUser) && notificationEnabled('inline') ? 1 : 0;
+		
+		if ($xoops_notification['show']) {
+			$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
+			$categories =& notificationSubscribableCategoryInfo();
+			$event_count = 0;
+			if (!empty($categories)) {
+				$notification_handler =& xoops_gethandler('notification');
+				foreach ($categories as $category) {
+					$section['name'] = $category['name'];
+					$section['title'] = $category['title'];
+					$section['description'] = $category['description'];
+					$section['itemid'] = $category['item_id'];
+					$section['events'] = array();
+					$subscribed_events =& $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoopsModule->get('mid'), $xoopsUser->get('uid'));
+					foreach (notificationEvents($category['name'], true) as $event) {
+						if (!empty($event['admin_only']) && !$xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
+							continue;
+						}
+						if (!empty($event['invisible'])) {
+							continue;
+						}
+						$subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
+						$section['events'][$event['name']] = array ('name'=>$event['name'], 'title'=>$event['title'], 'caption'=>$event['caption'], 'description'=>$event['description'], 'subscribed'=>$subscribed);
+						$event_count ++;
+					}
+					$xoops_notification['categories'][$category['name']] = $section;
+				}
+				$xoops_notification['target_page'] = "notification_update.php";
+				$xoops_notification['redirect_script'] = xoops_getenv('PHP_SELF');
+				
+				$render->setAttribute('editprofile_url', $urlXOOPS_URL . '/edituser.php?uid=' . $xoopsUser->getShow('uid'));
+
+				switch ($xoopsUser->getVar('notify_method')) {
+				case XOOPS_NOTIFICATION_METHOD_DISABLE:
+					$render->setAttribute('user_method', _NOT_DISABLE);
+					break;
+				case XOOPS_NOTIFICATION_METHOD_PM:
+					$render->setAttribute('user_method', _NOT_PM);
+					break;
+				case XOOPS_NOTIFICATION_METHOD_EMAIL:
+					$render->setAttribute('user_method', _NOT_EMAIL);
+					break;
+				}
+			} else {
+				$xoops_notification['show'] = 0;
+			}
+			if ($event_count == 0) {
+				$xoops_notification['show'] = 0;
+			}
+		}
+		
+		$render->setAttribute('xoops_notification', $xoops_notification);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:31:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:31:02 +0900
Subject: [xoops-cvslog 3720] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060727093102.C11DF2AC41B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php:1.1.2.1
--- /dev/null	Thu Jul 27 18:31:02 2006
+++ xoops2jp/html/modules/base/actions/MiscSmiliesAction.class.php	Thu Jul 27 18:31:02 2006
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: MiscSmiliesAction.class.php,v 1.1.2.1 2006/07/27 09:31:02 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/forms/SmilesFilterForm.class.php";
+
+class Legacy_MiscSmiliesAction extends Legacy_AbstractListAction
+{
+	/**
+	 * @var string
+	 */
+	var $mTargetName = null;
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('smiles', 'base');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_SmilesFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./misc.php?type=Smilies";
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mTargetName = xoops_getrequest('target');
+		return parent::getDefaultView($controller, $xoopsUser);
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		//
+		// Because this action's template uses BASE message catalog, load it.
+		//
+		$root =& $controller->mRoot;
+		$root->mLanguageManager->loadModuleMessageCatalog('base');
+		
+		$render->setTemplateName("legacy_misc_smilies.html");
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+		$render->setAttribute("targetName", $this->mTargetName);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/actions/SslloginAction.class.php
diff -u xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/SslloginAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SslloginAction.class.php:1.1.2.3	Thu Jul 20 17:19:49 2006
+++ xoops2jp/html/modules/base/actions/SslloginAction.class.php	Thu Jul 27 18:31:02 2006
@@ -1,28 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-/**
- * TODO This action should be implemented by base. We must move it to user.
- */
-class Legacy_SslloginAction extends Legacy_Action
-{
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		//
-		// Because this action's template uses USER message catalog, load it.
-		//
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('user');
-
-		$render->setTemplateName("legacy_misc_ssllogin.html");
-		$render->setAttribute("message", @sprintf(_US_LOGGINGU, $xoopsUser->getVar('uname')));
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/OnlineAction.class.php
diff -u xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.3 xoops2jp/html/modules/base/actions/OnlineAction.class.php:removed
--- xoops2jp/html/modules/base/actions/OnlineAction.class.php:1.1.2.3	Tue Mar 28 22:28:25 2006
+++ xoops2jp/html/modules/base/actions/OnlineAction.class.php	Thu Jul 27 18:31:02 2006
@@ -1,41 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/OnlineFilterForm.class.php";
-
-class Legacy_OnlineAction extends Legacy_AbstractListAction
-{
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('online', 'base');
-		return $handler;
-	}
-
-	function &_getFilterForm(&$navi)
-	{
-		$filter =& new Legacy_OnlineFilterForm($navi);
-		return $filter;
-	}
-
-	function _getBaseUrl()
-	{
-		return "./index.php?type=Online";
-	}
-
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("legacy_misc_online.html");
-		
-		foreach (array_keys($this->mObjects) as $key) {
-			$this->mObjects[$key]->loadModule();
-		}
-		
-		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/SmiliesAction.class.php
diff -u xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/SmiliesAction.class.php:removed
--- xoops2jp/html/modules/base/actions/SmiliesAction.class.php:1.1.2.4	Thu Jul 20 17:19:49 2006
+++ xoops2jp/html/modules/base/actions/SmiliesAction.class.php	Thu Jul 27 18:31:02 2006
@@ -1,54 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
-require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
-require_once XOOPS_MODULE_PATH . "/base/forms/SmilesFilterForm.class.php";
-
-class Legacy_SmiliesAction extends Legacy_AbstractListAction
-{
-	/**
-	 * @var string
-	 */
-	var $mTargetName = null;
-
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('smiles', 'base');
-		return $handler;
-	}
-
-	function &_getFilterForm(&$navi)
-	{
-		$filter =& new Legacy_SmilesFilterForm($navi);
-		return $filter;
-	}
-
-	function _getBaseUrl()
-	{
-		return "./misc.php?type=Smilies";
-	}
-
-	function getDefaultView(&$controller, &$xoopsUser)
-	{
-		$this->mTargetName = xoops_getrequest('target');
-		return parent::getDefaultView($controller, $xoopsUser);
-	}
-	
-	function executeViewIndex(&$controller, &$xoopsUser, &$render)
-	{
-		//
-		// Because this action's template uses BASE message catalog, load it.
-		//
-		$root =& $controller->mRoot;
-		$root->mLanguageManager->loadModuleMessageCatalog('base');
-		
-		$render->setTemplateName("legacy_misc_smilies.html");
-		$render->setAttribute("objects", $this->mObjects);
-		$render->setAttribute("pageNavi", $this->mNavi);
-		$render->setAttribute("targetName", $this->mTargetName);
-	}
-}
-
-?>
Index: xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php:1.1.2.1
--- /dev/null	Thu Jul 27 18:31:02 2006
+++ xoops2jp/html/modules/base/actions/MiscSslloginAction.class.php	Thu Jul 27 18:31:02 2006
@@ -0,0 +1,28 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+/**
+ * TODO This action should be implemented by base. We must move it to user.
+ */
+class Legacy_MiscSslloginAction extends Legacy_Action
+{
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		return LEGACY_FRAME_VIEW_INDEX;
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		//
+		// Because this action's template uses USER message catalog, load it.
+		//
+		$root =& $controller->mRoot;
+		$root->mLanguageManager->loadModuleMessageCatalog('user');
+
+		$render->setTemplateName("legacy_misc_ssllogin.html");
+		$render->setAttribute("message", @sprintf(_US_LOGGINGU, $xoopsUser->getVar('uname')));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php:1.1.2.1
--- /dev/null	Thu Jul 27 18:31:02 2006
+++ xoops2jp/html/modules/base/actions/MiscOnlineAction.class.php	Thu Jul 27 18:31:02 2006
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package Legacy
+ * @version $Id: MiscOnlineAction.class.php,v 1.1.2.1 2006/07/27 09:31:02 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/forms/OnlineFilterForm.class.php";
+
+class Legacy_MiscOnlineAction extends Legacy_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('online', 'base');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_OnlineFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?type=Online";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("legacy_misc_online.html");
+		
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadModule();
+		}
+		
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:31:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:31:36 +0900
Subject: [xoops-cvslog 3721] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060727093136.44FDD2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchResultsAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.4	Thu Jul 20 17:19:34 2006
+++ xoops2jp/html/modules/base/actions/SearchResultsAction.class.php	Thu Jul 27 18:31:36 2006
@@ -4,6 +4,8 @@
 
 require_once XOOPS_MODULE_PATH . "/base/forms/SearchResultsForm.class.php";
 
+define('LEGACY_SEARCH_DEFAULT_OFFSET', 20);
+
 class Legacy_SearchResultsAction extends Legacy_Action
 {
 	var $mActionForm = null;
@@ -53,16 +55,15 @@
 		// TODO ErrorHandling
 		//
 		$root =& $controller->mRoot;
-		$service =& $root->mServiceManager->searchXCubeService("LegacySearch");
-		if ($service) {
-			$client =& new XCube_ServiceClient($service);
+		$service =& $root->mServiceManager->getService("LegacySearch");
+		if (is_object($service)) {
+			$client =& $root->mServiceManager->createClient($service);
 
-			$parameters = array();
-			$parameters['current_uid'] = is_object($xoopsUser) ? $xoopsUser->get('uid') : 0;
+			$params['current_uid'] = is_object($xoopsUser) ? $xoopsUser->get('uid') : 0;
 			
-			$this->mActionForm->update($parameters);
+			$this->mActionForm->update($params);
 			
-			$this->mSearchResults = $client->call("getItems", $parameters);
+			$this->mSearchResults = $client->call('GetItems', $params['uid'], $params['current_uid'], $params['queries'], $params['andor'], $params['max_hit'], $params['offset'], $params['mids']);
 		}
 		else {
 			return LEGACY_FRAME_VIEW_ERROR;

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:31:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:31:51 +0900
Subject: [xoops-cvslog 3722] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060727093151.77F852AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchShowallAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/actions/SearchShowallAction.class.php:1.1.2.2	Sun May 28 14:07:29 2006
+++ xoops2jp/html/modules/base/actions/SearchShowallAction.class.php	Thu Jul 27 18:31:51 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id$
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -30,16 +34,13 @@
 	{
 		parent::executeViewIndex($controller, $xoopsUser, $render);
 		
-		//
-		// TODO remove Magic number '20'
-		//
-		$prevStart = $this->mActionForm->get('start') - 20;
+		$prevStart = $this->mActionForm->get('start') - LEGACY_SEARCH_DEFAULT_OFFSET;
 		if ($prevStart < 0) {
 			$prevStart = 0;
 		}
 		
 		$render->setAttribute('prevStart', $prevStart);
-		$render->setAttribute('nextStart', $this->mActionForm->get('start') + 20);
+		$render->setAttribute('nextStart', $this->mActionForm->get('start') + LEGACY_SEARCH_DEFAULT_OFFSET);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:32:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:32:46 +0900
Subject: [xoops-cvslog 3723] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060727093246.D2FC12AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:1.1.2.2 xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php:1.1.2.2	Sun May 28 14:07:29 2006
+++ xoops2jp/html/modules/base/actions/SearchShowallbyuserAction.class.php	Thu Jul 27 18:32:46 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id$
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:32:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:32:51 +0900
Subject: [xoops-cvslog 3724] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060727093251.9EE272AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchAction.class.php:1.1.2.1 xoops2jp/html/modules/base/actions/SearchAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/actions/SearchAction.class.php:1.1.2.1	Mon May 29 13:51:51 2006
+++ xoops2jp/html/modules/base/actions/SearchAction.class.php	Thu Jul 27 18:32:51 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id: SearchAction.class.php,v 1.1.2.2 2006/07/27 09:32:51 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:33:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:33:51 +0900
Subject: [xoops-cvslog 3725] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060727093351.CBE9F2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.9 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.10
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.9	Thu Jul 27 14:59:40 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Thu Jul 27 18:33:51 2006
@@ -22,6 +22,7 @@
 define ("LEGACY_FRAME_MODE_MISC", "Misc");
 define ("LEGACY_FRAME_MODE_NOTIFY", "Notify");
 define ("LEGACY_FRAME_MODE_IMAGE", "Image");
+define ("LEGACY_FRAME_MODE_SEARCH", "Search");
 
 class Legacy_ActionFrame extends XCube_ActionStrategy
 {
@@ -59,9 +60,17 @@
 
 	function execute(&$controller)
 	{
-		if (!preg_match("/^\w+$/", $this->mActionName)) {
+		if (strlen($this->mActionName) > 0 && !preg_match("/^\w+$/", $this->mActionName)) {
 			die();
 		}
+
+		//
+		// Actions of the public side in this module are hook type. So it's
+		// necessary to load catalog here.
+		//		
+		if (!$this->mAdminFlag) {
+			$controller->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
+		}
 		
 		//
 		// Add mode.

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:34:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:34:36 +0900
Subject: [xoops-cvslog 3726] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20060727093436.A25E52AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/SearchShowallForm.class.php
diff -u xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:1.1.2.1 xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/forms/SearchShowallForm.class.php:1.1.2.1	Sat May 27 22:06:39 2006
+++ xoops2jp/html/modules/base/forms/SearchShowallForm.class.php	Thu Jul 27 18:34:36 2006
@@ -32,7 +32,7 @@
 	
 	function update(&$params)
 	{
-		$params['mid'] = $this->get('mid');
+		$params['mids'][] = $this->get('mid');
 		$params['queries'] = $this->mQueries;
 		$params['andor'] = $this->get('andor');
 		$params['maxhit'] = 20;

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:34:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:34:51 +0900
Subject: [xoops-cvslog 3727] CVS update:
	xoops2jp/html/modules/base/preload/Primary
Message-ID: <20060727093451.CEA422AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.4 xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.5
--- xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php:1.1.2.4	Fri Jul  7 11:56:14 2006
+++ xoops2jp/html/modules/base/preload/Primary/NuSoapLoader.class.php	Thu Jul 27 18:34:51 2006
@@ -22,7 +22,7 @@
 			$client = new Legacy_SoapClient($service);
 		}
 		else {
-			$client = new XCube_ServiceClienet($service);
+			$client = new XCube_ServiceClient($service);
 		}
 	}
 }

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:35:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:35:08 +0900
Subject: [xoops-cvslog 3728] CVS update: xoops2jp/html/modules/base/service
Message-ID: <20060727093508.72FD22AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/service/LegacySearchService.class.php
diff -u xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.4 xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.5
--- xoops2jp/html/modules/base/service/LegacySearchService.class.php:1.1.2.4	Sat May 27 22:09:41 2006
+++ xoops2jp/html/modules/base/service/LegacySearchService.class.php	Thu Jul 27 18:35:08 2006
@@ -7,30 +7,32 @@
 /**
  * Sample class
  */
-class LegacySearchService extends XCube_Service
+class Legacy_SearchService extends XCube_Service
 {
+	function prepare()
+	{
+		$this->register('GetItems');
+	}
+	
 	/**
 	 * @param $parameters['uid'] Target user's id
 	 * @param $parameters['current_uid'] Current user's id
 	 * @param $parameters['maxhit'] Max hit count of each modules. The default value is 5.
 	 * @param $parameters['mid'] If this is specified, search only one module.
 	 */
-	function doGetItems(&$parameters)
+	function GetItems($uid = 0, $current_uid = 0, $queries = null, $andor = null, $max_hit = 5, $start = null, $mids = null)
 	{
 		$ret = array();
-		$uid = isset($parameters['uid']) ? intval($parameters['uid']) : 0;
-		$queries = isset($parameters['queries']) ? $parameters['queries'] : null;
 
-		$andor = isset($parameters['andor']) ? $parameters['andor'] : null;
+		$uid = intval($uid);
+		$current_uid = intval($current_uid);
+				
 		if ($andor == null) {
 			$andor == "AND";
 		}
 		
-		$maxhit = isset($parameters['maxhit']) ? intval($parameters['maxhit']) : 5;
-		$start = isset($parameters['offset']) ? intval($parameters['offset']) : null;
-		
 		$userHandler =& xoops_gethandler('user');
-		$currentUser =& $userHandler->get($parameters['current_uid']);
+		$currentUser =& $userHandler->get($current_uid);
 		
 		$gpermHandler = & xoops_gethandler( 'groupperm' );
 		$groups = is_object($currentUser) ? $currentUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
@@ -40,14 +42,7 @@
 		//
 		$moduleHandler =& xoops_gethandler('module');
 		
-		$mids = array();
-		if (isset($parameters['mids']) && is_array($parameters['mids'])) {
-			$mids = $parameters['mids'];
-		}
-		elseif (isset($parameters['mid'])) {
-			$mids[] = intval($parameters['mid']);
-		}
-		else {
+		if (!is_array($mids) || (is_array($mids) && count($mids) == 0)) {
 			$criteria =& new CriteriaCompo(new Criteria('hassearch', 1));
 			$criteria->add(new Criteria('isactive', 1));
 			$mids =& array_keys($moduleHandler->getList($criteria));
@@ -107,6 +102,11 @@
 		
 		return $ret;
 	}
+
+	function isOuterService()
+	{
+		return false;
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:35:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:35:19 +0900
Subject: [xoops-cvslog 3729] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060727093519.12B752AC418@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.18 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.19
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.18	Wed Jul 26 19:55:26 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Thu Jul 27 18:35:18 2006
@@ -12,6 +12,7 @@
 define('_MD_BASE_LANG_BID', "bid");
 define('_MD_BASE_LANG_BLOCK_TYPE', "block type");
 define('_MD_BASE_LANG_C_TYPE', "c type");
+define('_MD_BASE_LANG_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
 define('_MD_BASE_LANG_CODE', "code");
 define('_MD_BASE_LANG_COM_CREATED', "作成日時");
 define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
@@ -44,6 +45,7 @@
 define('_MD_BASE_LANG_ERROR', "error");
 define('_MD_BASE_LANG_FUNC_FILE', "func file");
 define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_GUEST', "ゲスト");
 define('_MD_BASE_LANG_ID', "ID");
 define('_MD_BASE_LANG_IMAGE', "image");
 define('_MD_BASE_LANG_IMAGE_FILE', "イメージファイル");
@@ -66,6 +68,7 @@
 define('_MD_BASE_LANG_SHOW_FUNC', "show func");
 define('_MD_BASE_LANG_SIDE', "side");
 define('_MD_BASE_LANG_SMILE_URL', "smile url");
+define('_MD_BASE_LANG_SMILIES', "顔アイコン");
 define('_MD_BASE_LANG_SUBMIT', "送信");
 define('_MD_BASE_LANG_TEMPLATE', "template");
 define('_MD_BASE_LANG_TITLE', "title");

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:35:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:35:19 +0900
Subject: [xoops-cvslog 3730] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060727093519.357A62AC41B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/main.php
diff -u xoops2jp/html/modules/base/language/english/main.php:1.1.2.17 xoops2jp/html/modules/base/language/english/main.php:1.1.2.18
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.17	Wed Jul 26 19:55:26 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Thu Jul 27 18:35:19 2006
@@ -12,6 +12,7 @@
 define('_MD_BASE_LANG_BID', "bid");
 define('_MD_BASE_LANG_BLOCK_TYPE', "block type");
 define('_MD_BASE_LANG_C_TYPE', "c type");
+define('_MD_BASE_LANG_CLICKASMILIE', "Click a smilie to insert it into your message.");
 define('_MD_BASE_LANG_CODE', "code");
 define('_MD_BASE_LANG_COM_CREATED', "Created");
 define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
@@ -44,6 +45,7 @@
 define('_MD_BASE_LANG_ERROR', "error");
 define('_MD_BASE_LANG_FUNC_FILE', "func file");
 define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_GUEST', "Guest");
 define('_MD_BASE_LANG_ID', "ID");
 define('_MD_BASE_LANG_IMAGE', "image");
 define('_MD_BASE_LANG_IMAGE_FILE', "Image file");
@@ -64,6 +66,7 @@
 define('_MD_BASE_LANG_SHOW_FUNC', "show func");
 define('_MD_BASE_LANG_SIDE', "side");
 define('_MD_BASE_LANG_SMILE_URL', "Image");
+define('_MD_BASE_LANG_SMILIES', "Smilies");
 define('_MD_BASE_LANG_SUBMIT', "Submit");
 define('_MD_BASE_LANG_TEMPLATE', "template");
 define('_MD_BASE_LANG_TITLE', "title");

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:36:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:36:00 +0900
Subject: [xoops-cvslog 3731] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060727093600.7E2932AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_misc_online.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.5
--- xoops2jp/html/modules/base/templates/legacy_misc_online.html:1.1.2.4	Fri Feb  3 02:00:56 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_online.html	Thu Jul 27 18:36:00 2006
@@ -8,7 +8,7 @@
         <{if $obj->get('uid')}>
           <a href="<{$xoops_url}>/userinfo.php?uid=<{$obj->get('uid')|escape}>"><{$obj->getVar('uname')}></a>
         <{else}>
-          <{$smarty.const._GUEST}>
+          <{$smarty.const._MD_BASE_LANG_GUEST}>
         <{/if}>
       </td>
       <td>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:37:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:37:57 +0900
Subject: [xoops-cvslog 3732] CVS update: xoops2jp/html
Message-ID: <20060727093757.0A4702AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/imagemanager.php
diff -u xoops2jp/html/imagemanager.php:1.2.8.3 xoops2jp/html/imagemanager.php:1.2.8.4
--- xoops2jp/html/imagemanager.php:1.2.8.3	Tue May 30 12:59:32 2006
+++ xoops2jp/html/imagemanager.php	Thu Jul 27 18:37:56 2006
@@ -2,18 +2,13 @@
 /**
  * This file was full scratched in XOOPS Cube Legacy project.
  * 
- * @version $Id: imagemanager.php,v 1.2.8.3 2006/05/30 03:59:32 minahito Exp $
+ * @package Legacy
+ * @version $Id: imagemanager.php,v 1.2.8.4 2006/07/27 09:37:56 minahito Exp $
  */
 
 require_once "mainfile.php";
-require_once "./header.php";
+require_once XOOPS_ROOT_PATH . "/header.php";
 
-//
-// This is old page controller in Xoops 2.0.x
-// Raise event "Legacypage.Imagemanager.Access"
-//
-$root=&XCube_Root::getSingleton();
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Imagemanager.Access", $root->mController, $eventArgs);
+XCube_DelegateUtils::call('Legacypage.Imagemanager.Access');
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:38:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:38:10 +0900
Subject: [xoops-cvslog 3733] CVS update: xoops2jp/html
Message-ID: <20060727093810.2806E2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/misc.php
diff -u xoops2jp/html/misc.php:1.2.8.4 xoops2jp/html/misc.php:1.2.8.5
--- xoops2jp/html/misc.php:1.2.8.4	Mon Dec 26 21:16:07 2005
+++ xoops2jp/html/misc.php	Thu Jul 27 18:38:10 2006
@@ -1,38 +1,14 @@
 <?php
 /**
- *@package legacy
+ * This file was full scratched in XOOPS Cube Legacy project.
+ * 
+ * @package Legacy
+ * @version $Id: misc.php,v 1.2.8.5 2006/07/27 09:38:10 minahito Exp $
  */
-// $Id: misc.php,v 1.2.8.4 2005/12/26 12:16:07 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2005 XOOPS Cube.org                        //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
 
 require_once "mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
-$root =& XCube_Root::getSingleton();
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Misc.Access", $root->mController, $eventArgs);
+XCube_DelegateUtils::call('Legacypage.Misc.Access');
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:38:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:38:19 +0900
Subject: [xoops-cvslog 3734] CVS update: xoops2jp/html
Message-ID: <20060727093819.746752AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/search.php
diff -u xoops2jp/html/search.php:1.2.8.2 xoops2jp/html/search.php:1.2.8.3
--- xoops2jp/html/search.php:1.2.8.2	Sat May 27 22:11:01 2006
+++ xoops2jp/html/search.php	Thu Jul 27 18:38:19 2006
@@ -2,7 +2,7 @@
 /**
  * This file was full scratched in XOOPS Cube Legacy project.
  * 
- * @version $Id: search.php,v 1.2.8.2 2006/05/27 13:11:01 minahito Exp $
+ * @version $Id: search.php,v 1.2.8.3 2006/07/27 09:38:19 minahito Exp $
  */
 
 require_once "mainfile.php";
@@ -12,8 +12,6 @@
 // This is old page controller in Xoops 2.0.x
 // Raise event "Legacypage.Search.Access"
 //
-$root=&XCube_Root::getSingleton();
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Search.Access", $root->mController, $eventArgs);
+XCube_DelegateUtils::call('Legacypage.Search.Access');
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:38:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:38:40 +0900
Subject: [xoops-cvslog 3735] CVS update: xoops2jp/html/include
Message-ID: <20060727093840.96C722AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/include/notification_update.php
diff -u xoops2jp/html/include/notification_update.php:1.2.8.1 xoops2jp/html/include/notification_update.php:1.2.8.2
--- xoops2jp/html/include/notification_update.php:1.2.8.1	Wed Oct 19 02:20:06 2005
+++ xoops2jp/html/include/notification_update.php	Thu Jul 27 18:38:40 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification_update.php,v 1.2.8.1 2005/10/18 17:20:06 minahito Exp $
+// $Id: notification_update.php,v 1.2.8.2 2006/07/27 09:38:40 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -48,7 +48,9 @@
 
 include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
 include_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
+
+$root =& XCube_Root::getSingleton();
+$root->mLanguageManager->loadPageTypeMessageCatalog('notification');
 
 if (!isset($_POST['not_submit'])) {
 	exit();

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:39:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:39:31 +0900
Subject: [xoops-cvslog 3736] CVS update: xoops2jp/html/modules/pm
Message-ID: <20060727093931.7F5592AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/xoops_version.php
diff -u xoops2jp/html/modules/pm/xoops_version.php:1.1.2.13 xoops2jp/html/modules/pm/xoops_version.php:1.1.2.14
--- xoops2jp/html/modules/pm/xoops_version.php:1.1.2.13	Fri Jul  7 12:21:03 2006
+++ xoops2jp/html/modules/pm/xoops_version.php	Thu Jul 27 18:39:31 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.13 2006/07/07 03:21:03 minahito Exp $
+// $Id: xoops_version.php,v 1.1.2.14 2006/07/27 09:39:31 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -62,6 +62,8 @@
 $modversion['templates'][3]['description'] = 'This is used when user work pmlite.php.';
 $modversion['templates'][4]['file'] = 'pm_pmlite_success.html';
 $modversion['templates'][4]['description'] = 'Display pm send message.';
+$modversion['templates'][5]['file'] = 'pm_delete_one.html';
+$modversion['templates'][5]['description'] = 'Display confirm deleting a message.';
 
 //Preference
 $modversion['config'][] = array (

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:39:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:39:40 +0900
Subject: [xoops-cvslog 3737] CVS update: xoops2jp/html/modules/pm/.xml
Message-ID: <20060727093940.E5C862AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/.xml/pm_delete_one.xml
diff -u /dev/null xoops2jp/html/modules/pm/.xml/pm_delete_one.xml:1.1.2.1
--- /dev/null	Thu Jul 27 18:39:40 2006
+++ xoops2jp/html/modules/pm/.xml/pm_delete_one.xml	Thu Jul 27 18:39:40 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="DeleteOneForm" type="XCube_ActionForm">
+		<form-property name="msg_id" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="msg_id" depends="required,objectExist">
+			<arg0 key="const._MD_PM_LANG_MSG_ID" />
+			<msg name="required" key="const._MD_PM_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._MD_PM_ERROR_OBJECTEXIST" />
+			<var name="handler" value="privmessage" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:39:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:39:58 +0900
Subject: [xoops-cvslog 3738] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060727093958.B54932AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteAction.class.php
diff -u xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.2 xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.3
--- xoops2jp/html/modules/pm/actions/DeleteAction.class.php:1.1.2.2	Fri Jul 14 17:51:13 2006
+++ xoops2jp/html/modules/pm/actions/DeleteAction.class.php	Thu Jul 27 18:39:58 2006
@@ -1,12 +1,11 @@
 <?php
 /**
- * @package Pm
- * @version $Id: DeleteAction.class.php,v 1.1.2.2 2006/07/14 08:51:13 minahito Exp $
+ * @package pm
+ * @version $Id: DeleteAction.class.php,v 1.1.2.3 2006/07/27 09:39:58 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
-require_once XOOPS_MODULE_PATH . "/pm/class/AbstractDeleteAction.class.php";
 require_once XOOPS_MODULE_PATH . "/pm/forms/PmDeleteForm.class.php";
 
 class Pm_DeleteAction extends Pm_AbstractAction

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:40:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:40:18 +0900
Subject: [xoops-cvslog 3739] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060727094018.C57CF2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php
diff -u /dev/null xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.1
--- /dev/null	Thu Jul 27 18:40:18 2006
+++ xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php	Thu Jul 27 18:40:18 2006
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package pm
+ * @version $Id: DeleteOneAction.class.php,v 1.1.2.1 2006/07/27 09:40:18 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/pm/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/pm/forms/DeleteOneForm.class.php";
+
+class Pm_DeleteOneAction extends Pm_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return xoops_getrequest('msg_id');
+	}
+	
+	function &_getHandler()
+	{
+		$handler =& xoops_gethandler('privmessage');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Pm_DeleteOneForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function hasPermission(&$controller, &$xoopsUser, $moduleConfig)
+	{
+		if (parent::hasPermission($controller, $xoopsUser, $moduleConfig)) {
+			return $xoopsUser->get('uid') == $this->mObject->get('to_userid');
+		}
+		else {
+			return false;
+		}
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("pm_delete_one.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward(XOOPS_URL . "/viewpmsg.php");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeRedirect(XOOPS_URL . "/viewpmsg.php", 1, _MD_PM_ERROR_ACCESS);
+	}
+
+	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'));
+		}
+		else {
+			$controller->executeForward(XOOPS_URL . "/viewpmsg.php");
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:40:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:40:43 +0900
Subject: [xoops-cvslog 3740] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060727094043.89F162AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/actions/ReadAction.class.php
diff -u xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.2 xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.3
--- xoops2jp/html/modules/pm/actions/ReadAction.class.php:1.1.2.2	Fri Jul 14 17:51:13 2006
+++ xoops2jp/html/modules/pm/actions/ReadAction.class.php	Thu Jul 27 18:40:43 2006
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package Pm
- * @version $Id: ReadAction.class.php,v 1.1.2.2 2006/07/14 08:51:13 minahito Exp $
+ * @package pm
+ * @version $Id: ReadAction.class.php,v 1.1.2.3 2006/07/27 09:40:43 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -104,6 +104,15 @@
 
 		return PM_FRAME_VIEW_INDEX;
 	}
+	
+	/**
+	 * When a user click 'delete' button, this member function is called by
+	 * POST request. Forward delete one action.
+	 */
+	function execute(&$controller, &$xoopsUser)
+	{
+		$controller->executeForward(XOOPS_MODULE_URL . "/pm/index.php?action=DeleteOne&msg_id=" . xoops_getrequest('msg_id'));
+	}
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:40:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:40:56 +0900
Subject: [xoops-cvslog 3741] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20060727094056.E5E5E2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/AbstractEditAction.class.php
diff -u xoops2jp/html/modules/pm/class/AbstractEditAction.class.php:1.1.2.1 xoops2jp/html/modules/pm/class/AbstractEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/class/AbstractEditAction.class.php:1.1.2.1	Tue Jul  4 18:48:34 2006
+++ xoops2jp/html/modules/pm/class/AbstractEditAction.class.php	Thu Jul 27 18:40:56 2006
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package Pm
- * @version $Id: AbstractEditAction.class.php,v 1.1.2.1 2006/07/04 09:48:34 minahito Exp $
+ * @package pm
+ * @version $Id: AbstractEditAction.class.php,v 1.1.2.2 2006/07/27 09:40:56 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -62,7 +62,11 @@
 	function execute(&$controller, &$xoopsUser)
 	{
 		if ($this->mObject == null) {
-			return PM2_FRAME_VIEW_ERROR;
+			return PM_FRAME_VIEW_ERROR;
+		}
+		
+		if (isset($_REQUEST['_form_control_cancel'])) {
+			return PM_FRAME_VIEW_CANCEL;
 		}
 	
 		$this->mActionForm->load($this->mObject);

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:41:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:41:38 +0900
Subject: [xoops-cvslog 3742] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20060727094138.277AE2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.1 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.1	Tue Jul  4 18:48:34 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php	Thu Jul 27 18:41:38 2006
@@ -1,7 +1,7 @@
 <?php
 /**
- * @package Pm
- * @version $Id: ActionFrame.class.php,v 1.1.2.1 2006/07/04 09:48:34 minahito Exp $
+ * @package pm
+ * @version $Id: ActionFrame.class.php,v 1.1.2.2 2006/07/27 09:41:38 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -17,6 +17,8 @@
 define ("PM_FRAME_VIEW_ERROR", 3);
 define ("PM_FRAME_VIEW_INDEX", 4);
 define ("PM_FRAME_VIEW_INPUT", 5);
+define ("PM_FRAME_VIEW_PREVIEW", 6);
+define ("PM_FRAME_VIEW_CANCEL", 7);
 
 class Pm_ActionFrame extends XCube_ActionStrategy
 {
@@ -100,6 +102,14 @@
 			case PM_FRAME_VIEW_INPUT:
 				$this->mAction->executeViewInput($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
 				break;
+
+			case PM_FRAME_VIEW_PREVIEW:
+				$this->mAction->executeViewPreview($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
+
+			case PM_FRAME_VIEW_CANCEL:
+				$this->mAction->executeViewCancel($controller, $controller->getXoopsUser(), $controller->mRenderSystem);
+				break;
 		}
 	}
 
@@ -160,6 +170,14 @@
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 	}
+
+	function executeViewPreview(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewCancel(&$controller, &$xoopsUser, &$render)
+	{
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:41:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:41:49 +0900
Subject: [xoops-cvslog 3743] CVS update: xoops2jp/html/modules/pm/forms
Message-ID: <20060727094149.4EF3C2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/forms/DeleteOneForm.class.php
diff -u /dev/null xoops2jp/html/modules/pm/forms/DeleteOneForm.class.php:1.1.2.1
--- /dev/null	Thu Jul 27 18:41:49 2006
+++ xoops2jp/html/modules/pm/forms/DeleteOneForm.class.php	Thu Jul 27 18:41:49 2006
@@ -0,0 +1,43 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+
+class Pm_DeleteOneForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.pm.DeleteOneForm.TOKEN" . $this->get('msg_id');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['msg_id'] =& new XCube_IntProperty('msg_id');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['msg_id'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['msg_id']->setDependsByArray(array('required','objectExist'));
+		$this->mFieldProperties['msg_id']->addMessage('required', _MD_PM_ERROR_REQUIRED, _MD_PM_LANG_MSG_ID);
+		$this->mFieldProperties['msg_id']->addMessage('objectExist', _MD_PM_ERROR_OBJECTEXIST, _MD_PM_LANG_MSG_ID);
+		$this->mFieldProperties['msg_id']->addVar('handler', 'privmessage');
+	}
+
+	function load(&$obj)
+	{
+		$this->set('msg_id', $obj->get('msg_id'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('msg_id', $this->get('msg_id'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:42:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:42:05 +0900
Subject: [xoops-cvslog 3744] CVS update:
	xoops2jp/html/modules/pm/language/japanese
Message-ID: <20060727094205.1535E2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/japanese/main.php
diff -u xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.8 xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.9
--- xoops2jp/html/modules/pm/language/japanese/main.php:1.1.2.8	Tue Jul  4 18:49:53 2006
+++ xoops2jp/html/modules/pm/language/japanese/main.php	Thu Jul 27 18:42:04 2006
@@ -9,6 +9,7 @@
 define('_MD_PM_LANG_MESSAGE_DETAIL', "メッセージの詳細");
 define('_MD_PM_LANG_MSG_ID', "msg id");
 define('_MD_PM_LANG_SUBJECTC', "件名： ");
+define('_MD_PM_MESSAGE_CONFIRM_DELETE_PM', "以下のプライベートメッセージを本当に削除しますか？");
 define('_PM_CANCELSEND', "キャンセル");
 define('_PM_CLEAR', "クリア");
 define('_PM_CLICKHERE', "プライベートメッセージの受信箱を表示する");

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:42:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:42:15 +0900
Subject: [xoops-cvslog 3745] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060727094215.37D522AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/pm_delete_one.html
diff -u /dev/null xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.1
--- /dev/null	Thu Jul 27 18:42:15 2006
+++ xoops2jp/html/modules/pm/templates/pm_delete_one.html	Thu Jul 27 18:42:15 2006
@@ -0,0 +1,14 @@
+<{$smarty.const._MD_PM_MESSAGE_CONFIRM_DELETE_PM}>
+
+<form action="./index.php?action=DeleteOne" method="POST">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=msg_id value=$actionForm->get('msg_id')}>
+  <table class="outer">
+    <tr>
+      <td class="foot" colspan="2">
+        <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+        <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
+      </td>
+    </tr>
+</table>
+</form>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:42:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:42:53 +0900
Subject: [xoops-cvslog 3746] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060727094253.3F4502AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.14 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.15
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.14	Wed Jul  5 11:37:06 2006
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Thu Jul 27 18:42:53 2006
@@ -3,52 +3,54 @@
   <a href="<{$xoops_url}>/userinfo.php?uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._PM_PROFILE}></a> &raquo;&raquo; 
 <{/if}>
 <a href="index.php"><{$smarty.const._PM_INBOX}></a> &raquo;&raquo; <{$privMessage->getShow('subject')}>
-<table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%">
-  <tr>
-    <th <{if $sendUser->hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}></th>
-  </tr>
-  <tr class="even">
-    <{if $sendUser->hasAvatar()}>
-      <td valign="top" style="text-align:center;" rowspan="3">
-        <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><img src="<{$sendUser->getAvatarUrl()}>" alt="<{$sendUser->getShow('uname')}>" title="<{$sendUser->getShow('uname')}>" /></a>
-        <{if $sendUser->getShow('user_from')}>
-          <br /> <{$sendUser->getShow('user_from')}>
+<form action='./index.php?action=Read' method='post' name='delete<{$privMessage->getShow('msg_id')}>'>
+  <table class="outer" border="0" cellpadding="4" cellspacing="1" width="100%">
+    <tr>
+      <th <{if $sendUser->hasAvatar()}>colspan="2"<{/if}>><{$smarty.const._MD_PM_LANG_MESSAGE_DETAIL}></th>
+    </tr>
+    <tr class="even">
+      <{if $sendUser->hasAvatar()}>
+        <td valign="top" style="text-align:center;" rowspan="3">
+          <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><img src="<{$sendUser->getAvatarUrl()}>" alt="<{$sendUser->getShow('uname')}>" title="<{$sendUser->getShow('uname')}>" /></a>
+          <{if $sendUser->getShow('user_from')}>
+            <br /> <{$sendUser->getShow('user_from')}>
+          <{/if}>
+        </td>
+      <{/if}>
+      <td><{$smarty.const._PM_FROMC}><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><{$sendUser->getShow('uname')}></a>
+          <!--- TODO Online Information --->
+      </td>
+    </tr>
+    <tr class="even">
+      <td><{$smarty.const._PM_SENTC}><{$privMessage->get("msg_time")|xoops_formattimestamp}></td>
+    </tr>
+    <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">
+      <td colspan="2">
+        <{$privMessage->getShow('msg_text')}><br /><br />
+      </td>
+    </tr>
+    <tr class="foot">
+      <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:left;">
+        <!--- TODO check postr. See original readpmsg --->
+        <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._PM_REPLY}>" title="<{$smarty.const._PM_REPLY}>" /></a>
+        <input type="hidden" name="delete" value="1" />  <!--- << check --->
+        <input type="hidden" name="msg_id" value="<{$privMessage->getShow('msg_id')}>" />
+        <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._PM_DELETE}>" title="<{$smarty.const._PM_DELETE}>" /></a>
+      </td>
+    </tr>
+    <tr>
+      <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
+        <{if $previousMessage}>
+          <a href="index.php?action=read&amp;msg_id=<{$previousMessage->getShow('msg_id')}>"><{$smarty.const._PM_PREVIOUS}></a>
+        <{/if}>
+        <{if $nextMessage}>
+          <{if $previousMessage}> | <{/if}>
+          <a href="index.php?action=read&amp;msg_id=<{$nextMessage->getShow('msg_id')}>"><{$smarty.const._PM_NEXT}></a>
         <{/if}>
       </td>
-    <{/if}>
-    <td><{$smarty.const._PM_FROMC}><a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><{$sendUser->getShow('uname')}></a>
-        <!--- TODO Online Information --->
-    </td>
-  </tr>
-  <tr class="even">
-    <td><{$smarty.const._PM_SENTC}><{$privMessage->get("msg_time")|xoops_formattimestamp}></td>
-  </tr>
-  <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">
-    <td colspan="2">
-      <{$privMessage->getShow('msg_text')}><br /><br />
-    </td>
-  </tr>
-  <tr class="foot">
-    <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:left;">
-      <!--- TODO check postr. See original readpmsg --->
-      <a href='#' onclick="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?reply=1&amp;msg_id=<{$privMessage->getShow("msg_id")}>','pmlite',450,380);"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$smarty.const._PM_REPLY}>" title="<{$smarty.const._PM_REPLY}>" /></a>
-      <input type="hidden" name="delete" value="1" />  <!--- << check --->
-      <input type="hidden" name="msg_id" value="<{$privMessage->getShow('msg_id')}>" />
-      <a href="#<{$privMessage->getShow('msg_id')}>" onclick='javascript:document.delete<{$privMessage->getShow("msg_id")}>.submit();'><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$smarty.const._PM_DELETE}>" title="<{$smarty.const._PM_DELETE}>" /></a>
-    </td>
-  </tr>
-  <tr>
-    <td <{if $sendUser->hasAvatar()}>colspan="2"<{/if}> style="text-align:right;">
-      <{if $previousMessage}>
-        <a href="index.php?action=read&amp;msg_id=<{$previousMessage->getShow('msg_id')}>"><{$smarty.const._PM_PREVIOUS}></a>
-      <{/if}>
-      <{if $nextMessage}>
-        <{if $previousMessage}> | <{/if}>
-        <a href="index.php?action=read&amp;msg_id=<{$nextMessage->getShow('msg_id')}>"><{$smarty.const._PM_NEXT}></a>
-      <{/if}>
-    </td>
-  </tr>
-</table>
+    </tr>
+  </table>
+</form>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:43:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:43:26 +0900
Subject: [xoops-cvslog 3747] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060727094326.2B0D52AC3E2@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.4 xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/UserInfoAction.class.php:1.1.2.4	Wed Jul 19 19:20:33 2006
+++ xoops2jp/html/modules/user/actions/UserInfoAction.class.php	Thu Jul 27 18:43:26 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserInfoAction.class.php,v 1.1.2.4 2006/07/19 10:20:33 minahito Exp $
+ * @version $Id: UserInfoAction.class.php,v 1.1.2.5 2006/07/27 09:43:26 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -43,13 +43,12 @@
 		
 		$root =& $controller->mRoot;
 		$service =& $root->mServiceManager->getService("LegacySearch");
-		if ($service) {
-			$current_uid = is_object($xoopsUser) ? $xoopsUser->get('uid') : 0;
+		if (is_object($service)) {
+			$client =& $root->mServiceManager->createClient($service);
 			
-			$client =& new XCube_ServiceClient($service);
+			$current_uid = is_object($xoopsUser) ? $xoopsUser->get('uid') : 0;
 
-			$parameters = array("uid" => $uid, 'current_uid' => $current_uid);
-			$this->mSearchResults = $client->call("getItems", $parameters);
+			$this->mSearchResults = $client->call('GetItems', $uid, $current_uid);
 		}
 
 		return USER_FRAME_VIEW_SUCCESS;

From minahito ＠ users.sourceforge.jp  Thu Jul 27 18:43:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 18:43:53 +0900
Subject: [xoops-cvslog 3748] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060727094353.29C5F2AC3E2@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.12
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.11	Thu Jul 13 19:53:25 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Jul 27 18:43:53 2006
@@ -52,6 +52,7 @@
     <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
         <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
+    </td>
   </tr>
 </table>
 </form>

From minahito ＠ users.sourceforge.jp  Thu Jul 27 22:04:05 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Jul 2006 22:04:05 +0900
Subject: [xoops-cvslog 3749] CVS update: xoops2jp/html/modules/pm/actions
Message-ID: <20060727130405.AF32B2AC462@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.1 xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.2
--- xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php:1.1.2.1	Thu Jul 27 18:40:18 2006
+++ xoops2jp/html/modules/pm/actions/DeleteOneAction.class.php	Thu Jul 27 22:04:05 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: DeleteOneAction.class.php,v 1.1.2.1 2006/07/27 09:40:18 minahito Exp $
+ * @version $Id: DeleteOneAction.class.php,v 1.1.2.2 2006/07/27 13:04:05 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -43,6 +43,11 @@
 		$render->setTemplateName("pm_delete_one.html");
 		$render->setAttribute('actionForm', $this->mActionForm);
 		$render->setAttribute('object', $this->mObject);
+		
+		$sendUser =& $this->mObject->getFromUser();
+		if (is_object($sendUser) && $sendUser->isActive()) {
+			$render->setAttribute("sendUser", $sendUser);
+		}
 	}
 
 	function executeViewSuccess(&$controller, &$xoopsUser, &$render)

From tom_g3x ＠ users.sourceforge.jp  Thu Jul 27 22:26:25 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 27 Jul 2006 22:26:25 +0900
Subject: [xoops-cvslog 3750] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060727132625.C77D92AC454@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/pm_delete_one.html
diff -u xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.1 xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.2
--- xoops2jp/html/modules/pm/templates/pm_delete_one.html:1.1.2.1	Thu Jul 27 18:42:15 2006
+++ xoops2jp/html/modules/pm/templates/pm_delete_one.html	Thu Jul 27 22:26:25 2006
@@ -1,10 +1,37 @@
-<{$smarty.const._MD_PM_MESSAGE_CONFIRM_DELETE_PM}>
+<div><{$smarty.const._MD_PM_MESSAGE_CONFIRM_DELETE_PM}></div>
 
 <form action="./index.php?action=DeleteOne" method="POST">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=msg_id value=$actionForm->get('msg_id')}>
   <table class="outer">
     <tr>
+      <th colspan="2"><{$smarty.const._MD_PM_MESSAGE_CONFIRM_DELETE_PM}></th>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._PM_FROMC}></td>
+      <td class="<{cycle values="even,odd"}>">
+        <{if $sendUser->getShow('uname')}>
+          <a href="<{$smarty.const.XOOPS_URL}>/userinfo.php?uid=<{$sendUser->getShow('uid')}>"><{$sendUser->getShow('uname')}></a>
+        <{/if}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._PM_SENTC}></td>
+      <td class="<{cycle values="even,odd"}>">
+        <{$object->get("msg_time")|xoops_formattimestamp}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._MD_PM_LANG_SUBJECTC}></td>
+      <td class="<{cycle values="even,odd"}>">
+        <img src="<{$xoops_url}>/images/subject/<{$object->getShow('msg_image')}>" alt='' title='' />&nbsp;
+<b><{$object->getShow('subject')}></b>
+      </td>
+    </tr>
+    <tr>
+      <td class="<{cycle values="even,odd"}>" colspan="2"><{$object->getShow('msg_text')}></td>
+    </tr>
+    <tr>
       <td class="foot" colspan="2">
         <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
         <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
@@ -12,3 +39,4 @@
     </tr>
 </table>
 </form>
+

From nobunobu ＠ users.sourceforge.jp  Fri Jul 28 14:20:32 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Fri, 28 Jul 2006 14:20:32 +0900
Subject: [xoops-cvslog 3751] CVS update: xoops2jp/html/settings
Message-ID: <20060728052033.01A4A2AC166@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.14 xoops2jp/html/settings/site_default.ini.php:1.1.2.15
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.14	Tue Jun 27 18:17:27 2006
+++ xoops2jp/html/settings/site_default.ini.php	Fri Jul 28 14:20:32 2006
@@ -28,7 +28,7 @@
 protectorLE_Filter=/modules/base/preload/protectorLE/protectorLE.class.php
 Legacy_SiteClose=/modules/base/preload/Primary/SiteClose.class.php
 User_PrimaryFilter=/modules/user/preload/Primary/Primary.class.php
-# Legacy_NuSoapLoader=/modules/base/preload/Primary/NuSoapLoader.class.php
+Legacy_NuSoapLoader=/modules/base/preload/Primary/NuSoapLoader.class.php
 
 #            #
 # components #

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:55:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:55:38 +0900
Subject: [xoops-cvslog 3752] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060728085538.595932AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php:1.1.2.1
--- /dev/null	Fri Jul 28 17:55:38 2006
+++ xoops2jp/html/modules/user/admin/actions/UserViewAction.class.php	Fri Jul 28 17:55:38 2006
@@ -0,0 +1,142 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractViewAction.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserRecountForm.class.php";
+
+class User_UserViewAction extends User_AbstractViewAction
+{
+	var $mActionForm = null;
+
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mGetUserPosts = null;
+	
+	function User_UserViewAction()
+	{
+		parent::User_AbstractViewAction();
+		$this->mGetUserPosts =& new XCube_NewDelegate();
+		$this->mGetUserPosts->register('User_UserViewAction.GetUserPosts');
+	}
+	
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
+	{
+		parent::prepare($controller, $xoopsUser, $moduleConfig);
+		$this->mActionForm =& new User_RecountForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function _getId()
+	{
+		return xoops_getrequest('uid');
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('users');
+		return $handler;
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if (is_object($this->mObject)) {
+			$this->mActionForm->load($this->mObject);
+		}
+		
+		$ret = parent::getDefaultView($controller, $xoopsUser);
+		
+		//
+		// Because this class implemented 'execute()', convet the status here.
+		//
+		if ($ret == USER_FRAME_VIEW_SUCCESS) {
+			return USER_FRAME_VIEW_INDEX;
+		}
+		else {
+			return $ret;
+		}
+	}
+	
+	function execute(&$controller, &$xoopsUser)
+	{
+		if ($this->mObject == null) {
+			return USER_FRAME_VIEW_ERROR;
+		}
+
+		$this->mActionForm->load($this->mObject);
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
+		
+		//
+		// Do 'recount'
+		//
+		$posts = 0;
+		$this->mGetUserPosts->call(new XCube_Ref($posts), $xoopsUser);
+		
+		$this->mObject->set('posts', $posts);
+		
+		$handler =& xoops_getmodulehandler('users');
+		return $handler->insert($this->mObject) ? USER_FRAME_VIEW_SUCCESS
+		                                        : USER_FRAME_VIEW_ERROR;
+	}
+	
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_view.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$render->setAttribute('object', $this->mObject);
+		
+		$handler =& xoops_getmodulehandler('ranks');
+		$rank =& $handler->get($this->mObject->get('rank'));
+		$render->setAttribute('rank', $rank);
+		
+		$handler =& xoops_gethandler('timezone');
+		$timezone =& $handler->get($this->mObject->get('timezone_offset'));
+		$render->setAttribute('timezone', $timezone);
+		
+		//
+		// TODO dirty code... :(
+		//
+		$umodeOptions = array("nest" => _NESTED, "flat" => _FLAT, "thread" => _THREADED);
+		$render->setAttribute('umode', $umodeOptions[$this->mObject->get('umode')]);
+
+		$uorderOptions = array(0 => _OLDESTFIRST, 1 => _NEWESTFIRST);
+		$render->setAttribute('uorder', $uorderOptions[$this->mObject->get('uorder')]);
+		
+		//
+		// Notifications. (TODO Also dirty...)
+		//
+		$controller->mRoot->mLanguageManager->loadPageTypeMessageCatalog('notification');
+		require_once XOOPS_ROOT_PATH . "/include/notification_constants.php";
+
+		$methodOptions = array(XOOPS_NOTIFICATION_METHOD_DISABLE => _NOT_METHOD_DISABLE,
+		                         XOOPS_NOTIFICATION_METHOD_PM => _NOT_METHOD_PM,
+		                         XOOPS_NOTIFICATION_METHOD_EMAIL => _NOT_METHOD_EMAIL
+		                   );
+		$render->setAttribute('notify_method', $methodOptions[$this->mObject->get('notify_method')]);
+		
+		$modeOptions = array(XOOPS_NOTIFICATION_MODE_SENDALWAYS => _NOT_MODE_SENDALWAYS,
+		                       XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE => _NOT_MODE_SENDONCE,
+		                       XOOPS_NOTIFICATION_MODE_SENDONCETHENWAIT => _NOT_MODE_SENDONCEPERLOGIN
+		                 );
+		$render->setAttribute('notify_mode', $modeOptions[$this->mObject->get('notify_mode')]);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeRedirect("./index.php?action=UserView&uid=" . $this->mObject->get('uid'), 1, _AD_USER_MESSAGE_RECOUNT_SUCCESS);
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeRedirect("./index.php?action=UserList", 1, _AD_USER_ERROR_CONTENT_IS_NOT_FOUND);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:55:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:55:58 +0900
Subject: [xoops-cvslog 3753] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060728085558.3539E2AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php:1.1.2.1
--- /dev/null	Fri Jul 28 17:55:58 2006
+++ xoops2jp/html/modules/user/admin/forms/UserRecountForm.class.php	Fri Jul 28 17:55:58 2006
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package User
+ * @version $Id: UserRecountForm.class.php,v 1.1.2.1 2006/07/28 08:55:58 minahito Exp $
+ */
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+
+class User_RecountForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.RecountForm.TOKEN" . $this->get('uid');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['uid'] =& new XCube_IntProperty('uid');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['uid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['uid']->setDependsByArray(array('required','objectExist'));
+		$this->mFieldProperties['uid']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_UID);
+		$this->mFieldProperties['uid']->addMessage('objectExist', _AD_USER_ERROR_OBJECTEXIST, _AD_USER_LANG_UID);
+		$this->mFieldProperties['uid']->addVar('handler', 'users');
+		$this->mFieldProperties['uid']->addVar('module', 'user');
+	}
+
+	function load(&$obj)
+	{
+		$this->set('uid', $obj->get('uid'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('uid', $this->get('uid'));
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:56:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:56:07 +0900
Subject: [xoops-cvslog 3754] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060728085607.C9BA72AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_view.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/user_view.html:1.1.2.1
--- /dev/null	Fri Jul 28 17:56:07 2006
+++ xoops2jp/html/modules/user/admin/templates/user_view.html	Fri Jul 28 17:56:07 2006
@@ -0,0 +1,202 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=UsersList"><{$smarty.const._AD_USER_LANG_USER_LIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_USER_LANG_USER_VIEW}>
+</div>
+
+<div class="tips">
+  <{$smarty.const._AD_USER_TIPS_RECOUNT_POSTS}>
+</div>
+
+<table class='outer'>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_UID}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('uid')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_UNAME}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('uname')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_NAME}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('name')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_EMAIL}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('email')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_URL}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('url')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_AVATAR}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{if $object->get('user_avatar') != "blank.gif" }>
+        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('user_avatar')}>" alt="Avatar" title="Avatar" />
+      <{else}>
+        <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="No Avatar" title="No Avatar" />
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_REGDATE}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->get('user_regdate')|xoops_formattimestamp:l}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_ICQ}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_icq')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_FROM}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_from')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_SIG}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_sig')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_VIEWEMAIL}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_viewemail')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_AIM}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_aim')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_YIM}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_yim')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_MSNM}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_msnm')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_POSTS}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('posts')}>
+      <form action="./index.php?action=UserView" method="post">
+        <{xoops_token form=$actionForm}>
+        <{xoops_input type=hidden name=uid value=$actionForm->get('uid')}>
+        <input class='formButton' type='submit' value='<{$smarty.const._AD_USER_LANG_RECOUNT}>'>
+      </form>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_ATTACHSIG}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('attachsig')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_RANK}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{if $rank}>
+        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getShow('rank_image')}>" alt="<{$rank->getShow('rank_title')}>" title="<{$rank->getShow('rank_title')}>" /><br />
+        <{$rank->getShow('rank_title')}>
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_LEVEL}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('level')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_THEME}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('theme')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_TIMEZONE_OFFSET}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{if $timezone}>
+        <{$timezone->getShow('zone_name')}>
+      <{else}>
+        <{$object->getShow('timezone_offset')}>
+      <{/if}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_LAST_LOGIN}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->get('last_login')|xoops_formattimestamp:l}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_UMODE}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$umode|escape}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_UORDER}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$uorder|escape}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_NOTIFY_METHOD}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$notify_method|escape}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_NOTIFY_MODE}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$notify_mode|escape}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_OCC}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_occ')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_BIO}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('bio')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_INTREST}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_intrest')}>
+    </td>
+  </tr>
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_USER_MAILOK}></th>
+    <td class="<{cycle values='odd,even'}>">
+      <{$object->getShow('user_mailok')}>
+    </td>
+  </tr>
+</table>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:56:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:56:37 +0900
Subject: [xoops-cvslog 3755] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060728085637.57F872AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_list.html
diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.13 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.14
--- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.13	Thu Jul 13 19:53:25 2006
+++ xoops2jp/html/modules/user/admin/templates/user_list.html	Fri Jul 28 17:56:37 2006
@@ -39,13 +39,14 @@
     <tr class="<{cycle values='odd,even'}>">
       <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="<{$smarty.const._AD_USER_LANG_USER}>" title="<{$smarty.const._AD_USER_LANG_USER}>" /></td>
       <td style="text-align:center;"><{$user->getShow('uid')}></td>
-      <td><{$user->getShow('uname')}></td>
+      <td><a href="./index.php?action=UserView&amp;uid=<{$user->getShow('uid')}>"><{$user->getShow('uname')}></a></td>
       <td><{$user->getShow('name')}></td>
       <td><{$user->get('user_regdate')|xoops_formattimestamp}></td>
       <td><{$user->get('last_login')|xoops_formattimestamp:l}></td>
       <td style="text-align:right;"><{$user->getShow('posts')}></td>
       <td style="text-align:right;"><{$user->getShow('level')}></td>
       <td style="text-align:center;">
+        <a href="./index.php?action=UserView&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/property.gif"|theme}>" alt="<{$smarty.const._VIEW}>" title="<{$smarty.const._VIEW}>" /></a>
         <a href="./index.php?action=UserEdit&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <{if $user->get('uid') != 1 }>
           <a href="index.php?action=UserDelete&amp;uid=<{$user->getShow('uid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:56:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:56:52 +0900
Subject: [xoops-cvslog 3756] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060728085652.533912AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/AbstractViewAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/class/AbstractViewAction.class.php:1.1.2.1
--- /dev/null	Fri Jul 28 17:56:52 2006
+++ xoops2jp/html/modules/user/class/AbstractViewAction.class.php	Fri Jul 28 17:56:52 2006
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package User
+ * @version $Id: AbstractViewAction.class.php,v 1.1.2.1 2006/07/28 08:56:52 minahito Exp $
+ */
+
+class User_AbstractViewAction extends User_Action
+{
+	var $mObject = null;
+	var $mObjectHandler = null;
+
+	function _getId()
+	{
+	}
+
+	function &_getHandler()
+	{
+	}
+
+	function _setupObject()
+	{
+		$id = $this->_getId();
+		
+		$this->mObjectHandler =& $this->_getHandler();
+		
+		$this->mObject =& $this->mObjectHandler->get($id);
+	}
+
+	function prepare(&$controller, &$xoopsUser, &$moduleConfig)
+	{
+		$this->_setupObject();
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if ($this->mObject == null) {
+			return USER_FRAME_VIEW_ERROR;
+		}
+	
+		return USER_FRAME_VIEW_SUCCESS;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		return $this->getDefaultView($controller, $xoopsUser);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:57:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:57:07 +0900
Subject: [xoops-cvslog 3757] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060728085707.318292AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/english/admin.php
diff -u xoops2jp/html/modules/user/language/english/admin.php:1.1.2.17 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.18
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.17	Thu Jul 13 19:55:49 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Fri Jul 28 17:57:07 2006
@@ -1,6 +1,7 @@
 <?php
 
 define('_AD_USER_ERROR_AVATAR_EXTENSION', "A injury file is uploaded.");
+define('_AD_USER_ERROR_CONTENT_IS_NOT_FOUND', "Content is not found");
 define('_AD_USER_ERROR_DBUPDATE_FAILED', "Database update failed");
 define('_AD_USER_ERROR_EMAIL', "Email");
 define('_AD_USER_ERROR_GROUP_VALUE', "Specified group value is wrong.");
@@ -15,6 +16,7 @@
 define('_AD_USER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
 define('_AD_USER_ERROR_MIN', "Input {0} with {1} or more characters.");
 define('_AD_USER_ERROR_NO_UPLOAD_FILE', "Upload a image file for this rank.");
+define('_AD_USER_ERROR_OBJECTEXIST', "objectexist");
 define('_AD_USER_ERROR_PASSWORD', "The passwords you gave did not match.");
 define('_AD_USER_ERROR_PASSWORD_REQUIRED', "Password is required.");
 define('_AD_USER_ERROR_RAISE_ERROR', "Raise an error(s).");
@@ -122,6 +124,7 @@
 define('_AD_USER_LANG_RANK_NEW', "Add a new rank");
 define('_AD_USER_LANG_RANK_SPECIAL', "Special rank");
 define('_AD_USER_LANG_RANK_TITLE', "Title");
+define('_AD_USER_LANG_RECOUNT', "Recount");
 define('_AD_USER_LANG_REGDATE', "Registered date");
 define('_AD_USER_LANG_REGDATE_LESS', "Joined date is less than <strong>X</strong> days ago");
 define('_AD_USER_LANG_REGDATE_MORE', "Joined date is more than <strong>X</strong> days ago");
@@ -159,14 +162,17 @@
 define('_AD_USER_LANG_USER_REGDATE', "user regdate");
 define('_AD_USER_LANG_USER_SEARCH_LIST', "User search list");
 define('_AD_USER_LANG_USER_SIG', "Signature");
+define('_AD_USER_LANG_USER_VIEW', "user view");
 define('_AD_USER_LANG_USER_VIEWEMAIL', "Allow other users to view my email address.");
 define('_AD_USER_LANG_USER_YIM', "YIM");
 define('_AD_USER_LANG_VPASS', "Verify password");
 define('_AD_USER_MESSAGE_CONFIRM_DELETE', "Are you sure you want to delete?");
 define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "Do you delete the user rank?");
 define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "The user rank has been deleted.");
+define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "Recount success");
 define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "The user rank has been saved.");
 define('_AD_USER_TIP_DELETE_AVATAR', "Avatars of users who are using this avatar will be changed to blank.gif.");
-define('_AD_USER_TIPS_MAILJOB_SEND', "Mailjob send");
+define('_AD_USER_TIPS_MAILJOB_SEND', "If there are too many letters, the server may not return response message on screen. In the case, do reload. By repeating reload, you can send all of letters.");
+define('_AD_USER_TIPS_RECOUNT_POSTS', "If posts of this user are a wrong, you may recount it with clicking 'Recount' button.");
 
 ?>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:57:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:57:07 +0900
Subject: [xoops-cvslog 3758] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060728085707.558DE2AC609@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.26 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.27
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.26	Thu Jul 13 19:55:55 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Fri Jul 28 17:57:07 2006
@@ -1,6 +1,7 @@
 <?php
 
 define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
+define('_AD_USER_ERROR_CONTENT_IS_NOT_FOUND', "Content is not found");
 define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_AD_USER_ERROR_EMAIL', "入力された{0}を電子メールの形式として正しく認識できません");
 define('_AD_USER_ERROR_GROUP_VALUE', "指定されたグループの値が不正です");
@@ -15,6 +16,7 @@
 define('_AD_USER_ERROR_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
 define('_AD_USER_ERROR_MIN', "{0}は最低でも{1}以上の値を入力して下さい");
 define('_AD_USER_ERROR_NO_UPLOAD_FILE', "このランクのための画像ファイルをアップロードして下さい");
+define('_AD_USER_ERROR_OBJECTEXIST', "objectexist");
 define('_AD_USER_ERROR_PASSWORD', "パスワードと確認用パスワードが一致しません");
 define('_AD_USER_ERROR_PASSWORD_REQUIRED', "パスワードは必ず入力して下さい");
 define('_AD_USER_ERROR_RAISE_ERROR', "エラーが発生しました");
@@ -122,6 +124,7 @@
 define('_AD_USER_LANG_RANK_NEW', "ユーザーランク新規登録");
 define('_AD_USER_LANG_RANK_SPECIAL', "特別ランク");
 define('_AD_USER_LANG_RANK_TITLE', "ランク名");
+define('_AD_USER_LANG_RECOUNT', "再集計");
 define('_AD_USER_LANG_REGDATE', "登録日");
 define('_AD_USER_LANG_REGDATE_LESS', "ユーザ登録日時が<strong>X</strong>日以内");
 define('_AD_USER_LANG_REGDATE_MORE', "ユーザ登録日時が<strong>X</strong>日以上前");
@@ -159,14 +162,17 @@
 define('_AD_USER_LANG_USER_REGDATE', "登録日時");
 define('_AD_USER_LANG_USER_SEARCH_LIST', "ユーザー検索結果");
 define('_AD_USER_LANG_USER_SIG', "署名");
+define('_AD_USER_LANG_USER_VIEW', "ユーザー閲覧");
 define('_AD_USER_LANG_USER_VIEWEMAIL', "このメールアドレスを公開する");
 define('_AD_USER_LANG_USER_YIM', "YIM");
 define('_AD_USER_LANG_VPASS', "パスワード確認");
 define('_AD_USER_MESSAGE_CONFIRM_DELETE', "本当に削除しますか？");
 define('_AD_USER_MESSAGE_CONFIRM_DELETE_RANK', "このユーザーランクを本当に削除しますか？");
 define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "指定ユーザーランクを削除しました");
+define('_AD_USER_MESSAGE_RECOUNT_SUCCESS', "再集計に成功しました");
 define('_AD_USER_MESSAGE_SAVE_RANK_SUCCESS', "ユーザーランクを保存しました");
 define('_AD_USER_TIP_DELETE_AVATAR', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
 define('_AD_USER_TIPS_MAILJOB_SEND', "送信対象ユーザー数が多すぎる場合、反応が返ってこないケース（真っ白になるなど）があります。<br/>その場合はブラウザでリロード（再読込）操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。");
+define('_AD_USER_TIPS_RECOUNT_POSTS', "もし投稿数が間違っているようであれば、再計算することができます。");
 
 ?>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:58:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:58:02 +0900
Subject: [xoops-cvslog 3759] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060728085802.42DF02AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.54 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.55
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.54	Thu Jul 27 18:29:30 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Fri Jul 28 17:58:02 2006
@@ -752,6 +752,7 @@
 		$delegateManager->add('Legacypage.Imagemanager.Access', 'Legacy_EventFunction::imageManager', $file);
 		$delegateManager->add('Legacypage.Backend.Access', 'Legacy_EventFunction::backend', $file);
 		$delegateManager->add('Legacypage.Misc.Access', 'Legacy_EventFunction::misc', $file);
+		$delegateManager->add('User_UserViewAction.GetUserPosts', 'Legacy_EventFunction::recountPost', $file);
 		
 		return $delegateManager;
 	}

From minahito ＠ users.sourceforge.jp  Fri Jul 28 17:58:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 17:58:27 +0900
Subject: [xoops-cvslog 3760] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060728085827.CCCAB2AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.8 xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.9
--- xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php:1.1.2.8	Thu Jul 27 18:30:24 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_EventFunctions.class.php	Fri Jul 28 17:58:27 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package legacy
- * @version $Id: Legacy_EventFunctions.class.php,v 1.1.2.8 2006/07/27 09:30:24 minahito Exp $
+ * @version $Id: Legacy_EventFunctions.class.php,v 1.1.2.9 2006/07/28 08:58:27 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -180,6 +180,19 @@
 		
 		$render->setAttribute('xoops_notification', $xoops_notification);
 	}
+	
+	/**
+	 * This member function is added to 'User_UserViewAction.GetUserPosts'.
+	 * Recount posts of $xoopsUser in the comment system.
+	 * 
+	 * @static
+	 */
+	function recountPost(&$posts, $xoopsUser)
+	{
+		$handler =& xoops_gethandler('comment');
+		$criteria =& new Criteria('com_uid', $xoopsUser->get('uid'));
+		$posts += $handler->getCount($criteria);
+	}
 }
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Jul 28 18:00:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 18:00:51 +0900
Subject: [xoops-cvslog 3761] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060728090051.3AD032AC609@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/user_recount.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/user_recount.xml:1.1.2.1
--- /dev/null	Fri Jul 28 18:00:51 2006
+++ xoops2jp/html/modules/user/admin/.xml/user_recount.xml	Fri Jul 28 18:00:51 2006
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="RecountForm" type="XCube_ActionForm">
+		<form-property name="uid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="uid" depends="required,objectExist">
+			<arg0 key="const._AD_USER_LANG_UID" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_USER_ERROR_OBJECTEXIST" /> 
+			<var name="handler" value="users" />
+			<var name="module" value="user" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Fri Jul 28 18:04:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Jul 2006 18:04:39 +0900
Subject: [xoops-cvslog 3762] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060728090439.D3B3A2AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.55 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.56
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.55	Fri Jul 28 17:58:02 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Fri Jul 28 18:04:39 2006
@@ -784,8 +784,8 @@
 			if(is_object($this->mXoopsUser)) {
 				// RMV-NOTIFY
 				// Perform some maintenance of notification records
-				// $notification_handler =& xoops_gethandler('notification');
-				// $notification_handler->doLoginMaintenance($user->getVar('uid'));
+				$notification_handler =& xoops_gethandler('notification');
+				$notification_handler->doLoginMaintenance($this->mXoopsUser->get('uid'));
 
 				XCube_DelegateUtils::call("Site.CheckLogin.Success", new XCube_Ref($this->mXoopsUser));
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 18:45:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 18:45:43 +0900
Subject: [xoops-cvslog 3763] CVS update: xoops2jp/html
Message-ID: <20060731094543.D9C002AC0FA@users.sourceforge.jp>

Index: xoops2jp/html/backend.php
diff -u xoops2jp/html/backend.php:1.2.8.2 xoops2jp/html/backend.php:1.2.8.3
--- xoops2jp/html/backend.php:1.2.8.2	Fri May 26 21:08:31 2006
+++ xoops2jp/html/backend.php	Mon Jul 31 18:45:43 2006
@@ -2,10 +2,11 @@
 /**
  * This file was full scratched in XOOPS Cube Legacy project.
  * 
- * @version $Id: backend.php,v 1.2.8.2 2006/05/26 12:08:31 minahito Exp $
+ * @package Legacy
+ * @version $Id: backend.php,v 1.2.8.3 2006/07/31 09:45:43 minahito Exp $
  */
 
-require_once "mainfile.php";
+require_once "./mainfile.php";
 require_once XOOPS_ROOT_PATH . "/header.php";
 
 //
@@ -13,7 +14,6 @@
 // Raise event "Legacypage.Backend.Access"
 //
 $root=&XCube_Root::getSingleton();
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Backend.Access", $root->mController, $eventArgs);
+XCube_DelegateUtils::call("Legacypage.Backend.Access");
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Jul 31 18:45:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 18:45:51 +0900
Subject: [xoops-cvslog 3764] CVS update: xoops2jp/html
Message-ID: <20060731094551.918872AC0FA@users.sourceforge.jp>

Index: xoops2jp/html/index.php
diff -u xoops2jp/html/index.php:1.2.8.2 xoops2jp/html/index.php:1.2.8.3
--- xoops2jp/html/index.php:1.2.8.2	Fri Dec 30 17:19:38 2005
+++ xoops2jp/html/index.php	Mon Jul 31 18:45:51 2006
@@ -1,19 +1,16 @@
 <?php
-// $Id: index.php,v 1.2.8.2 2005/12/30 08:19:38 minahito Exp $
+/**
+ * @package Legacy
+ * @version $Id: index.php,v 1.2.8.3 2006/07/31 09:45:51 minahito Exp $
+ */
 
 require_once "./mainfile.php";
 require_once "./header.php";
 
-//
-// Check if start page is defined
-//
-$root =& XCube_Root::getSingleton();
-
-$eventArgs = array();
-$root->mEventManager->raiseEvent("Legacypage.Top.Access", $root->mController, $eventArgs);
+$root=&XCube_Root::getSingleton();
 
 $xoopsOption['show_cblock'] = 1;
+XCube_DelegateUtils::call("Legacypage.Top.Access");
 
 require_once "./footer.php";
-
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Jul 31 18:52:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 18:52:26 +0900
Subject: [xoops-cvslog 3765] CVS update: xoops2jp/html/class
Message-ID: <20060731095226.CE6D12AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.5 xoops2jp/html/class/module.textsanitizer.php:1.2.8.6
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.5	Sat Feb 18 23:51:46 2006
+++ xoops2jp/html/class/module.textsanitizer.php	Mon Jul 31 18:52:26 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.textsanitizer.php,v 1.2.8.5 2006/02/18 14:51:46 nobunobu Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.6 2006/07/31 09:52:26 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -53,6 +53,26 @@
      */
     var $censorConf;
 
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mMakeClickablePre = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mMakeClickablePostFilter = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mXoopsCodePre = null;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mXoopsCodePostFilter = null;
+	
     /*
     * Constructor of this class
     *
@@ -66,7 +86,17 @@
     */
     function MyTextSanitizer()
     {
-
+		$this->mMakeClickablePre =& new XCube_NewDelegate();
+		$this->mMakeClickablePre->register('MyTextSanitizer.MakeClickablePre');
+		
+		$this->mMakeClickablePostFilter =& new XCube_NewDelegate();
+		$this->mMakeClickablePostFilter->register('MyTextSanitizer.MakeClickablePostFilter');
+		
+		$this->mXoopsCodePre =& new XCube_NewDelegate();
+		$this->mXoopsCodePre->register('MyTextSanitizer.XoopsCodePre');
+		
+		$this->mXoopsCodePostFilter =& new XCube_NewDelegate();
+		$this->mXoopsCodePostFilter->register('MyTextSanitizer.XoopsCodePostFilter');
     }
 
     /**
@@ -133,27 +163,22 @@
         $patterns = array("/(^|[^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/])ftp\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/(^|[^]_a-z0-9-=\"'\/:\.])([a-z0-9\-_\.]+?)@([^, \r\n\"\(\)'<>\[\]]+)/i");
         $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"ftp://ftp.\\2.\\3\" target=\"_blank\">ftp.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
 
-        // RaiseEvent 'Legacy.TextSanitizer.MakeClicablePre'
+        // RaiseEvent 'MyTextSanitizer.MakeClickablePre' ('Legacy.TextSanitizer.MakeClicablePre')
         //  Delegate may replace makeClickable conversion table
         //  varArgs : 
         //      'patterns'     [I/O] : &Array of pattern RegExp
         //      'replacements' [I/O] : &Array of replacing string
         //
-        if ($result =& XCube_EventUtils::quickRaiseEvent('Legacy.TextSanitizer.MakeClickablePre', 
-        												 array('patterns'=> &$patterns,
-        												       'replacements' => &$replacements))) {
-        	$patterns =& $result['patterns'];
-        	$replacements =& $result['replacements'];
-        }
+        $this->mMakeClickablePre->call(new XCube_Ref($patterns), new XCube_Ref($replacements));
 
         $text = preg_replace($patterns, $replacements, $text);
 
-        // RaiseEvent : 'Legacy.TextSanitizer.MakeClicablePostFilter' 
+        // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter' ('Legacy.TextSanitizer.MakeClicablePostFilter')
         //  Delegate may convert output text with quickApplyFilter rule
         //  varArgs : 
         //      'string'       [I/O] : Text to convert;
         //
-        $text = XCube_EventUtils::quickApplyFilter('Legacy.TextSanitizer.MakeClickablePostFilter', $text);
+        $this->mMakeClickablePostFilter->call(new XCube_Ref($text));
 
         return $text;
     }
@@ -226,31 +251,24 @@
         $patterns[] = "/about:/si";
         $replacements[] = "about :";
 
-        // RaiseEvent 'Legacy.TextSanitizer.XoopsCodePre' 
+        // RaiseEvent 'MyTextSanitizer.XoopsCodePre' ('Legacy.TextSanitizer.XoopsCodePre')
         //  Delegate may replace conversion table
         //  varArgs : 
         //      'patterns'     [I/O] : &Array of pattern RegExp
         //      'replacements' [I/O] : &Array of replacing string
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
-        if ($result =& XCube_EventUtils::quickRaiseEvent('Legacy.TextSanitizer.XoopsCodePre', 
-        												 array('patterns'=> &$patterns,
-        												       'replacements' => &$replacements,
-        												       'allowimage'=>$allowimage))) {
-        	$patterns =& $result['patterns'];
-        	$replacements =& $result['replacements'];
-        }
+        $this->mXoopsCodePre->call(new XCube_Ref($patterns), new XCube_Ref($replacements), $allowimage);
 
         $text = preg_replace($patterns, $replacements, $text);
         
-        // RaiseEvent : 'Legacy.TextSanitizer.XoopsCodePostFilter' 
+        // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter' ('Legacy.TextSanitizer.XoopsCodePostFilter')
         //  Delegate may convert output text with quickApplyFilter rule
         //  varArgs : 
         //      'string'       [I/O] : Text to convert;
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
-        $text = XCube_EventUtils::quickApplyFilter('Legacy.TextSanitizer.XoopsCodePostFilter', $text,
-        											array('allowimage'=>$allowimage));
+        $this->mXoopsCodePostFilter->call(new XCube_Ref($text), $allowimage);
 
         return $text;
     }

From minahito ＠ users.sourceforge.jp  Mon Jul 31 18:56:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 18:56:29 +0900
Subject: [xoops-cvslog 3766] CVS update: xoops2jp/html/class
Message-ID: <20060731095630.01DBA2AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/class/template.php
diff -u xoops2jp/html/class/template.php:1.2.8.6 xoops2jp/html/class/template.php:1.2.8.7
--- xoops2jp/html/class/template.php:1.2.8.6	Wed May 10 12:34:12 2006
+++ xoops2jp/html/class/template.php	Mon Jul 31 18:56:29 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: template.php,v 1.2.8.6 2006/05/10 03:34:12 minahito Exp $
+// $Id: template.php,v 1.2.8.7 2006/07/31 09:56:29 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -87,12 +87,12 @@
 							'xoops_upload_url' => XOOPS_UPLOAD_URL
 							));
 
-        // RaiseEvent 'Legacy.XoopsTpl.New' 
+        // Delegate 'XoopsTpl.New' 
         //  Delegate may define additional initialization code for XoopTpl Instance;
         //  varArgs : 
         //      'xoopsTpl'     [I/O] : $this
         //
-		$dmy =& XCube_EventUtils::quickRaiseEvent('Legacy.XoopsTpl.New',  array('xoopsTpl' => &$this));
+		XCube_DelegateUtils::call('XoopsTpl.New',  new XCube_Ref($this));
 	}
 
 	/**
@@ -258,13 +258,16 @@
  **/
 function xoops_template_touch($tpl_id, $clear_old = true)
 {
+	$result = null;
+	
     // RaiseEvent 'Legacy.XoopsTpl.TemplateTouch' 
     //  Delegate may define new template touch logic (with XC21, only for clear cache & compiled template)
     //  varArgs : 
     //      'xoopsTpl'     [I/O] : $this
     //
-	if (! $eventResult =& XCube_EventUtils::quickRaiseEvent('Legacy.XoopsTpl.TemplateTouch',
-											 array('tpl_id' => $tpl_id,'clear_old' => $clear_old,'result'=>false))) {
+    XCube_DelegateUtils::call('Legacy.XoopsTpl.TemplateTouch', $tpl_id, $clear_old, new XCube_Ref($result));
+	
+	if ($result === null) {
 		$tpl = new XoopsTpl();
 		$tpl->force_compile = true;
 		$tplfile_handler =& xoops_gethandler('tplfile');
@@ -280,7 +283,7 @@
 		}
 		return false;
 	} else {
-		return $eventResult['result'];
+		return $result;
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 18:57:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 18:57:26 +0900
Subject: [xoops-cvslog 3767] CVS update: xoops2jp/html/class
Message-ID: <20060731095726.E0B6D2AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_Utils.class.php
diff -u xoops2jp/html/class/XCube_Utils.class.php:1.1.2.4 xoops2jp/html/class/XCube_Utils.class.php:1.1.2.5
--- xoops2jp/html/class/XCube_Utils.class.php:1.1.2.4	Tue Apr 11 17:39:06 2006
+++ xoops2jp/html/class/XCube_Utils.class.php	Mon Jul 31 18:57:26 2006
@@ -1,29 +1,8 @@
 <?php
-// $Id: XCube_Utils.class.php,v 1.1.2.4 2006/04/11 08:39:06 nobunobu Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                  Copyright (c) 2000 XOOPSCube.org                         //
-//                     <http://www.xoopscube.org/>                           //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @package XCube
+ * @version $Id: XCube_Utils.class.php,v 1.1.2.5 2006/07/31 09:57:26 minahito Exp $
+ */
 
 class XCube_Utils
 {
@@ -35,69 +14,13 @@
 	@param $url string
 	@param $time intval
 	@param $message If you want to multiline message, you must set message as array.
+	
+	@deprecated Don't use static function of XCube layer for redirect.
 	*/
-	function redirectHeader($url,$time,$messages=_TAKINGBACK)
+	function redirectHeader($url, $time, $messages = null)
 	{
-		global $xoopsConfig, $xoopsRequestUri;
-
-		if (preg_match("/(javascript|vbscript):/si", $url) )
-			$url = XOOPS_URL;
-
-
-		$displayMessage = is_array($messages) ? implode("<br/>",$messages) : $messages;
-
-		if (!defined('XOOPS_CPFUNC_LOADED')) {
-			require_once XOOPS_ROOT_PATH.'/class/template.php';
-			$xoopsTpl = new XoopsTpl();
-			$xoopsTpl->assign('sitename', htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
-			$xoopsTpl->assign('langcode', _LANGCODE);
-			$xoopsTpl->assign('charset', _CHARSET);
-			$xoopsTpl->assign('time', $time);
-
-			if (defined('SID') && (! isset($_COOKIE[session_name()]) || ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '' && !isset($_COOKIE[$xoopsConfig['session_name']])))) {
-				if (!strstr($url, '?')) {
-					$url .= '?' . SID;
-				}
-				else {
-					$url .= '&amp;'.SID;
-				}
-			}
-
-			$url = preg_replace("/&amp;/i", '&', htmlspecialchars($url, ENT_QUOTES));
-			$xoopsTpl->assign('url', $url);
-			$xoopsTpl->assign('message', $displayMessage);
-			$xoopsTpl->assign('lang_ifnotreload', sprintf(_IFNOTRELOAD, $url));
-			$GLOBALS['xoopsModuleUpdate'] = 1;
-			$xoopsTpl->display('db:system_redirect.html');
-		} else {
-			$url = preg_replace("/&amp;/i", '&', htmlspecialchars($url, ENT_QUOTES));
-			echo '
-			<html>
-			<head>
-			<title>'.htmlspecialchars($xoopsConfig['sitename']).'</title>
-			<meta http-equiv="Content-Type" content="text/html; charset='._CHARSET.'" />
-			<meta http-equiv="Refresh" content="'.$time.'; url='.$url.'" />
-			<style type="text/css">
-					body {background-color : #fcfcfc; font-size: 12px; font-family: Trebuchet MS,Verdana, Arial, Helvetica, sans-serif; margin: 0px;}
-					.redirect {width: 70%; margin: 110px; text-align: center; padding: 15px; border: #e0e0e0 1px solid; color: #666666; background-color: #f6f6f6;}
-					.redirect a:link {color: #666666; text-decoration: none; font-weight: bold;}
-					.redirect a:visited {color: #666666; text-decoration: none; font-weight: bold;}
-					.redirect a:hover {color: #999999; text-decoration: underline; font-weight: bold;}
-			</style>
-			</head>
-			<body>
-			<div align="center">
-			<div class="redirect">
-			<span style="font-size: 16px; font-weight: bold;">'.$displayMessage.'</span>
-			<hr style="height: 3px; border: 3px #E18A00 solid; width: 95%;" />
-			<p>'.sprintf(_IFNOTRELOAD, $url).'</p>
-			</div>
-			</div>
-			</body>
-			</html>';
-		}
-		
-		exit();
+		$root =& XCube_Root::getSingleton();
+		$root->mController->executeRedirect($url, $time, $messages);
 	}
 	
 	function formatMessage()

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:01:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:01:29 +0900
Subject: [xoops-cvslog 3768] CVS update: xoops2jp/html/kernel
Message-ID: <20060731100129.160372AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/kernel/notification.php
diff -u xoops2jp/html/kernel/notification.php:1.2.8.2 xoops2jp/html/kernel/notification.php:1.2.8.3
--- xoops2jp/html/kernel/notification.php:1.2.8.2	Tue May 16 22:25:07 2006
+++ xoops2jp/html/kernel/notification.php	Mon Jul 31 19:01:28 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: notification.php,v 1.2.8.2 2006/05/16 13:25:07 nobunobu Exp $
+// $Id: notification.php,v 1.2.8.3 2006/07/31 10:01:28 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -170,6 +170,18 @@
  */
 class XoopsNotificationHandler extends XoopsObjectHandler
 {
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mTrigger = null;
+	
+	function XoopsNotificationHandler(&$db)
+	{
+		parent::XoopsObjectHandler($db);
+		
+		$this->mTrigger =& new XCube_NewDelegate();
+		$this->mTrigger->register('XoopsNotificationHandler.Trigger');
+	}
 
     /**
      * Create a {@link XoopsNotification}
@@ -585,7 +597,7 @@
 				break;
 			}
 		}
-        // RaiseEvent 'Legacy.Notify.Trigger'
+        // RaiseEvent 'XoopsNotificationHandler.Trigger' ('Legacy.Notify.Trigger')
         //  Delegate may hanldle notified event
 		//  varArgs :
 		//      'category'     [I] : Paramater $category of triggerEvent()
@@ -599,6 +611,7 @@
 		//      'force_return' [O] : If force return this triggerEvents method, set it True
         //
 		if ($event_correct) {
+			/*
 			$varArgs  = array('category' => $category,
 							'event' => $event,
 							'itemId' => $item_id,
@@ -608,11 +621,14 @@
 							'omitUid' => $omit_user_id,
 							'eventConfig' => $not_config,
 							'force_return' => false,
-						);
-	        if ($result =& XCube_EventUtils::quickRaiseEvent('Legacy.Notify.Trigger', $varArgs )) {
-	        	if ($result['force_return']) return;
-	        }
+						);*/
+						
+			$force_return = false;
 			
+			$this->mTrigger->call($category, $event, $item_id, $extra_tags, new XCube_Ref($module), $user_list, $omit_user_id, $not_config, new XCube_Ref($force_return));
+        	if ($force_return) {
+				return;
+			}
 		}
 
 		// Check if event is enabled

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:02:17 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:02:17 +0900
Subject: [xoops-cvslog 3769] CVS update: xoops2jp/html/kernel
Message-ID: <20060731100217.320852AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.13 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.14
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.13	Thu Jul 20 17:10:57 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Mon Jul 31 19:02:17 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Controller.class.php,v 1.1.2.13 2006/07/20 08:10:57 minahito Exp $
+ * @version $Id: XCube_Controller.class.php,v 1.1.2.14 2006/07/31 10:02:17 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -9,8 +9,6 @@
 require_once XOOPS_ROOT_PATH . "/class/XCube_ActionFilter.class.php";
 require_once XOOPS_ROOT_PATH . "/class/XCube_BlockProcedure.class.php";
 require_once XOOPS_ROOT_PATH . "/class/XCube_RenderSystem.class.php";
-require_once XOOPS_ROOT_PATH . "/class/XCube_EventArgs.class.php";
-
 require_once XOOPS_ROOT_PATH . "/kernel/XCube_Delegate.class.php";
 
 /**
@@ -81,7 +79,6 @@
 	{
 		$this->mRoot=&$root;
 		
-		$this->mRoot->setEventManager($this->_createEventManager());
 		$this->mRoot->setDelegateManager($this->_createDelegateManager());
 		$this->mRoot->setServiceManager($this->_createServiceManager());
 	}
@@ -219,14 +216,6 @@
 	
 	function _setupUser()
 	{
-		$eventManager=&$this->mRoot->getEventManager();
-		if($eventManager!=null) {
-			$eventArgs= new LoginEventArgs();
-			$eventManager->raiseEvent("Site.Login",$this,$eventArgs);
-
-			if($eventArgs->hasUser())
-				$this->mUser=&$eventArgs->getUser();
-		}
 	}
 	
 	function _setupModuleController()
@@ -335,13 +324,6 @@
 		}
 	}
 	
-	function &_createEventManager()
-	{
-		require_once XOOPS_ROOT_PATH."/class/XCube_EventManager.class.php";
-		$eventManager=new XCube_EventManager();
-		return $eventManager;
-	}
-	
 	/**
 	 * Create an instance of delegate manager and return it.
 	 * 
@@ -355,8 +337,8 @@
 
 	function &_createServiceManager()
 	{
-		require_once XOOPS_ROOT_PATH."/class/XCube_ServiceManager.class.php";
-		$serviceManager=new XCube_ServiceManager();
+		require_once XOOPS_ROOT_PATH . "/class/XCube_ServiceManager.class.php";
+		$serviceManager =& new XCube_ServiceManager();
 		return $serviceManager;
 	}
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:02:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:02:53 +0900
Subject: [xoops-cvslog 3770] CVS update: xoops2jp/html/kernel
Message-ID: <20060731100253.403EC2AC0D1@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Root.class.php
diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.15 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.16
--- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.15	Tue Jul 11 19:05:58 2006
+++ xoops2jp/html/kernel/XCube_Root.class.php	Mon Jul 31 19:02:53 2006
@@ -1,7 +1,7 @@
 <?php
 /**
- * @version $Id: XCube_Root.class.php,v 1.1.2.15 2006/07/11 10:05:58 minahito Exp $
  * @package XCube
+ * @version $Id: XCube_Root.class.php,v 1.1.2.16 2006/07/31 10:02:53 minahito Exp $
  */
 
 /**
@@ -23,11 +23,6 @@
 	 */
 	var $mLanguageManager = null;
 
-	/**
-	 * @deprecated
-	 */	
-	var $mEventManager = null;
-	
 	var $mDelegateManager = null;
 	
 	var $mServiceManager = null;
@@ -214,27 +209,6 @@
 	}
 	
 	/**
-	 * Set the instance of the event manager.
-	 * 
-	 * @param $eventManager XCube_EventManager
-	 * @return void
-	 */
-	function setEventManager(&$eventManager)
-	{
-		$this->mEventManager =& $eventManager;
-	}
-	
-	/**
-	 * Return the instance of the event manager.
-	 * 
-	 * @return XCube_EventManager
-	 */
-	function &getEventManager()
-	{
-		return $this->mEventManager;
-	}
-	
-	/**
 	 * Set the instance of the delegate manager.
 	 * 
 	 * @param $delegateManager XCube_DelegateManager

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:04:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:04:53 +0900
Subject: [xoops-cvslog 3771] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060731100453.6EE4F2AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/BackendAction.class.php
diff -u xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.4 xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/actions/BackendAction.class.php:1.1.2.4	Sat May 27 23:07:40 2006
+++ xoops2jp/html/modules/base/actions/BackendAction.class.php	Mon Jul 31 19:04:53 2006
@@ -6,22 +6,6 @@
 {
 	var $mItems = array();
 	
-	function getDefaultView(&$controll, &$xoopsUser)
-	{
-		$items= $this->_getRSSInformation();
-
-		$sortArr = array();
-		foreach ($items as $item) {
-			$i = intval($item['pubdate']);
-			for (; isset($sortArr[$i]) ; $i++);
-			
-			$sortArr[$i] = $item;
-		}
-		krsort($sortArr);
-	    $this->mItems = $sortArr;
-		return LEGACY_FRAME_VIEW_INDEX;
-	}
-
 	/**
 	 * The spec of getRSS():
 	 * append your RSS item to $eventArgs array. You don't need to sanitize your values. Use raw value.
@@ -33,14 +17,34 @@
 	 *  $item['description'] ... not required. 
 	 *  $item['category'] ... not required. 
 	 *  $item['author'] ... not required. 
-	 */	
-	function _getRSSInformation()
+	 *  
+	 * @var XCube_NewDelegate
+	 */
+	var $mGetRSSItems = null;
+	
+	function Legacy_BackendAction($flag)
 	{
-		$root =& XCube_Root::getSingleton();
-		$eventArgs = array();
-		$root->mEventManager->raiseEvent("Module.Legacy.Backend.getRSS", $this, $eventArgs);
+		parent::Legacy_Action($flag);
 		
-		return $eventArgs;
+		$this->mGetRSSItems =& new XCube_NewDelegate();
+		$this->mGetRSSItems->register('Legacy_BackendAction.GetRSSItems');
+	}
+	
+	function getDefaultView(&$controll, &$xoopsUser)
+	{
+		$items = array();
+		$this->mGetRSSItems->call(new XCube_Ref($items));
+
+		$sortArr = array();
+		foreach ($items as $item) {
+			$i = intval($item['pubdate']);
+			for (; isset($sortArr[$i]) ; $i++);
+			
+			$sortArr[$i] = $item;
+		}
+		krsort($sortArr);
+	    $this->mItems = $sortArr;
+		return LEGACY_FRAME_VIEW_INDEX;
 	}
 	
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:05:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:05:08 +0900
Subject: [xoops-cvslog 3772] CVS update: xoops2jp/html/modules/base/actions
Message-ID: <20060731100508.264BB2AC0A5@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/actions/SearchResultsAction.class.php
diff -u xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.5 xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/actions/SearchResultsAction.class.php:1.1.2.5	Thu Jul 27 18:31:36 2006
+++ xoops2jp/html/modules/base/actions/SearchResultsAction.class.php	Mon Jul 31 19:05:07 2006
@@ -34,7 +34,7 @@
 	function hasPerm(&$controller, &$xoopsUser)
 	{
 		if ($this->mConfig['enable_search'] != 1) {
-			XCube_Utils::redirectHeader(XOOPS_URL, 3, _MD_BASE_ERROR_SEARCH_NOT_ENABLED);
+			$controller->executeRedirect(XOOPS_URL, 3, _MD_BASE_ERROR_SEARCH_NOT_ENABLED);
 			return false;
 		}
 		return true;

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:22:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:22:13 +0900
Subject: [xoops-cvslog 3773] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060731102213.DBF932AC0D2@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/comment.php
diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.8 xoops2jp/html/modules/base/class/comment.php:1.1.2.9
--- xoops2jp/html/modules/base/class/comment.php:1.1.2.8	Fri Apr 14 15:02:09 2006
+++ xoops2jp/html/modules/base/class/comment.php	Mon Jul 31 19:22:13 2006
@@ -73,15 +73,29 @@
 	var $mTable = "xoopscomments";
 	var $mPrimary = "com_id";
 	var $mClass = "BaseCommentObject";
+
+	/**
+	 * @var XCube_NewDelegate
+	 */	
+	var $mUpdateSuccess;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */	
+	var $mDeleteSuccess;
+	
+	function BaseCommentHandler(&$db)
+	{
+		parent::XoopsObjectGenericHandler($db);
+		
+		$this->mUpdateSuccess =& new XCube_NewDelegate();
+		$this->mDeleteSuccess =& new XCube_NewDelegate();
+	}
 	
 	function insert(&$comment, $force = false)
 	{
 		if (parent::insert($comment, $force)) {
-			$root =& XCube_Root::getSingleton();
-			$eventArgs = array();
-			$eventArgs['comment'] =& $comment;
-			$root->mEventManager->raiseEvent('Module.Legacy.Comment.Update.Success', $this, $eventArgs);
-			
+			$this->mUpdateSuccess->call($comment);
 			return true;
 		}
 		else {
@@ -98,10 +112,8 @@
 		$this->deleteAll($criteria);
 		
 		if (parent::delete($comment, $force)) {
-			$root =& XCube_Root::getSingleton();
-			$eventArgs = array();
-			$eventArgs['comment'] =& $comment;
-			$root->mEventManager->raiseEvent('Module.Legacy.Comment.Delete.Success', $this, $eventArgs);
+			$this->mDeleteSuccess->call($comment);
+			return true;
 		}
 		else{
 			return false;

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:22:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:22:42 +0900
Subject: [xoops-cvslog 3774] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060731102242.AF8692AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.7 xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.8
--- xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.7	Tue Apr 11 12:50:50 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php	Mon Jul 31 19:22:42 2006
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @package Legacy
+ * @version $Id: CommentDeleteAction.class.php,v 1.1.2.8 2006/07/31 10:22:42 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -8,22 +12,15 @@
 
 class Legacy_CommentDeleteAction extends Legacy_AbstractDeleteAction
 {
-	function prepare(&$controller, &$xoopsUser)
-	{
-		parent::prepare($controller, $xoopsUser);
-				
-		$root =& XCube_Root::getSingleton();
-		$root->mEventManager->add("Module.Legacy.Comment.Delete.Success", new XCube_InstanceDelegate($this, "doDelete"));
-	}
-	
 	function _getId()
 	{
-		return isset($_REQUEST['com_id']) ? $_REQUEST['com_id'] : 0;
+		return isset($_REQUEST['com_id']) ? xoops_getrequest('com_id') : 0;
 	}
 
 	function &_getHandler()
 	{
 		$handler =& xoops_getmodulehandler('comment');
+		$handler->mDeleteSuccess->add(array(&$this, "doDelete"));
 		return $handler;
 	}
 
@@ -69,13 +66,11 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$render)
 	{
-		redirect_header("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
+		$controller->executeRedirect("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
 	}
 	
-	function doDelete(&$sender, &$eventArgs)
+	function doDelete($comment)
 	{
-		$comment =& $eventArgs['comment'];
-		
 		//
 		// Adjust user's post count.
 		//
Index: xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.8 xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.9
--- xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.8	Tue Apr 11 12:51:10 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php	Mon Jul 31 19:22:42 2006
@@ -39,15 +39,11 @@
 	{
 		if ($this->mObject->get('com_status') == 1) {
 			$this->mActionForm =& new Legacy_PendingCommentAdminEditForm();
-
-			$root =& XCube_Root::getSingleton();
-			$root->mEventManager->add("Module.Legacy.Comment.Update.Success", new XCube_InstanceDelegate($this, "doApprove"));
+			$this->mObjectHandler->mUpdateSuccess->add(array(&$this, "doApprove"));
 		}
 		else {
 			$this->mActionForm =& new Legacy_ApprovalCommentAdminEditForm();
-		
-			$root =& XCube_Root::getSingleton();
-			$root->mEventManager->add("Module.Legacy.Comment.Update.Success", new XCube_InstanceDelegate($this, "doUpdate"));
+			$this->mObjectHandler->mUpdateSuccess->add(array(&$this, "doUpdate"));
 		}
 		$this->mActionForm->prepare();
 	}
@@ -118,7 +114,7 @@
 		return $comment_config;
 	}
 	
-	function doApprove(&$sender, &$eventArgs)
+	function doApprove($comment)
 	{
 		$comment =& $eventArgs['comment'];
 		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
@@ -133,13 +129,18 @@
 			call_user_func($function, $comment);
 		}
 		
-		Legacy_CommentEditAction::addUserPost($comment);		
+		$handler =& xoops_gethandler('member');
+
+		//
+		// TODO We should adjust the following lines and handler's design.
+		// We think we should not use getUser() and updateUserByField in XCube 2.1.
+		//
+		$user =& $handler->getUser($comment->get('com_uid'));
+		$handler->updateUserByField($user, 'posts', $user->get('posts') + 1);
 	}
 	
-	function doUpdate(&$sender, &$eventArgs)
+	function doUpdate($comment)
 	{
-		$comment =& $eventArgs['comment'];
-		
 		//
 		// Adjust user's post count.
 		//

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:28:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:28:54 +0900
Subject: [xoops-cvslog 3775] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060731102854.5C8442AC0FA@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.11 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.12
--- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.11	Sat Apr 15 14:23:42 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html	Mon Jul 31 19:28:54 2006
@@ -11,10 +11,10 @@
     <option value="0"><{$smarty.const._MD_A_BASE_LANG_ALL_MODULE}></option>
     <{foreach item=module from=$moduleArr}>
       <{if $pageNavi->mExtra.com_modid == $module->get('mid')}>
-        <option value="<{$module->getVar('mid')}>" selected><{$module->getVar('name')}></option>
+        <option value="<{$module->getShow('mid')}>" selected><{$module->getShow('name')}></option>
       <{else}>
         <{$pageNavi->mExtra.com_modid}>
-        <option value="<{$module->getVar('mid')}>"><{$module->getVar('name')}></option>
+        <option value="<{$module->getShow('mid')}>"><{$module->getShow('name')}></option>
       <{/if}>
     <{/foreach}>
   </select>
@@ -23,9 +23,9 @@
     <option value="0"><{$smarty.const._AD_BASE_LANG_ALL_STATUS}></option>
     <{foreach item=status from=$statusArr}>
       <{if $pageNavi->mExtra.com_status == $status->get('id')}>
-        <option value="<{$status->getVar('id')}>" selected><{$status->getVar('name')}></option>
+        <option value="<{$status->getShow('id')}>" selected><{$status->getShow('name')}></option>
       <{else}>
-        <option value="<{$status->getVar('id')}>"><{$status->getVar('name')}></option>
+        <option value="<{$status->getShow('id')}>"><{$status->getShow('name')}></option>
       <{/if}>
     <{/foreach}>
   </select>
@@ -63,14 +63,18 @@
   </tr>
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center">
-      <td><{$obj->getVar('com_id')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
-      <td><a href="./index.php?action=CommentView&amp;com_id=<{$obj->getVar('com_id')}>"><{$obj->getVar('com_title')}></a></td>
-      <td><{$obj->getVar('com_created')|xoops_formattimestamp:l}></td>
-      <td><{$obj->getVar('com_modified')|xoops_formattimestamp:l}></td>
-      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getVar('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
-      <td><{$obj->getVar('com_ip')}></td>
-      <td><{$obj->mStatus->getVar('name')}></td>
+      <td><{$obj->getShow('com_id')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getShow('name')}>
+        <{/if}>
+      </td>
+      <td><a href="./index.php?action=CommentView&amp;com_id=<{$obj->getShow('com_id')}>"><{$obj->getShow('com_title')}></a></td>
+      <td><{$obj->getShow('com_created')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getShow('com_modified')|xoops_formattimestamp:l}></td>
+      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
+      <td><{$obj->getShow('com_ip')}></td>
+      <td><{$obj->mStatus->getShow('name')}></td>
       <td>
         <a href="./index.php?action=CommentEdit&amp;com_id=<{$obj->get('com_id')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
         <a href="./index.php?action=CommentDelete&amp;com_id=<{$obj->get('com_id')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.10
--- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.9	Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_delete.html	Mon Jul 31 19:28:54 2006
@@ -17,79 +17,83 @@
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_id')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_id')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_PID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_pid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_pid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ROOTID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_rootid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_rootid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mModule->getVar('name')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $obj->mModule}>
+          <{$obj->mModule->getShow('name')}>
+        <{/if}>
+      </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ITEMID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_itemid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_itemid')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_ICON}></td>
-      <td class="<{cycle values="odd,even"}>"><img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$object->getVar('com_icon')}>" /></td>
+      <td class="<{cycle values="odd,even"}>"><img src="<{$smarty.const.XOOPS_URL}>/images/subject/<{$object->getShow('com_icon')}>" /></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_CREATED}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_created')|xoops_formattimestamp:l}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_created')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_modified')|xoops_formattimestamp:l}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_modified')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_UID}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mUser->getVar('uname')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->mUser->getShow('uname')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_IP}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_ip')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_ip')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TITLE}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_title')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_title')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_TEXT}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_text')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_text')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_SIG}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=com_sig value=1 default=$object->getVar('com_sig') disabled=true}><{$smarty.const._YES}>
-        <{xoops_input type=radio name=com_sig value=0 default=$object->getVar('com_sig') disabled=true}><{$smarty.const._NO}>
+        <{xoops_input type=radio name=com_sig value=1 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._YES}>
+        <{xoops_input type=radio name=com_sig value=0 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._NO}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_STATUS}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->mStatus->getVar('name')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->mStatus->getShow('name')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_COM_EXPARAMS}></td>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('com_exparams')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_exparams')}></td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_BASE_LANG_CONTROL}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=dohtml value=1 default=$object->getVar('dohtml') disabled=true}>
+        <{xoops_input type=checkbox name=dohtml value=1 default=$object->getShow('dohtml') disabled=true}>
         <{$smarty.const._AD_BASE_LANG_DOHTML}><br />
-        <{xoops_input type=checkbox name=dosmiley value=1 default=$object->getVar('dosmiley') disabled=true}>
+        <{xoops_input type=checkbox name=dosmiley value=1 default=$object->getShow('dosmiley') disabled=true}>
         <{$smarty.const._AD_BASE_LANG_DOSMILEY}><br />
-        <{xoops_input type=checkbox name=doxcode value=1 default=$object->getVar('doxcode') disabled=true}>
+        <{xoops_input type=checkbox name=doxcode value=1 default=$object->getShow('doxcode') disabled=true}>
         <{$smarty.const._AD_BASE_LANG_DOXCODE}><br />
-        <{xoops_input type=checkbox name=doimage value=1 default=$object->getVar('doimage') disabled=true}>
+        <{xoops_input type=checkbox name=doimage value=1 default=$object->getShow('doimage') disabled=true}>
         <{$smarty.const._AD_BASE_LANG_DOIMAGE}><br />
-        <{xoops_input type=checkbox name=dobr value=1 default=$object->getVar('dobr') disabled=true}>
+        <{xoops_input type=checkbox name=dobr value=1 default=$object->getShow('dobr') disabled=true}>
         <{$smarty.const._AD_BASE_LANG_DOBR}>
       </td>
     </tr>
@@ -117,15 +121,19 @@
   </tr>
   <{foreach item=obj from=$children}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center">
-      <td><{$obj->getVar('com_id')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
-      <td><{$obj->getVar('com_title')}></td>
-      <td><{$obj->getVar('com_created')|xoops_formattimestamp:l}></td>
-      <td><{$obj->getVar('com_modified')|xoops_formattimestamp:l}></td>
-      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getVar('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getVar('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
-      <td><{$obj->getVar('com_ip')}></td>
+      <td><{$obj->getShow('com_id')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getShow('name')}>
+        <{/if}>
+      </td>
+      <td><{$obj->getShow('com_title')}></td>
+      <td><{$obj->getShow('com_created')|xoops_formattimestamp:l}></td>
+      <td><{$obj->getShow('com_modified')|xoops_formattimestamp:l}></td>
+      <td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
+      <td><{$obj->getShow('com_ip')}></td>
       <td>
-        <{if $obj->getVar('com_status') == 1 }>
+        <{if $obj->get('com_status') == 1 }>
           <img src="<{"icons/active.gif"|theme}>" />
         <{/if}>
       </td>

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:31:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:31:40 +0900
Subject: [xoops-cvslog 3776] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060731103140.DF8C42AC0FA@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.5	Tue Apr 11 19:03:38 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php	Mon Jul 31 19:31:40 2006
@@ -75,6 +75,16 @@
 	var $mModuleRecords=null;
 	var $mRecords=null;
 	var $mActionForm;
+	
+	var $mSearchAction = null;
+	
+	function Legacy_ActSearchAction($flag)
+	{
+		parent::Legacy_Action($flag);
+		
+		$this->mSearchAction =& new XCube_NewDelegate();
+		$this->mSearchAction->register('Legacy_ActSearchAction.SearchAction');
+	}
 
 	function prepare(&$controller,&$xoopsUser)
 	{
@@ -132,7 +142,7 @@
 			return LEGACY_FRAME_VIEW_INPUT;
 
 		$eventArgs=new ActionSearchEventArgs($this->mActionForm->getVar('keywords'));
-		$controller->mRoot->mEventManager->raiseEvent("Module.Admin.ActionSearch",$this,$eventArgs);
+		$this->mSearchAction->call(new XCube_Ref($eventArgs));
 
 		if($eventArgs->hasRecord()) {
 			$this->mRecords=&$eventArgs->getRecords();

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:32:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:32:24 +0900
Subject: [xoops-cvslog 3777] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060731103224.9DC502AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.7 xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.8
--- xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php:1.1.2.7	Fri May 12 19:21:11 2006
+++ xoops2jp/html/modules/base/class/Legacy_ModuleAdapter.class.php	Mon Jul 31 19:32:24 2006
@@ -10,25 +10,32 @@
 class Legacy_ModuleAdapter extends XCube_Module
 {
 	var $mAdaptee;
+	
+	/**
+	 * @var XCube_NewDelegate
+	 */
+	var $mSearchAction = null;
 
 	function Legacy_ModuleAdapter(&$xoopsModule)
 	{
-		$this->mAdaptee=&$xoopsModule;
+		$this->mAdaptee =& $xoopsModule;
+		$this->mSearchAction =& new XCube_NewDelegate();
+		$this->mSearchAction->register('Legacy_ModuleAdapter.SearchAction');
 	}
 
 	function prepareAdmin(&$controller)
 	{
 		$this->mAdaptee->loadAdminMenu();
 		if(count($this->mAdaptee->adminmenu)>0 || isset($this->mAdaptee->modinfo['config']) ) {
-			$delegate=new XCube_InstanceDelegate($this,"callbackSearchAction");
-			$controller->mRoot->mEventManager->add("Module.Admin.ActionSearch",$delegate);
+			$controller->mRoot->mDelegateManager->add('Legacy_ActSearchAction.SearchAction', array(&$this, 'callbackSearchAction'));
 		}
 	}
 
-	function callbackSearchAction(&$sender,&$eventArgs)
+	function callbackSearchAction(&$searchArgs)
 	{
-		if(!is_object($eventArgs))
+		if(!is_object($searchArgs)) {
 			return;
+		}
 			
 		//
 		// Search preference
@@ -48,12 +55,12 @@
 			}
 
 			$findFlag=true;
-			foreach($eventArgs->getKeywords() as $word) {
+			foreach($searchArgs->getKeywords() as $word) {
 				$findFlag&=(stristr(implode(" ",$configInfos),$word)!==false);
 			}
 				
 			if($findFlag) {
-				$eventArgs->addRecord($this->mAdaptee->getVar('name'),
+				$searchArgs->addRecord($this->mAdaptee->getVar('name'),
 				                  XOOPS_URL.'/modules/base/admin/index.php?action=PreferenceEdit&amp;confmod_id='.$this->mAdaptee->getVar('mid'),
 				                  _PREFERENCES );
 			}
@@ -65,7 +72,7 @@
 		if(count($this->mAdaptee->adminmenu)>0) {
 			foreach($this->mAdaptee->adminmenu as $menu) {
 				$findFlag=true;
-				foreach($eventArgs->getKeywords() as $word) {
+				foreach($searchArgs->getKeywords() as $word) {
 					$tmpFlag=false;
 					$tmpFlag|=(stristr($menu['title'],$word)!==false);
 
@@ -93,7 +100,7 @@
 					//
 					// Add record
 					//
-					$eventArgs->addRecord($this->mAdaptee->getVar('name'),$url,$menu['title']);
+					$searchArgs->addRecord($this->mAdaptee->getVar('name'),$url,$menu['title']);
 				}
 			}
 		}
@@ -115,10 +122,10 @@
 			}
 			$lines = file($dir . "/" . $helpfile);
 			foreach ($lines as $line) {
-				foreach($eventArgs->getKeywords() as $word) {
+				foreach($searchArgs->getKeywords() as $word) {
 					if (stristr($line, $word) !== false) {
 						$url = XOOPS_MODULE_URL . "/base/admin/index.php?action=Help&amp;dirname=" . $this->mAdaptee->getVar('dirname');
-						$eventArgs->addRecord($this->mAdaptee->getVar('name'), $url, _HELP);
+						$searchArgs->addRecord($this->mAdaptee->getVar('name'), $url, _HELP);
 						return;
 					}
 				}

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:32:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:32:51 +0900
Subject: [xoops-cvslog 3778] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060731103251.7DA3F2AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/HelpAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.9 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.10
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.9	Thu Jul 20 17:20:42 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Mon Jul 31 19:32:51 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: HelpAction.class.php,v 1.1.2.9 2006/07/20 08:20:42 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.10 2006/07/31 10:32:51 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -172,7 +172,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$renderer)
 	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, $this->mErrorMessage);
+		$controller->executeRedirect('./index.php?action=ModuleList', 1, $this->mErrorMessage);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:33:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:33:06 +0900
Subject: [xoops-cvslog 3779] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060731103306.51B002AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php:1.1.2.2	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInfoAction.class.php	Mon Jul 31 19:33:06 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInfoAction.class.php,v 1.1.2.2 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: ModuleInfoAction.class.php,v 1.1.2.3 2006/07/31 10:33:06 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -56,7 +56,7 @@
 
 	function executeViewError(&$controller, &$xoopsUser, &$renderer)
 	{
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*Module not found*");
+		$controller->executeRedirect('./index.php?action=ModuleList', 1, "*Module not found*");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:33:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:33:16 +0900
Subject: [xoops-cvslog 3780] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060731103316.04D7C2AC0FA@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php:1.1.2.5	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleListAction.class.php	Mon Jul 31 19:33:15 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleListAction.class.php,v 1.1.2.5 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: ModuleListAction.class.php,v 1.1.2.6 2006/07/31 10:33:15 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -134,7 +134,7 @@
 		//
 		// TODO removed
 		//
-		XCube_Utils::redirectHeader('./index.php?action=ModuleList', 1, "*ERROR*");
+		$controller->executeRedirect('./index.php?action=ModuleList', 1, "*ERROR*");
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:34:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:34:02 +0900
Subject: [xoops-cvslog 3781] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060731103402.3019D2AC144@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.56 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.57
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.56	Fri Jul 28 18:04:39 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Mon Jul 31 19:34:02 2006
@@ -1,6 +1,7 @@
 <?php
 /**
- * @package legacy
+ * @package Legacy
+ * @version $Id: Legacy_Controller.class.php,v 1.1.2.57 2006/07/31 10:34:02 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -319,7 +320,7 @@
 			}
 
    			if (!$this->mModuleController->hasPermission()) {
-				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);	// TODO Depens on const message catalog.
+				$this->executeRedirect(XOOPS_URL,1,_NOPERM);	// TODO Depens on const message catalog.
    			}
 
 			$this->mModuleController->setupLanguage();

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:34:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:34:15 +0900
Subject: [xoops-cvslog 3782] CVS update: xoops2jp/html/modules/base/preload
Message-ID: <20060731103415.1074D2AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/ThemeSelect.class.php
diff -u xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.4 xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.5
--- xoops2jp/html/modules/base/preload/ThemeSelect.class.php:1.1.2.4	Tue Jul 11 19:06:58 2006
+++ xoops2jp/html/modules/base/preload/ThemeSelect.class.php	Mon Jul 31 19:34:14 2006
@@ -1,29 +1,8 @@
 <?php
-// $Id: ThemeSelect.class.php,v 1.1.2.4 2006/07/11 10:06:58 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
+/**
+ * @package Legacy
+ * @version $Id: ThemeSelect.class.php,v 1.1.2.5 2006/07/31 10:34:14 minahito Exp $
+ */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
 
@@ -56,25 +35,16 @@
 			$this->mController->setMainTheme($_SESSION['xoopsUserTheme']);
 		}
 		
-		$delegate = new XCube_Delegate("Base_ThemeSelect","callbackCheckLoginSuccess");
-		$this->mController->mRoot->mEventManager->add("Site.CheckLogin.Success",$delegate);
+		$this->mController->mRoot->mDelegateManager->add("Site.CheckLogin.Success", "Base_ThemeSelect::callbackCheckLoginSuccess");
 	}
 
-	function callbackCheckLoginSuccess(&$controller,&$eventArgs)
+	function callbackCheckLoginSuccess(&$xoopsUser)
 	{
 		//
-		// This check is not needed. :)
-		//
-		if(!is_object($eventArgs['xoopsUser']))
-			return;
-
-		$user=&$eventArgs['xoopsUser'];
-
-		//
 		// Check Theme and set it to session.
 		//
-		$userTheme=$eventArgs['xoopsUser']->getVar('theme');
-		if(is_array($userTheme) && in_array($userTheme,$controller->getConfig('theme_set_allowed'))) {
+		$userTheme = $xoopsUser->get('theme');
+		if (is_array($userTheme) && in_array($userTheme, $this->mController->getConfig('theme_set_allowed'))) {
 			$_SESSION['xoopsUserTheme'] = $userTheme;
 		}
 	}

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:34:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:34:37 +0900
Subject: [xoops-cvslog 3783] CVS update:
	xoops2jp/html/modules/base/preload/Primary
Message-ID: <20060731103437.AA55C2AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.2 xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.3
--- xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.2	Tue Jul 25 19:22:47 2006
+++ xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php	Mon Jul 31 19:34:37 2006
@@ -78,7 +78,7 @@
                                 }
                             }
                         }
-                        XCube_Utils::redirectHeader(XOOPS_URL,1);
+                        $this->mController->executeRedirect(XOOPS_URL,1);
                     } else if (!empty($_GET['cube_module_uninstall'])) {
                         require_once XOOPS_ROOT_PATH.'/class/template.php';
                         $xoopsTpl = new XoopsTpl();
@@ -99,7 +99,7 @@
                             $uninstaller = new Legacy_ModuleUninstaller($module);
                             $uninstaller->execute();
                         }
-                        XCube_Utils::redirectHeader(XOOPS_URL,1);
+                        $this->mController->executeRedirect(XOOPS_URL,1);
                     } else {
                         $handler =& xoops_getmodulehandler('non_installation_module','base');
                         $objects = $handler->getObjects();

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:36:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:36:50 +0900
Subject: [xoops-cvslog 3784] CVS update: xoops2jp/html/preload
Message-ID: <20060731103650.D2E242AC0E0@users.sourceforge.jp>

Index: xoops2jp/html/preload/IndexRedirector.class.php
diff -u xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.3 xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.4
--- xoops2jp/html/preload/IndexRedirector.class.php:1.1.2.3	Fri Jul 14 17:37:24 2006
+++ xoops2jp/html/preload/IndexRedirector.class.php	Mon Jul 31 19:36:50 2006
@@ -9,17 +9,16 @@
 {
 	function preBlockFilter()
 	{
-		$delegate =& new XCube_Delegate("IndexRedirector", "redirect");
-		$this->mController->mRoot->mEventManager->add("Legacypage.Top.Access", $delegate);
+		$this->mController->mRoot->mDelegateManager->add("Legacypage.Top.Access", array(&$this, "redirect"));
 	}
 
-	function redirect(&$controller, &$eventArgs)
+	function redirect()
 	{
-		$startPage = $controller->getConfig('startpage');
+		$startPage = $this->mController->getConfig('startpage');
 		$handler =& xoops_gethandler('module');
 		$module =& $handler->get($startPage);
 		if ($startPage != null && $startPage != "--" && !is_object($module)) {
-			$controller->executeForward(XOOPS_URL . '/modules/' . $module->getShow('dirname') . '/');
+			$this->mController->executeForward(XOOPS_URL . '/modules/' . $module->getShow('dirname') . '/');
 		}
 	}
 }

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:38:40 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:38:40 +0900
Subject: [xoops-cvslog 3785] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060731103840.E59DB2AC15F@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.8 xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.9
--- xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php:1.1.2.8	Wed Jul 19 19:20:33 2006
+++ xoops2jp/html/modules/user/actions/UserRegister_confirmAction.class.php	Mon Jul 31 19:38:40 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package user
- * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.8 2006/07/19 10:20:33 minahito Exp $
+ * @version $Id: UserRegister_confirmAction.class.php,v 1.1.2.9 2006/07/31 10:38:40 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -24,7 +24,7 @@
 	var $mNewUser = null;
 	
 	var $mRedirectMessage = null;
-
+	
 	/**
 	 * TODO this member function uses the old style delegate.
 	 */
@@ -32,9 +32,6 @@
 	{
 		$this->mConfig = $moduleConfig;
 
-		$controller->mRoot->mEventManager->add("Module.User.Regist.Success",
-												new XCube_InstanceDelegate($this, "eventNotifyMail"));
-												
 		$this->_getRegistForm($controller);
 		$this->_processActionForm();
 	}
@@ -63,8 +60,9 @@
 		$this->_clearRegistForm($controller);
 
 		$this->_processMail($controller);
-		$eventArgs = array();
-		$controller->mRoot->mEventManager->raiseEvent("Module.User.Regist.Success", $controller, $eventArgs);
+		$this->_eventNotifyMail($controller);
+		
+		XCube_DelegateUtils::call('Legacy.Event.ResgistUser.Success')
 		
 		return USER_FRAME_VIEW_SUCCESS;
 	}
@@ -114,7 +112,7 @@
 		$mailer->send();	// TODO CHECKS
 	}
 	
-	function eventNotifyMail(&$controller,&$eventArgs)
+	function _eventNotifyMail(&$controller)
 	{
 		if($this->mConfig['new_user_notify'] == 1 && !empty($this->mConfig['new_user_notify_group'])) {
 			$director =& new User_UserRegistMailDirector($this->mNewUser, $controller->getConfig(), $this->mConfig);

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:40:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:40:36 +0900
Subject: [xoops-cvslog 3786] CVS update: xoops2jp/html/modules/pm/class
Message-ID: <20060731104036.AEA372AC15F@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.2 xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.3
--- xoops2jp/html/modules/pm/class/ActionFrame.class.php:1.1.2.2	Thu Jul 27 18:41:38 2006
+++ xoops2jp/html/modules/pm/class/ActionFrame.class.php	Mon Jul 31 19:40:36 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package pm
- * @version $Id: ActionFrame.class.php,v 1.1.2.2 2006/07/27 09:41:38 minahito Exp $
+ * @version $Id: ActionFrame.class.php,v 1.1.2.3 2006/07/31 10:40:36 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -75,7 +75,7 @@
 		$this->mAction->prepare($controller, $controller->getXoopsUser(), $moduleConfig);
 	
 		if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser(), $moduleConfig)) {
-			$this->doPermissionError();
+			$this->doPermissionError($controller);
 			return;
 		}
 	
@@ -113,10 +113,10 @@
 		}
 	}
 
-	function doPermissionError()
+	function doPermissionError(&$controller)
 	{
 		$errorMessages = array(_PM_SORRY, _PM_PLZREG);
-		XCube_Utils::redirectHeader(XOOPS_URL, 2, $errorMessages);
+		$controller->executeRedirect(XOOPS_URL, 2, $errorMessages);
 	}
 
 	function doActionNotFoundError($controller)

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:40:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:40:48 +0900
Subject: [xoops-cvslog 3787] CVS update:
	xoops2jp/html/modules/pm/language/english
Message-ID: <20060731104048.D46CC2AC15F@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/language/english/main.php
diff -u xoops2jp/html/modules/pm/language/english/main.php:1.1.2.4 xoops2jp/html/modules/pm/language/english/main.php:1.1.2.5
--- xoops2jp/html/modules/pm/language/english/main.php:1.1.2.4	Tue Jul  4 18:49:53 2006
+++ xoops2jp/html/modules/pm/language/english/main.php	Mon Jul 31 19:40:48 2006
@@ -9,6 +9,7 @@
 define('_MD_PM_LANG_MESSAGE_DETAIL', "Details of message");
 define('_MD_PM_LANG_MSG_ID', "msg id");
 define('_MD_PM_LANG_SUBJECTC', "Subject： ");
+define('_MD_PM_MESSAGE_CONFIRM_DELETE_PM', "Do you delete the following private message?");
 define('_PM_CANCELSEND', "Cancel sending");
 define('_PM_CLEAR', "Clear");
 define('_PM_CLICKHERE', "You can click here to view your private messages");

From minahito ＠ users.sourceforge.jp  Mon Jul 31 19:44:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 31 Jul 2006 19:44:14 +0900
Subject: [xoops-cvslog 3788] CVS update: xoops2jp/html/kernel
Message-ID: <20060731104414.068FA2AC035@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Root.class.php
diff -u xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.16 xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.17
--- xoops2jp/html/kernel/XCube_Root.class.php:1.1.2.16	Mon Jul 31 19:02:53 2006
+++ xoops2jp/html/kernel/XCube_Root.class.php	Mon Jul 31 19:44:13 2006
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package XCube
- * @version $Id: XCube_Root.class.php,v 1.1.2.16 2006/07/31 10:02:53 minahito Exp $
+ * @version $Id: XCube_Root.class.php,v 1.1.2.17 2006/07/31 10:44:13 minahito Exp $
  */
 
 /**
@@ -243,7 +243,7 @@
 	/**
 	 * Return the instance of the service manager.
 	 * 
-	 * @return XCube_EventManager
+	 * @return XCube_ServiceManager
 	 */
 	function &getServiceManager()
 	{