From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:31:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:31:04 +0900
Subject: [xoops-cvslog 2606] CVS update: xoops2jp/html/install/wizards
Message-ID: <20060401013104.EAD212AC01F@users.sourceforge.jp>



From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:32:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:32:57 +0900
Subject: [xoops-cvslog 2607] CVS update: xoops2jp/html/install/custom
Message-ID: <20060401013257.531ED2AC01F@users.sourceforge.jp>

Index: xoops2jp/html/install/custom/custom.inc.dist.php
diff -u xoops2jp/html/install/custom/custom.inc.dist.php:1.1.2.1 xoops2jp/html/install/custom/custom.inc.dist.php:1.1.2.2
--- xoops2jp/html/install/custom/custom.inc.dist.php:1.1.2.1	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/custom/custom.inc.dist.php	Sat Apr  1 10:32:57 2006
@@ -1,3 +1,3 @@
 <?php
-    $widzardSeq->insertAfter('start', 'envcheck', 'Enviromment Check');
+    $wizardSeq->insertAfter('start', 'envcheck', 'Enviromment Check');
 ?>
Index: xoops2jp/html/install/custom/install_envcheck.inc.php
diff -u xoops2jp/html/install/custom/install_envcheck.inc.php:1.1.2.1 xoops2jp/html/install/custom/install_envcheck.inc.php:1.1.2.2
--- xoops2jp/html/install/custom/install_envcheck.inc.php:1.1.2.1	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/custom/install_envcheck.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,4 +1,4 @@
 <?php
-   $widzard->setTemplatePath(dirname(__FILE__));
-   $widzard->render('install_envcheck.tpl.php');
+   $wizard->setTemplatePath(dirname(__FILE__));
+   $wizard->render('install_envcheck.tpl.php');
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:32:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:32:57 +0900
Subject: [xoops-cvslog 2608] CVS update: xoops2jp/html/install
Message-ID: <20060401013257.7EA2E2AC057@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.2.8.3 xoops2jp/html/install/index.php:1.2.8.4
--- xoops2jp/html/install/index.php:1.2.8.3	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/index.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.2.8.3 2006/03/07 13:11:39 nobunobu Exp $
+// $Id: index.php,v 1.2.8.4 2006/04/01 01:32:57 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -63,27 +63,27 @@
 define('_OKIMG', '<img src="img/yes.gif" width="6" height="12" border="0" alt="OK" /> ');
 define('_NGIMG', '<img src="img/no.gif" width="6" height="12" border="0" alt="NG" /> ');
 
-include_once './class/simplewidzard.php';
-$widzard = new SimpleWidzard;
-$widzard->setBaseTemplate('install_tpl.php');
-$widzard->setTemplatePath('templates');
-
-$widzardSeq = new SimpleWidzardSequence;
-
-$widzardSeq->add('langselect',  _INSTALL_L0,   'start',      _INSTALL_L80);
-$widzardSeq->add('start',       _INSTALL_L0,   'modcheck',   _INSTALL_L81);
-$widzardSeq->add('modcheck',    _INSTALL_L82,  'dbform',     _INSTALL_L89);
-$widzardSeq->add('dbform',      _INSTALL_L90,  'dbconfirm',  _INSTALL_L91);
-$widzardSeq->add('dbconfirm',   _INSTALL_L53,  'dbsave',     _INSTALL_L92,  '',      _INSTALL_L93);
-$widzardSeq->add('dbsave',      _INSTALL_L92,  'mainfile',   _INSTALL_L94);
-$widzardSeq->add('mainfile',    _INSTALL_L94,  'initial',    _INSTALL_L102, 'start', _INSTALL_L103, true);
-$widzardSeq->add('initial',     _INSTALL_L102, 'checkDB',    _INSTALL_L104, 'start', _INSTALL_L103, true);
-$widzardSeq->add('checkDB',     _INSTALL_L104, 'createDB',   _INSTALL_L105, 'start', _INSTALL_L103, true);
-$widzardSeq->add('createDB',    _INSTALL_L105, 'checkDB',    _INSTALL_L104);
-$widzardSeq->add('createTables',_INSTALL_L40,  'siteInit',   _INSTALL_L112);
-$widzardSeq->add('siteInit',    _INSTALL_L112, 'insertData', _INSTALL_L116);
-$widzardSeq->add('insertData',  _INSTALL_L116, 'finish',     _INSTALL_L117);
-$widzardSeq->add('finish',      _INSTALL_L32);
+include_once './class/simplewizard.php';
+$wizard = new SimpleWizard;
+$wizard->setBaseTemplate('install_tpl.php');
+$wizard->setTemplatePath('templates');
+
+$wizardSeq = new SimpleWizardSequence;
+
+$wizardSeq->add('langselect',  _INSTALL_L0,   'start',      _INSTALL_L80);
+$wizardSeq->add('start',       _INSTALL_L0,   'modcheck',   _INSTALL_L81);
+$wizardSeq->add('modcheck',    _INSTALL_L82,  'dbform',     _INSTALL_L89);
+$wizardSeq->add('dbform',      _INSTALL_L90,  'dbconfirm',  _INSTALL_L91);
+$wizardSeq->add('dbconfirm',   _INSTALL_L53,  'dbsave',     _INSTALL_L92,  '',      _INSTALL_L93);
+$wizardSeq->add('dbsave',      _INSTALL_L92,  'mainfile',   _INSTALL_L94);
+$wizardSeq->add('mainfile',    _INSTALL_L94,  'initial',    _INSTALL_L102, 'start', _INSTALL_L103, true);
+$wizardSeq->add('initial',     _INSTALL_L102, 'checkDB',    _INSTALL_L104, 'start', _INSTALL_L103, true);
+$wizardSeq->add('checkDB',     _INSTALL_L104, 'createDB',   _INSTALL_L105, 'start', _INSTALL_L103, true);
+$wizardSeq->add('createDB',    _INSTALL_L105, 'checkDB',    _INSTALL_L104);
+$wizardSeq->add('createTables',_INSTALL_L40,  'siteInit',   _INSTALL_L112);
+$wizardSeq->add('siteInit',    _INSTALL_L112, 'insertData', _INSTALL_L116);
+$wizardSeq->add('insertData',  _INSTALL_L116, 'finish',     _INSTALL_L117);
+$wizardSeq->add('finish',      _INSTALL_L32);
 
 if (file_exists('./custom/custom.inc.php')) {
     include './custom/custom.inc.php';
@@ -100,16 +100,16 @@
 } else {
     $op = 'langselect';
 }
-$widzard->setOp($op);
+$wizard->setOp($op);
 
 $op=basename($op);
-$fname = './widzards/install_'.$op.'.inc.php';
+$fname = './wizards/install_'.$op.'.inc.php';
 $custom_fname = './custom/install_'.$op.'.inc.php';
 if (file_exists($fname)) {
 	include $fname;
 } else if(file_exists($custom_fname)) {
 	include $custom_fname;
 } else {
-    $widzard->render();
+    $wizard->render();
 }
 ?>
\ No newline at end of file
Index: xoops2jp/html/install/install_tpl.php
diff -u xoops2jp/html/install/install_tpl.php:1.1.8.2 xoops2jp/html/install/install_tpl.php:1.1.8.3
--- xoops2jp/html/install/install_tpl.php:1.1.8.2	Tue Mar  7 22:05:59 2006
+++ xoops2jp/html/install/install_tpl.php	Sat Apr  1 10:32:57 2006
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <title>XOOPS Cube Install Widzard</title>
+  <title>XOOPS Cube Install Wizard</title>
   <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _INSTALL_CHARSET ?>" />
   <style type="text/css" media="all"><!-- @import url(../xoops.css); --></style>
   <link rel="stylesheet" type="text/css" media="all" href="style.css" />

From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:32:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:32:57 +0900
Subject: [xoops-cvslog 2609] CVS update: xoops2jp/html/install/class
Message-ID: <20060401013257.A46D12AC01F@users.sourceforge.jp>

Index: xoops2jp/html/install/class/simplewizard.php
diff -u /dev/null xoops2jp/html/install/class/simplewizard.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:32:57 2006
+++ xoops2jp/html/install/class/simplewizard.php	Sat Apr  1 10:32:57 2006
@@ -0,0 +1,202 @@
+<?php
+class SimpleWizard {
+  var $_v;
+  var $_op;
+  var $_title;
+  var $_content;
+  var $_next = '';
+  var $_back = '';
+  var $_reload ='';
+  var $_template_path;
+  var $_base_template_name;
+  var $_custom_seq;
+
+    function setTemplatePath($name) {
+        $this->_template_path = $name;
+    }
+
+    function setBaseTemplate($name) {
+        $this->_base_template_name = $name;
+    }
+
+    function assign($name, $value) {
+        $this->_v[$name] = $value;
+    }
+    
+    function setContent($value) {
+        $this->_content = $value;
+    }
+
+    function setOp($value) {
+        $this->_op = $value;
+    }
+
+    function setTitle($value) {
+        $this->_title = $value;
+    }
+
+    function setNext($value) {
+        $this->_next = $value;
+        $this->_custom_seq = true;
+    }
+
+    function setBack($value) {
+        $this->_back = $value;
+        $this->_custom_seq = true;
+    }
+
+    function setReload($value) {
+        $this->_reload = $value;
+        $this->_custom_seq = true;
+    }
+
+    function addArray($name, $value) {
+        if (!isset($this->_v[$name]) || !is_array($this->_v[$name])) {
+            $this->_v[$name] = array();
+        }
+        $this->_v[$name][] = $value;
+    }
+
+    function v($name) {
+        if (!empty($this->_v[$name])) {
+            return $this->_v[$name];
+        } else {
+            return $false;
+        }
+    }
+
+    function e() {
+        $args = func_get_args();
+        if (func_num_args() >0) {
+            if (!empty($this->_v[$args[0]])) {
+                $value = $this->_v[$args[0]];
+                if ((func_num_args() ==2) && is_array($value)) {
+                    $value = $value[$args[1]];
+                }
+            } else {
+                $value = '';
+            }
+            echo $value;
+        }
+    }
+    
+    function render($fname='') {
+        if ($fname && file_exists($this->_template_path.'/'.$fname)) {
+            ob_start();
+            include $this->_template_path.'/'.$fname;
+            $this->setContent(ob_get_contents());
+            ob_end_clean();
+        }
+        $content = $this->_content;
+        if (!empty($this->_title)) {
+            $title = $this->_title;
+        } else {
+            $title = $GLOBALS['wizardSeq']->getTitle($this->_op);
+        }
+        if (!empty($this->_next)) {
+            $b_next = $this->_next;
+        } else if (!$this->_custom_seq) {
+            $b_next = $GLOBALS['wizardSeq']->getNext($this->_op);
+        } else {
+            $b_next = '';
+        }
+        if (!empty($this->_back)) {
+            $b_back = $this->_back;
+        } else if (!$this->_custom_seq) {
+            $b_back = $GLOBALS['wizardSeq']->getBack($this->_op);
+        } else {
+            $b_back = '';
+        }
+        if (!empty($this->_reload)) {
+            $b_reload = $this->_reload;
+        } else if (!$this->_custom_seq) {
+            $b_reload = $GLOBALS['wizardSeq']->getReload($this->_op);
+        } else {
+            $b_reload = '';
+        }
+        include $this->_base_template_name;
+    }
+    function error() {
+        $content = $this->_content;
+        if (!empty($this->_title)) {
+            $title = $this->_title;
+        } else {
+            $title = $GLOBALS['wizardSeq']->getTitle($this->_op);
+        }
+        if (!empty($this->_next)) {
+            $b_next = $this->_next;
+        } else {
+            $b_next = '';
+        }
+        if (!empty($this->_back)) {
+            $b_back = $this->_back;
+        } else {
+            $b_back = '';
+        }
+        if (!empty($this->_reload)) {
+            $b_reload = $this->_reload;
+        } else {
+            $b_reload = '';
+        }
+        include $this->_base_template_name;
+    }
+}
+
+class SimpleWizardSequence {
+  var $_list;
+  
+    function add($name, $title='', $next='', $next_btn='', $back='', $back_btn='', $reload='') {
+        $this->_list[$name]['title'] = $title;
+        $this->_list[$name]['next'] = $next;
+        $this->_list[$name]['next_btn'] = $next_btn;
+        $this->_list[$name]['back'] = $back;
+        $this->_list[$name]['back_btn'] = $back_btn;
+        $this->_list[$name]['reload'] = $reload;
+    }
+    
+    function insertAfter($after, $name, $title='', $back='', $back_btn='', $reload='') {
+        if (!empty($this->_list[$after])) {
+            $this->_list[$name]['title'] = $title;
+            $this->_list[$name]['next'] = $this->_list[$after]['next'];
+            $this->_list[$name]['next_btn'] = $this->_list[$after]['next_btn'];
+            $this->_list[$after]['next'] = $name;
+            $this->_list[$after]['next_btn'] = $title;
+            $this->_list[$name]['back'] = $back;
+            $this->_list[$name]['back_btn'] = $back_btn;
+            $this->_list[$name]['reload'] = $reload;
+        }
+    }
+
+    function getTitle($name) {
+        if (!empty($this->_list[$name]['title'])) {
+            return($this->_list[$name]['title']);
+        } else {
+            return '';
+        }
+    }
+
+    function getNext($name) {
+        if (!empty($this->_list[$name]['next'])||!empty($this->_list[$name]['next_btn'])) {
+            return(array($this->_list[$name]['next'],$this->_list[$name]['next_btn']));
+        } else {
+            return '';
+        }
+    }
+
+    function getBack($name) {
+        if (!empty($this->_list[$name]['back'])||!empty($this->_list[$name]['back_btn'])) {
+            return(array($this->_list[$name]['back'],$this->_list[$name]['back_btn']));
+        } else {
+            return '';
+        }
+    }
+
+    function getReload($name) {
+        if (!empty($this->_list[$name]['reload'])) {
+            return($this->_list[$name]['reload']);
+        } else {
+            return '';
+        }
+    }
+}
+
Index: xoops2jp/html/install/class/simplewidzard.php
diff -u xoops2jp/html/install/class/simplewidzard.php:1.1.2.1 xoops2jp/html/install/class/simplewidzard.php:removed
--- xoops2jp/html/install/class/simplewidzard.php:1.1.2.1	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/class/simplewidzard.php	Sat Apr  1 10:32:57 2006
@@ -1,202 +0,0 @@
-<?php
-class SimpleWidzard {
-  var $_v;
-  var $_op;
-  var $_title;
-  var $_content;
-  var $_next = '';
-  var $_back = '';
-  var $_reload ='';
-  var $_template_path;
-  var $_base_template_name;
-  var $_custom_seq;
-
-    function setTemplatePath($name) {
-        $this->_template_path = $name;
-    }
-
-    function setBaseTemplate($name) {
-        $this->_base_template_name = $name;
-    }
-
-    function assign($name, $value) {
-        $this->_v[$name] = $value;
-    }
-    
-    function setContent($value) {
-        $this->_content = $value;
-    }
-
-    function setOp($value) {
-        $this->_op = $value;
-    }
-
-    function setTitle($value) {
-        $this->_title = $value;
-    }
-
-    function setNext($value) {
-        $this->_next = $value;
-        $this->_custom_seq = true;
-    }
-
-    function setBack($value) {
-        $this->_back = $value;
-        $this->_custom_seq = true;
-    }
-
-    function setReload($value) {
-        $this->_reload = $value;
-        $this->_custom_seq = true;
-    }
-
-    function addArray($name, $value) {
-        if (!isset($this->_v[$name]) || !is_array($this->_v[$name])) {
-            $this->_v[$name] = array();
-        }
-        $this->_v[$name][] = $value;
-    }
-
-    function v($name) {
-        if (!empty($this->_v[$name])) {
-            return $this->_v[$name];
-        } else {
-            return $false;
-        }
-    }
-
-    function e() {
-        $args = func_get_args();
-        if (func_num_args() >0) {
-            if (!empty($this->_v[$args[0]])) {
-                $value = $this->_v[$args[0]];
-                if ((func_num_args() ==2) && is_array($value)) {
-                    $value = $value[$args[1]];
-                }
-            } else {
-                $value = '';
-            }
-            echo $value;
-        }
-    }
-    
-    function render($fname='') {
-        if ($fname && file_exists($this->_template_path.'/'.$fname)) {
-            ob_start();
-            include $this->_template_path.'/'.$fname;
-            $this->setContent(ob_get_contents());
-            ob_end_clean();
-        }
-        $content = $this->_content;
-        if (!empty($this->_title)) {
-            $title = $this->_title;
-        } else {
-            $title = $GLOBALS['widzardSeq']->getTitle($this->_op);
-        }
-        if (!empty($this->_next)) {
-            $b_next = $this->_next;
-        } else if (!$this->_custom_seq) {
-            $b_next = $GLOBALS['widzardSeq']->getNext($this->_op);
-        } else {
-            $b_next = '';
-        }
-        if (!empty($this->_back)) {
-            $b_back = $this->_back;
-        } else if (!$this->_custom_seq) {
-            $b_back = $GLOBALS['widzardSeq']->getBack($this->_op);
-        } else {
-            $b_back = '';
-        }
-        if (!empty($this->_reload)) {
-            $b_reload = $this->_reload;
-        } else if (!$this->_custom_seq) {
-            $b_reload = $GLOBALS['widzardSeq']->getReload($this->_op);
-        } else {
-            $b_reload = '';
-        }
-        include $this->_base_template_name;
-    }
-    function error() {
-        $content = $this->_content;
-        if (!empty($this->_title)) {
-            $title = $this->_title;
-        } else {
-            $title = $GLOBALS['widzardSeq']->getTitle($this->_op);
-        }
-        if (!empty($this->_next)) {
-            $b_next = $this->_next;
-        } else {
-            $b_next = '';
-        }
-        if (!empty($this->_back)) {
-            $b_back = $this->_back;
-        } else {
-            $b_back = '';
-        }
-        if (!empty($this->_reload)) {
-            $b_reload = $this->_reload;
-        } else {
-            $b_reload = '';
-        }
-        include $this->_base_template_name;
-    }
-}
-
-class SimpleWidzardSequence {
-  var $_list;
-  
-    function add($name, $title='', $next='', $next_btn='', $back='', $back_btn='', $reload='') {
-        $this->_list[$name]['title'] = $title;
-        $this->_list[$name]['next'] = $next;
-        $this->_list[$name]['next_btn'] = $next_btn;
-        $this->_list[$name]['back'] = $back;
-        $this->_list[$name]['back_btn'] = $back_btn;
-        $this->_list[$name]['reload'] = $reload;
-    }
-    
-    function insertAfter($after, $name, $title='', $back='', $back_btn='', $reload='') {
-        if (!empty($this->_list[$after])) {
-            $this->_list[$name]['title'] = $title;
-            $this->_list[$name]['next'] = $this->_list[$after]['next'];
-            $this->_list[$name]['next_btn'] = $this->_list[$after]['next_btn'];
-            $this->_list[$after]['next'] = $name;
-            $this->_list[$after]['next_btn'] = $title;
-            $this->_list[$name]['back'] = $back;
-            $this->_list[$name]['back_btn'] = $back_btn;
-            $this->_list[$name]['reload'] = $reload;
-        }
-    }
-
-    function getTitle($name) {
-        if (!empty($this->_list[$name]['title'])) {
-            return($this->_list[$name]['title']);
-        } else {
-            return '';
-        }
-    }
-
-    function getNext($name) {
-        if (!empty($this->_list[$name]['next'])||!empty($this->_list[$name]['next_btn'])) {
-            return(array($this->_list[$name]['next'],$this->_list[$name]['next_btn']));
-        } else {
-            return '';
-        }
-    }
-
-    function getBack($name) {
-        if (!empty($this->_list[$name]['back'])||!empty($this->_list[$name]['back_btn'])) {
-            return(array($this->_list[$name]['back'],$this->_list[$name]['back_btn']));
-        } else {
-            return '';
-        }
-    }
-
-    function getReload($name) {
-        if (!empty($this->_list[$name]['reload'])) {
-            return($this->_list[$name]['reload']);
-        } else {
-            return '';
-        }
-    }
-}
-

From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:32:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:32:57 +0900
Subject: [xoops-cvslog 2610] CVS update: xoops2jp/html/install/widzards
Message-ID: <20060401013257.EF7472AC01F@users.sourceforge.jp>

Index: xoops2jp/html/install/widzards/index.html
diff -u xoops2jp/html/install/widzards/index.html:1.1.2.1 xoops2jp/html/install/widzards/index.html:removed
--- xoops2jp/html/install/widzards/index.html:1.1.2.1	Mon Mar 27 11:41:52 2006
+++ xoops2jp/html/install/widzards/index.html	Sat Apr  1 10:32:57 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/install/widzards/install_checkDB.inc.php
diff -u xoops2jp/html/install/widzards/install_checkDB.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_checkDB.inc.php:removed
--- xoops2jp/html/install/widzards/install_checkDB.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_checkDB.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,32 +0,0 @@
-<?php
-    include_once '../mainfile.php';
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-    $title = _INSTALL_L104;
-    if (! $dbm->isConnectable()) {
-        $widzard->addArray('checks',_NGIMG._INSTALL_L106);
-        $widzard->addArray('msgs',_INSTALL_L107);
-        $widzard->setBack(array('start', _INSTALL_L103));
-        $widzard->setReload(true);
-    } else {
-        $widzard->addArray('checks',_OKIMG._INSTALL_L108);
-        if (! $dbm->dbExists()) {
-            $widzard->addArray('checks',_NGIMG.sprintf(_INSTALL_L109, XOOPS_DB_NAME));
-            $widzard->addArray('msgs',_INSTALL_L21.'<br /><b>'.XOOPS_DB_NAME.'</b>');
-            $widzard->addArray('msgs',_INSTALL_L22);
-        } else {
-            $widzard->addArray('checks',_OKIMG.sprintf(_INSTALL_L110, XOOPS_DB_NAME));
-            if (!$dbm->tableExists('users')) {
-                $widzard->addArray('msgs',_INSTALL_L111);
-                $widzard->setNext(array('createTables', _INSTALL_L40));
-            } else if (!$dbm->tableExists('config')) {
-                $widzard->addArray('msgs',_INSTALL_L130);
-                $widzard->setNext(array('updateTables', _INSTALL_L14));
-            } else {
-                $widzard->addArray('checks',_NGIMG._INSTALL_L131);
-                $widzard->setNext('');
-            }
-        }
-    }
-    $widzard->render('install_checkDB.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_createDB.inc.php
diff -u xoops2jp/html/install/widzards/install_createDB.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_createDB.inc.php:removed
--- xoops2jp/html/install/widzards/install_createDB.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_createDB.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,13 +0,0 @@
-<?php
-    include_once '../mainfile.php';
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-    if(! $dbm->createDB()){
-        $widzard->setContent('<p>'._INSTALL_L31.'</p>');
-        $widzard->setNext(array('checkDB', _INSTALL_L104));
-        $widzard->setBack(array('start', _INSTALL_L103));
-    } else {
-        $widzard->setContent('<p>'.sprintf(_INSTALL_L43, XOOPS_DB_NAME).'</p>');
-    }
-    $widzard->render();
-?>
Index: xoops2jp/html/install/widzards/install_createTables.inc.php
diff -u xoops2jp/html/install/widzards/install_createTables.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_createTables.inc.php:removed
--- xoops2jp/html/install/widzards/install_createTables.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_createTables.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,16 +0,0 @@
-<?php
-    include_once '../mainfile.php';
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-
-    $tables = array();
-    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.structure.sql');
-    $widzard->assign('reports',$dbm->report());
-    if(! $result ){
-        $widzard->assign('message',_INSTALL_L114);
-        $widzard->setBack(array('start', _INSTALL_L103));
-    }else{
-        $widzard->assign('message',_INSTALL_L115);
-    }
-    $widzard->render('install_createTables.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_dbconfirm.inc.php
diff -u xoops2jp/html/install/widzards/install_dbconfirm.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_dbconfirm.inc.php:removed
--- xoops2jp/html/install/widzards/install_dbconfirm.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_dbconfirm.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,14 +0,0 @@
-<?php
-    include_once 'class/settingmanager.php';
-    $sm = new setting_manager(true);
-
-    $content = $sm->checkData();
-    if (!empty($content)) {
-        $widzard->setTitle(_INSTALL_L93);
-        $widzard->setContent($content . $sm->editform());
-        $widzard->setNext(array('dbconfirm',_INSTALL_L91));
-    } else {
-        $widzard->setContent($sm->confirmForm());
-    }
-    $widzard->render();
-?>
Index: xoops2jp/html/install/widzards/install_dbform.inc.php
diff -u xoops2jp/html/install/widzards/install_dbform.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_dbform.inc.php:removed
--- xoops2jp/html/install/widzards/install_dbform.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_dbform.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,8 +0,0 @@
-<?php
-    include_once '../mainfile.php';
-    include_once 'class/settingmanager.php';
-    $sm = new setting_manager();
-    $sm->readConstant();
-    $widzard->setContent($sm->editform());
-    $widzard->render();
-?>
Index: xoops2jp/html/install/widzards/install_dbsave.inc.php
diff -u xoops2jp/html/install/widzards/install_dbsave.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_dbsave.inc.php:removed
--- xoops2jp/html/install/widzards/install_dbsave.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_dbsave.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,42 +0,0 @@
-<?php
-    include_once './class/mainfilemanager.php';
-    $mm = new mainfile_manager('../mainfile.php');
-
-    $ret = $mm->copyDistFile();
-    if(! $ret){
-        $widzard->setContent(_INSTALL_L60);
-        $widzard->error();
-        exit();
-    }
-
-    $mm->setRewrite('XOOPS_ROOT_PATH', $myts->stripSlashesGPC($_POST['root_path']));
-    $mm->setRewrite('XOOPS_URL', $myts->stripSlashesGPC($_POST['xoops_url']));
-    $mm->setRewrite('XOOPS_DB_TYPE', $myts->stripSlashesGPC($_POST['database']));
-    $mm->setRewrite('XOOPS_DB_PREFIX', $myts->stripSlashesGPC($_POST['prefix']));
-    $mm->setRewrite('XOOPS_DB_HOST', $myts->stripSlashesGPC($_POST['dbhost']));
-    $mm->setRewrite('XOOPS_DB_USER', $myts->stripSlashesGPC($_POST['dbuname']));
-    $mm->setRewrite('XOOPS_DB_PASS', $myts->stripSlashesGPC($_POST['dbpass']));
-    $mm->setRewrite('XOOPS_DB_NAME', $myts->stripSlashesGPC($_POST['dbname']));
-    $mm->setRewrite('XOOPS_DB_PCONNECT', intval($_POST['db_pconnect']));
-    $mm->setRewrite('XOOPS_GROUP_ADMIN', 1);
-    $mm->setRewrite('XOOPS_GROUP_USERS', 2);
-    $mm->setRewrite('XOOPS_GROUP_ANONYMOUS', 3);
-
-    // Check if XOOPS_CHECK_PATH should be initially set or not
-    $xoopsPathTrans = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
-    if ( DIRECTORY_SEPARATOR != '/' ) {
-        // IIS6 doubles the \ chars
-        $xoopsPathTrans = str_replace( strpos( $xoopsPathTrans, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsPathTrans);
-    }
-    $mm->setRewrite('XOOPS_CHECK_PATH', strcasecmp( substr($xoopsPathTrans, 0, strlen(XOOPS_ROOT_PATH)), $_POST['root_path']) ? 0 : 1 );
-
-    $ret = $mm->doRewrite();
-    if(! $ret){
-        $widzard->setContent(_INSTALL_L60);
-        $widzard->error();
-        exit();
-    }
-    $widzard->assign('reports', $mm->report());
-    $widzard->assign('message',_INSTALL_L62);
-    $widzard->render('install_dbsave.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_finish.inc.php
diff -u xoops2jp/html/install/widzards/install_finish.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_finish.inc.php:removed
--- xoops2jp/html/install/widzards/install_finish.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_finish.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    include './language/'.$language.'/finish.php'; //This will set message to $content;
-    $widzard->assign('finish', $content);
-    $widzard->render('install_finish.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_initial.inc.php
diff -u xoops2jp/html/install/widzards/install_initial.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_initial.inc.php:removed
--- xoops2jp/html/install/widzards/install_initial.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_initial.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    // confirm database setting
-    include_once "../mainfile.php";
-    $widzard->render('install_initial.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_insertData.inc.php
diff -u xoops2jp/html/install/widzards/install_insertData.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_insertData.inc.php:removed
--- xoops2jp/html/install/widzards/install_insertData.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_insertData.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,58 +0,0 @@
-<?php
-    $adminname = $myts->stripSlashesGPC(trim($_POST['adminname']));
-    $adminpass = $myts->stripSlashesGPC($_POST['adminpass']);
-    $adminmail = $myts->stripSlashesGPC(trim($_POST['adminmail']));
-
-    if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$adminmail)) {
-        $widzard->setContent('<p>'._INSTALL_L73.'</p>');
-        $widzard->setBack(array('', _INSTALL_L112));
-        $widzard->error();
-        exit();
-    }
-    if ( !isset($adminname) || !isset($adminpass) || !isset($adminmail) || $adminmail == "" || $adminname =="" || $adminpass =="" || $adminpass != $adminpass2) {
-        $widzard->setContent('<p>'._INSTALL_L41.'</p>');
-        $widzard->setBack(array('', _INSTALL_L112));
-        $widzard->error();
-        exit();
-    }
-
-    include_once '../mainfile.php';
-    include_once './include/makedata.php';
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-    include_once './class/cachemanager.php';
-    $cm = new cache_manager;
-
-    $language = check_language($language);
-    if ( file_exists('./language/'.$language.'/install2.php') ) {
-        include_once './language/'.$language.'/install2.php';
-    } elseif ( file_exists('./language/english/install2.php') ) {
-        include_once './language/english/install2.php';
-        $language = 'english';
-    } else {
-        echo 'no language file (install2.php).';
-        exit();
-    }
-
-    //$tables = array();
-    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.data.sql');
-
-    $result = $dbm->queryFromFile('./language/'.$language.'/'.XOOPS_DB_TYPE.'.lang.data.sql');
-
-    $group = make_groups($dbm);
-    $result = make_data($dbm, $cm, $adminname, $adminpass, $adminmail, $language, $group);
-
-    $widzard->assign('dbm_reports',$dbm->report());
-    $widzard->assign('cm_reports',$cm->report());
-
-    include_once './class/mainfilemanager.php';
-    $mm = new mainfile_manager('../mainfile.php');
-    foreach($group as $key => $val){
-        $mm->setRewrite($key, intval($val));
-    }
-    $result = $mm->doRewrite();
-    $widzard->assign('mm_reports',$mm->report());
-
-    setcookie('xoops_session', '', time() - 3600);
-    $widzard->render('install_insertData.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_langselect.inc.php
diff -u xoops2jp/html/install/widzards/install_langselect.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_langselect.inc.php:removed
--- xoops2jp/html/install/widzards/install_langselect.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_langselect.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,15 +0,0 @@
-<?php
-    if (!defined('_INSTALL_L128')) {
-        define('_INSTALL_L128', 'Choose language to be used for the installation process');
-    }
-    $langarr = getDirList('./language/');
-    foreach ($langarr as $lang) {
-        $widzard->addArray('languages', $lang);
-        if (strtolower($lang) == $language) {
-            $widzard->addArray('selected','selected="selected"');
-        } else {
-            $widzard->addArray('selected','');
-        }
-    }
-    $widzard->render('install_langselect.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_mainfile.inc.php
diff -u xoops2jp/html/install/widzards/install_mainfile.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_mainfile.inc.php:removed
--- xoops2jp/html/install/widzards/install_mainfile.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_mainfile.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,30 +0,0 @@
-<?php
-    // checking XOOPS_ROOT_PATH and XOOPS_URL
-    include_once '../mainfile.php';
-
-    $detected = str_replace('\\', '/', getcwd()); // "
-    $detected = str_replace('/install', "", $detected);
-    if ( substr($detected, -1) == '/' ) {
-        $detected = substr($detected, 0, -1);
-    }
-
-    if (empty($detected)){
-        $widzard->addArray('checks', _NGIMG._INSTALL_L95);
-    } elseif ( XOOPS_ROOT_PATH != $detected ) {
-        $widzard->addArray('checks', _NGIMG.sprintf(_INSTALL_L96,$detected));
-    } else {
-        $widzard->addArray('checks', _OKIMG._INSTALL_L97);
-    }
-
-    if(!is_dir(XOOPS_ROOT_PATH)){
-        $widzard->addArray('checks', _NGIMG._INSTALL_L99);
-    }
-
-    if(preg_match('/^http[s]?:\/\/(.*)[^\/]+$/i',XOOPS_URL)){
-        $widzard->addArray('checks', _OKIMG._INSTALL_L100);
-    }else{
-        $widzard->addArray('checks', _NGIMG._INSTALL_L101);
-    }
-
-    $widzard->render('install_mainfile.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_modcheck.inc.php
diff -u xoops2jp/html/install/widzards/install_modcheck.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_modcheck.inc.php:removed
--- xoops2jp/html/install/widzards/install_modcheck.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_modcheck.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,33 +0,0 @@
-<?php
-    $writeok = array('uploads/', 'cache/', 'templates_c/', 'mainfile.php');
-    $error = false;
-    foreach ($writeok as $wok) {
-        if (!is_dir('../'.$wok)) {
-            if ( file_exists('../'.$wok) ) {
-                @chmod('../'.$wok, 0666);
-                if (! is_writeable('../'.$wok)) {
-                    $widzard->addArray('checks',_NGIMG.sprintf(_INSTALL_L83, $wok));
-                    $error = true;
-                }else{
-                    $widzard->addArray('checks',_OKIMG.sprintf(_INSTALL_L84, $wok));
-                }
-            }
-        } else {
-            @chmod('../'.$wok, 0777);
-            if (! is_writeable('../'.$wok)) {
-                $widzard->addArray('checks',_NGIMG.sprintf(_INSTALL_L85, $wok));
-                $error = true;
-            }else{
-                $widzard->addArray('checks',_OKIMG.sprintf(_INSTALL_L86, $wok));
-            }
-        }
-    }
-
-    if(! $error) {
-        $widzard->assign('message',_INSTALL_L87);
-    }else{
-        $widzard->assign('message',_INSTALL_L46);
-        $widzard->setReload(true);
-    }
-    $widzard->render('install_modcheck.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_siteInit.inc.php
diff -u xoops2jp/html/install/widzards/install_siteInit.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_siteInit.inc.php:removed
--- xoops2jp/html/install/widzards/install_siteInit.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_siteInit.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,4 +0,0 @@
-<?php
-    include_once '../mainfile.php';
-    $widzard->render('install_siteInit.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_start.inc.php
diff -u xoops2jp/html/install/widzards/install_start.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_start.inc.php:removed
--- xoops2jp/html/install/widzards/install_start.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_start.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    include './language/'.$language.'/welcome.php'; //This will set message to $content;
-    $widzard->assign('welcome', $content);
-    $widzard->render('install_start.tpl.php');
-?>
Index: xoops2jp/html/install/widzards/install_updateAvatars.inc.php
diff -u xoops2jp/html/install/widzards/install_updateAvatars.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateAvatars.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateAvatars.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateAvatars.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    $content = '<p>'._INSTALL_L151.'</p>';
-    $b_next = array('updateAvatars_go', _INSTALL_L139);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateAvatars_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateAvatars_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateAvatars_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateAvatars_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateAvatars_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,57 +0,0 @@
-<?php
-    unset($xoopsOption['nocommon']);
-    include('../mainfile.php');
-    $content = '';
-    $title = _INSTALL_L156;
-    $avatars = getImageFileList(XOOPS_ROOT_PATH.'/images/avatar/users/');
-    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif'");
-    $avt_handler =& xoops_gethandler('avatar');
-    if (!defined('XOOPS_UPLOAD_PATH')) {
-        define('XOOPS_UPLOAD_PATH', '../uploads');
-    }
-    foreach ($avatars as $avatar_file) {
-        if (preg_match("/^([0-9]+)\.([a-zA-Z]+)$/", $avatar_file, $matched)) {
-            $user_id = intval($matched[1]);
-            if ($user_id > 0 && false != $fp = fopen('../images/avatar/users/'.$avatar_file, 'rb')) {
-                $binary = fread($fp, filesize('../images/avatar/users/'.$avatar_file));
-                fclose($fp);
-                $newavatar = uniqid('cavt').'.'.strtolower($matched[2]);
-                if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newavatar, 'wb')) {
-                    if (-1 != fwrite($fp, $binary)) {
-                        $error = false;
-                        if (!$xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='".$newavatar."' WHERE uid=".$user_id)) {
-                            $error = true;
-                        } else {
-                            $avatar =& $avt_handler->create();
-                            $avatar->setVar('avatar_file', $newavatar);
-                            $avatar->setVar('avatar_name', 'custom');
-                            $avatar->setVar('avatar_mimetype', '');
-                            $avatar->setVar('avatar_display', 1);
-                            $avatar->setVar('avatar_type', 'C');
-                            if(!$avt_handler->insert($avatar)) {
-                                $error = true;
-                            } else {
-                                $avt_handler->addUser($avatar->getVar('avatar_id'), $user['uid']);
-                            }
-                        }
-                        if (false != $error) {
-                            $content .= _NGIMG.sprintf(_INSTALL_L153, $avatar_file).'<br />';
-                            @unlink(XOOPS_UPLOAD_PATH.'/'.$newavatar);
-                        } else {
-                            $content .= _OKIMG.sprintf(_INSTALL_L154, $avatar_file).'<br />';
-                        }
-                    } else {
-                        $content .= _NGIMG.sprintf(_INSTALL_L153, $avatar_file).'<br />';
-                        $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE uid=".$user_id);
-                    }
-                    fclose($fp);
-                }
-            } else {
-                $content .= _NGIMG.sprintf(_INSTALL_L152, $avatar_file).'<br />';
-            }
-        }
-    }
-
-    $b_next = array('finish', _INSTALL_L14);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateComments.inc.php
diff -u xoops2jp/html/install/widzards/install_updateComments.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateComments.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateComments.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateComments.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    $content = "<p>"._INSTALL_L149."</p>\n";
-    $b_next = array('updateComments_go', _INSTALL_L138);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateComments_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateComments_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateComments_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateComments_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateComments_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,47 +0,0 @@
-<?php
-    unset($xoopsOption['nocommon']);
-    include '../mainfile.php';
-    include '../class/xoopscomments.php';
-    include '../include/comment_constants.php';
-    $module_handler =& xoops_gethandler('module');
-    $old_commentd_mods = array('news' => 'comments', 'xoopspoll' => 'xoopspollcomments');
-    $title = _INSTALL_L147;
-    $content = '';
-    foreach ($old_commentd_mods as $module => $com_table) {
-        $moduleobj =& $module_handler->getByDirname($module);
-        if (is_object($moduleobj)) {
-            $content .= '<h5>'.$moduleobj->getVar('name').'</h5>';
-            $comment_handler =& xoops_gethandler('comment');
-            $criteria = new CriteriaCompo();
-            $criteria->setOrder('DESC');
-            $criteria->setSort('com_id');
-            $criteria->setLimit(1);
-            $last_comment =& $comment_handler->getObjects($criteria);
-            $offset = (is_array($last_comment) && count($last_comment) > 0) ? $last_comment[0]->getVar('com_id') : 0;
-            $xc = new XoopsComments($xoopsDB->prefix($com_table));
-            $top_comments =& $xc->getAllComments(array('pid=0'));
-
-            foreach ($top_comments as $tc) {
-                $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_ip, com_sig, com_itemid, com_rootid, com_status, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, '%s', '%s', '%s', %u, %u, %u, '%s', %u, %u, %u, %u, %u, %u, %u, %u, %u)", $xoopsDB->prefix('xoopscomments'), $tc->getVar('comment_id') + $offset, 0, $moduleobj->getVar('mid'), '', addslashes($tc->getVar('subject', 'n')), addslashes($tc->getVar('comment', 'n')), $tc->getVar('date'), $tc->getVar('date'), $tc->getVar('user_id'), $tc->getVar('ip'), 0, $tc->getVar('item_id'), $tc->getVar('comment_id') + $offset, XOOPS_COMMENT_ACTIVE, 0, 1, 1, 1, 1);
-
-                if (!$xoopsDB->query($sql)) {
-                    $content .= _NGIMG.sprintf(_INSTALL_L146, $tc->getVar('comment_id') + $offset).'<br />';
-                } else {
-                    $content .= _OKIMG.sprintf(_INSTALL_L145, $tc->getVar('comment_id') + $offset).'<br />';
-                    $child_comments = $tc->getCommentTree();
-                    foreach ($child_comments as $cc) {
-                        $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_ip, com_sig, com_itemid, com_rootid, com_status, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, '%s', '%s', '%s', %u, %u, %u, '%s', %u, %u, %u, %u, %u, %u, %u, %u, %u)", $xoopsDB->prefix('xoopscomments'), $cc->getVar('comment_id') + $offset, $cc->getVar('pid') + $offset, $moduleobj->getVar('mid'), '', addslashes($cc->getVar('subject', 'n')), addslashes($cc->getVar('comment', 'n')), $cc->getVar('date'), $cc->getVar('date'), $cc->getVar('user_id'), $cc->getVar('ip'), 0, $cc->getVar('item_id'), $tc->getVar('comment_id') + $offset, XOOPS_COMMENT_ACTIVE, 0, 1, 1, 1, 1);
-                        if (!$xoopsDB->query($sql)) {
-                            $content .= _NGIMG.sprintf(_INSTALL_L146, $cc->getVar('comment_id') + $offset).'<br />';
-                        } else {
-                            $content .= _OKIMG.sprintf(_INSTALL_L145, $cc->getVar('comment_id') + $offset).'<br />';
-                        }
-                    }
-                }
-            }
-        }
-    }
-    $xoopsDB->query('ALTER TABLE '.$xoopsDB->prefix('xoopscomments').' CHANGE com_id com_id mediumint(8) unsigned NOT NULL auto_increment PRIMARY KEY');
-    $b_next = array('updateSmilies', _INSTALL_L14);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateConfig.inc.php
diff -u xoops2jp/html/install/widzards/install_updateConfig.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateConfig.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateConfig.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateConfig.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    $b_next = array('updateConfig_go', _INSTALL_L144);
-    $content = "<p>"._INSTALL_L143."</p>\n";
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateConfig_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateConfig_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateConfig_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateConfig_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateConfig_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,168 +0,0 @@
-<?php
-    include_once "../mainfile.php";
-
-    $language = check_language($language);
-    if ( file_exists("./language/".$language."/install2.php") ) {
-        include_once "./language/".$language."/install2.php";
-    } elseif ( file_exists("./language/english/install2.php") ) {
-        include_once "./language/english/install2.php";
-        $language = 'english';
-    } else {
-        echo 'no language file (install2.php).';
-        exit();
-    }
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-
-    // default settings
-    $xoopsConfig['sitename'] = 'XOOPS Cube Site';
-    $xoopsConfig['slogan'] = 'Just use it!';
-    $xoopsConfig['adminmail'] = '';
-    $xoopsConfig['language'] = 'english';
-    $xoopsConfig['anonymous'] = 'Anonymous';
-    $xoopsConfig['minpass'] = 5;
-    $xoopsConfig['anonpost'] = 0;
-    $xoopsConfig['new_user_notify'] = 0;
-    $xoopsConfig['new_user_notify_group'] = 1;
-    $xoopsConfig['self_delete'] = 0;
-    $xoopsConfig['gzip_compression'] = 0;
-    $xoopsConfig['uname_test_level'] = 0;
-    $xoopsConfig['usercookie'] = "xoops_user";
-    $xoopsConfig['sessioncookie'] = "xoops_session";
-    $xoopsConfig['sessionexpire'] = 4500;
-    $xoopsConfig['server_TZ'] = 0;
-    $xoopsConfig['default_TZ'] = 0;
-    $xoopsConfig['banners'] = 1;
-    $xoopsConfig['com_mode'] = "nest";
-    $xoopsConfig['com_order'] = 1;
-    $xoopsConfig['my_ip'] = "127.0.0.1";
-    $xoopsConfig['avatar_allow_upload'] = 0;
-    $xoopsConfig['avatar_width'] = 120;
-    $xoopsConfig['avatar_height'] = 120;
-    $xoopsConfig['avatar_maxsize'] = 15000;
-
-    // override deafault with 1.3.x settings if any
-    if (file_exists('../modules/system/cache/config.php')) {
-        include_once('../modules/system/cache/config.php');
-    }
-
-    $dbm->insert('config', " VALUES (1, 0, 1, 'sitename', '_MD_AM_SITENAME', '".addslashes($xoopsConfig['sitename'])."', '_MD_AM_SITENAMEDSC', 'textbox', 'text', 0)");
-    $dbm->insert('config', " VALUES (2, 0, 1, 'slogan', '_MD_AM_SLOGAN', '".addslashes($xoopsConfig['slogan'])."', '_MD_AM_SLOGANDSC', 'textbox', 'text', 2)");
-    $dbm->insert('config', " VALUES (3, 0, 1, 'language', '_MD_AM_LANGUAGE', '".$xoopsConfig['language']."', '_MD_AM_LANGUAGEDSC', 'language', 'other', 4)");
-    $dbm->insert('config', " VALUES (4, 0, 1, 'startpage', '_MD_AM_STARTPAGE', '--', '_MD_AM_STARTPAGEDSC', 'startpage', 'other', 6)");
-    $dbm->insert('config', " VALUES (5, 0, 1, 'server_TZ', '_MD_AM_SERVERTZ', '".addslashes($xoopsConfig['server_TZ'])."', '_MD_AM_SERVERTZDSC', 'timezone', 'float', 8)");
-    $dbm->insert('config', " VALUES (6, 0, 1, 'default_TZ', '_MD_AM_DEFAULTTZ', '".addslashes($xoopsConfig['default_TZ'])."', '_MD_AM_DEFAULTTZDSC', 'timezone', 'float', 10)");
-    $dbm->insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', 'default', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)");
-    $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes($xoopsConfig['anonymous'])."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)");
-    $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '".intval($xoopsConfig['gzip_compression'])."', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)");
-    $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', '".addslashes($xoopsConfig['usercookie'])."', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)");
-    $dbm->insert('config', " VALUES (11, 0, 1, 'session_expire', '_MD_AM_SESSEXPIRE', '15', '_MD_AM_SESSEXPIREDSC', 'textbox', 'int', 22)");
-    $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '".intval($xoopsConfig['banners'])."', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)");
-    $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '1', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)");
-    $dbm->insert('config', " VALUES (14, 0, 1, 'my_ip', '_MD_AM_MYIP', '".addslashes($xoopsConfig['my_ip'])."', '_MD_AM_MYIPDSC', 'textbox', 'text', 29)");
-    $dbm->insert('config', " VALUES (15, 0, 1, 'use_ssl', '_MD_AM_USESSL', '0', '_MD_AM_USESSLDSC', 'yesno', 'int', 30)");
-    $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)");
-    $dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '".intval($xoopsConfig['minpass'])."', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)");
-    $dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '5', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)");
-    $dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '".intval($xoopsConfig['new_user_notify'])."', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)");
-    $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".intval($xoopsConfig['new_user_notify_group']).", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
-    $dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)");
-    $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".XOOPS_GROUP_ADMIN.", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
-    $dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '".intval($xoopsConfig['uname_test_level'])."', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)");
-    $dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '".intval($xoopsConfig['avatar_allow_upload'])."', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)");
-    $dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '".intval($xoopsConfig['avatar_width'])."', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)");
-    $dbm->insert('config', " VALUES (28, 0, 2, 'avatar_height', '_MD_AM_AVATARH', '".intval($xoopsConfig['avatar_height'])."', '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)");
-    $dbm->insert('config', " VALUES (29, 0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', '".intval($xoopsConfig['avatar_maxsize'])."', '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)");
-    $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '".addslashes($xoopsConfig['adminmail'])."', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)");
-    $dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '".intval($xoopsConfig['self_delete'])."', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)");
-    $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', '".addslashes($xoopsConfig['com_mode'])."', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
-    $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '".intval($xoopsConfig['com_order'])."', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
-    $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
-    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
-    $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
-    $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
-    $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
-    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
-    $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
-    $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
-    $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
-    $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'select', 'text', 2)");
-    $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)");
-    $dbm->insert('config', " VALUES (45, 0, 5, 'keyword_min', '_MD_AM_MINSEARCH', '5', '_MD_AM_MINSEARCHDSC', 'textbox', 'int', 1)");
-    $dbm->insert('config', " VALUES (46, 0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', '0', '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15)");
-    $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)");
-    $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
-    $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
-    $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright &copy; 2001-2003', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
-    $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
-    $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");
-    $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '0', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)");
-    $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)");
-    $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '".addslashes(_INSTALL_DISCLMR)."', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)");
-    $dbm->insert('config', " VALUES (56, 0, 2, 'allow_register', '_MD_AM_ALLOWREG', 1, '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)");
-    $dbm->insert('config', " VALUES (57, 0, 1, 'theme_fromfile', '_MD_AM_THEMEFILE', '0', '_MD_AM_THEMEFILEDSC', 'yesno', 'int', 13)");
-    $dbm->insert('config', " VALUES (58, 0, 1, 'closesite', '_MD_AM_CLOSESITE', '0', '_MD_AM_CLOSESITEDSC', 'yesno', 'int', 26)");
-    $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '".addslashes(serialize(array('1')))."', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)");
-    $dbm->insert('config', " VALUES (60, 0, 1, 'closesite_text', '_MD_AM_CLOSESITETXT', '"._INSTALL_L165."', '_MD_AM_CLOSESITETXTDSC', 'textarea', 'text', 28)");
-    $dbm->insert('config', " VALUES (61, 0, 1, 'sslpost_name', '_MD_AM_SSLPOST', 'xoops_ssl', '_MD_AM_SSLPOSTDSC', 'textbox', 'text', 31)");
-    $dbm->insert('config', " VALUES (62, 0, 1, 'module_cache', '_MD_AM_MODCACHE', '', '_MD_AM_MODCACHEDSC', 'module_cache', 'array', 50)");
-    $dbm->insert('config', " VALUES (63, 0, 1, 'template_set', '_MD_AM_DTPLSET', 'default', '_MD_AM_DTPLSETDSC', 'tplset', 'other', 14)");
-    $dbm->insert('config', " VALUES (64,0,6,'mailmethod','_MD_AM_MAILERMETHOD','mail','_MD_AM_MAILERMETHODDESC','select','text',4)");
-    $dbm->insert('config', " VALUES (65,0,6,'smtphost','_MD_AM_SMTPHOST','a:1:{i:0;s:0:\"\";}', '_MD_AM_SMTPHOSTDESC','textarea','array',6)");
-    $dbm->insert('config', " VALUES (66,0,6,'smtpuser','_MD_AM_SMTPUSER','','_MD_AM_SMTPUSERDESC','textbox','text',7)");
-    $dbm->insert('config', " VALUES (67,0,6,'smtppass','_MD_AM_SMTPPASS','','_MD_AM_SMTPPASSDESC','password','text',8)");
-    $dbm->insert('config', " VALUES (68,0,6,'sendmailpath','_MD_AM_SENDMAILPATH','/usr/sbin/sendmail','_MD_AM_SENDMAILPATHDESC','textbox','text',5)");
-    $dbm->insert('config', " VALUES (69,0,6,'from','_MD_AM_MAILFROM','','_MD_AM_MAILFROMDESC','textbox','text',1)");
-    $dbm->insert('config', " VALUES (70,0,6,'fromname','_MD_AM_MAILFROMNAME','','_MD_AM_MAILFROMNAMEDESC','textbox','text',2)");
-    $dbm->insert('config', " VALUES (71, 0, 1, 'sslloginlink', '_MD_AM_SSLLINK', 'https://', '_MD_AM_SSLLINKDSC', 'textbox', 'text', 33)");
-    $dbm->insert('config', " VALUES (72, 0, 1, 'theme_set_allowed', '_MD_AM_THEMEOK', '".serialize(array('default'))."', '_MD_AM_THEMEOKDSC', 'theme_multi', 'array', 13)");
-    $dbm->insert('config', " VALUES (73,0,6,'fromuid','_MD_AM_MAILFROMUID','1','_MD_AM_MAILFROMUIDDESC','user','int',3)");
-
-
-    // default the default theme
-
-    $time = time();
-    $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Theme', '', ".$time.")");
-
-//  include_once './class/cachemanager.php';
-//    $cm = new cache_manager;
-//  $skinfiles = array('1' => 'skin.html', '2' => 'style.css'
-//                        , '3' => 'styleNN.css','4' =>  'styleMAC.css'
-//                        , '5' => 'skin_blockleft.html', '6' => 'skin_blockright.html'
-//                        , '7' => 'skin_blockcenter_l.html', '8' => 'skin_blockcenter_c.html'
-//                        , '9' => 'skin_blockcenter_r.html');
-//    foreach ($skinfiles as $key => $skinfile) {
-//        if(preg_match('/\.css$/', $skinfile)) {
-//            $type = 'css';
-//        }else{
-//            $type = 'skin';
-//        }
-//        $dbm->insert('tplfile', " VALUES ($key, 0, '', 'default', '$skinfile', '', $time, $time, '$type')");
-
-//        $fp = fopen('./templates/default_skin/'.$skinfile, 'r');
-//        $skinsource = fread($fp, filesize('./templates/default_skin/'.$skinfile));
-//        fclose($fp);
-//        $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES ($key, '".addslashes($skinsource)."')");
-//        if(preg_match('/\.css$/',$skinfile)) {
-//            $cm->write($skinfile, $skinsource);
-//        }
-//    }
-
-        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, block_id FROM ".$dbm->prefix('groups_blocks_link'));
-        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'block_read'");
-        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, mid FROM ".$dbm->prefix('groups_modules_link') ." WHERE type='A'");
-        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'module_admin' WHERE gperm_name = ''");
-        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, mid FROM ".$dbm->prefix('groups_modules_link')." WHERE type='R'");
-        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'module_read' WHERE gperm_name = ''");
-        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_modid = 1");
-        $dbm->query('DROP TABLE '.$dbm->prefix('groups_blocks_link'));
-        $dbm->query('DROP TABLE '.$dbm->prefix('groups_modules_link'));
-
-    // insert some more data
-    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.data.sql');
-
-    $content = $dbm->report();
-    //$content .= $cm->report();
-    $b_next = array('updateModules', _INSTALL_L14);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateModules.inc.php
diff -u xoops2jp/html/install/widzards/install_updateModules.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateModules.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateModules.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateModules.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    $b_next = array('updateModules_go', _INSTALL_L137);
-    $content = "<p>"._INSTALL_L141."</p>\n";
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateModules_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateModules_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateModules_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateModules_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateModules_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,248 +0,0 @@
-<?php
-    unset($xoopsOption['nocommon']);
-    include_once "../mainfile.php";
-    error_reporting(E_ERROR);
-    ob_start();
-    $module_handler =& xoops_gethandler('module');
-    $modules =& $module_handler->getObjects(null, true);
-    foreach (array_keys($modules) as $mid) {
-        echo '<h5>'.$modules[$mid]->getVar('name').'</h5>';
-        $dirname = $modules[$mid]->getVar('dirname');
-        if (is_dir(XOOPS_ROOT_PATH.'/modules/'.$dirname)) {
-            $modules[$mid]->loadInfoAsVar($dirname, false);
-            if (!$module_handler->insert($modules[$mid])) {
-                echo '<p>Could not update '.$modules[$mid]->getVar('name').'</p>';
-            } else {
-                $newmid = $modules[$mid]->getVar('mid');
-                $msgs = array();
-                $msgs[] = 'Module data updated.';
-                $tplfile_handler =& xoops_gethandler('tplfile');
-                $templates = $modules[$mid]->getInfo('templates');
-                if ($templates != false) {
-                    $msgs[] = 'Generating templates...';
-                    foreach ($templates as $tpl) {
-                        $tpl['file'] = trim($tpl['file']);
-                        $tpldata =& xoops_module_gettemplate($dirname, $tpl['file']);
-                        $tplfile =& $tplfile_handler->create();
-                        $tplfile->setVar('tpl_refid', $newmid);
-                        $tplfile->setVar('tpl_lastimported', 0);
-                        $tplfile->setVar('tpl_lastmodified', time());
-                        if (preg_match("/\.css$/i", $tpl['file'])) {
-                            $tplfile->setVar('tpl_type', 'css');
-                        } else {
-                            $tplfile->setVar('tpl_type', 'module');
-                            //if ($xoopsConfig['default_theme'] == 'default') {
-                            //  include_once XOOPS_ROOT_PATH.'/class/template.php';
-                            //  xoops_template_touch($tplfile->getVar('tpl_id'));
-                            //}
-                        }
-                        $tplfile->setVar('tpl_source', $tpldata, true);
-                        $tplfile->setVar('tpl_module', $dirname);
-                        $tplfile->setVar('tpl_tplset', 'default');
-                        $tplfile->setVar('tpl_file', $tpl['file'], true);
-                        $tplfile->setVar('tpl_desc', $tpl['description'], true);
-                        if (!$tplfile_handler->insert($tplfile)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$tpl['file'].'</b> to the database.</span>';
-                        } else {
-                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$tpl['file'].'</b> inserted to the database.';
-                        }
-                        unset($tpldata);
-                    }
-                }
-                $blocks = $modules[$mid]->getInfo('blocks');
-                $msgs[] = 'Rebuilding blocks...';
-                $showfuncs = array();
-                $funcfiles = array();
-                if ($blocks != false) {
-                    $count = count($blocks);
-                    include_once(XOOPS_ROOT_PATH.'/class/xoopsblock.php');
-                    for ( $i = 1; $i <= $count; $i++ ) {
-                        if (isset($blocks[$i]['show_func']) && $blocks[$i]['show_func'] != '' && isset($blocks[$i]['file']) && $blocks[$i]['file'] != '') {
-                            $editfunc = isset($blocks[$i]['edit_func']) ? $blocks[$i]['edit_func'] : '';
-                            $showfuncs[] = $blocks[$i]['show_func'];
-                            $funcfiles[] = $blocks[$i]['file'];
-                            $template = '';
-                            if ((isset($blocks[$i]['template']) && trim($blocks[$i]['template']) != '')) {
-                                $content =& xoops_module_gettemplate($dirname, $blocks[$i]['template'], true);
-                                $template = $blocks[$i]['template'];
-                            }
-                            if (!$content) {
-                                $content = '';
-                            }
-                            $options = '';
-                            if (isset($blocks[$i]['options']) && $blocks[$i]['options'] != '') {
-                                $options = $blocks[$i]['options'];
-                            }
-                            $sql = "SELECT bid, name FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i;
-                            $fresult = $xoopsDB->query($sql);
-                            $fcount = 0;
-                            while ($fblock = $xoopsDB->fetchArray($fresult)) {
-                                $fcount++;
-                                $sql = "UPDATE ".$xoopsDB->prefix("newblocks")." SET name='".addslashes($blocks[$i]['name'])."', title='".addslashes($blocks[$i]['name'])."', dirname='".addslashes($dirname)."',  func_file='".addslashes($blocks[$i]['file'])."', show_func='".addslashes($blocks[$i]['show_func'])."', template='".addslashes($template)."', edit_func='".addslashes($editfunc)."', options='".addslashes($options)."', content='', template='".$template."', last_modified=".time()." WHERE bid=".$fblock['bid'];
-                                $result = $xoopsDB->query($sql);
-                                if (!$result) {
-                                    $msgs[] = '&nbsp;&nbsp;ERROR: Could not update '.$fblock['name'];
-                                } else {
-                                    $msgs[] = '&nbsp;&nbsp;Block <b>'.$fblock['name'].'</b> updated. Block ID: <b>'.$fblock['bid'].'</b>';
-                                    if ($template != '') {
-                                        $tplfile =& $tplfile_handler->create();
-                                        $tplfile->setVar('tpl_refid', $fblock['bid']);
-                                        $tplfile->setVar('tpl_source', $content, true);
-                                        $tplfile->setVar('tpl_tplset', 'default');
-                                        $tplfile->setVar('tpl_file', $blocks[$i]['template']);
-                                        $tplfile->setVar('tpl_module', $dirname);
-                                        $tplfile->setVar('tpl_type', 'block');
-                                        $tplfile->setVar('tpl_desc', $blocks[$i]['description'], true);
-                                        $tplfile->setVar('tpl_lastimported', 0);
-                                        $tplfile->setVar('tpl_lastmodified', time());
-                                        if (!$tplfile_handler->insert($tplfile)) {
-                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$blocks[$i]['template'].'</b> to the database.</span>';
-                                        } else {
-                                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> inserted to the database.';
-                                            //if ($xoopsConfig['default_theme'] == 'default') {
-                                            //  if (!xoops_template_touch($tplfile[0]->getVar('tpl_id'))) {
-                                            //      $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not recompile template <b>'.$blocks[$i]['template'].'</b>.</span>';
-                                            //  } else {
-                                            //      $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> recompiled.';
-                                            //  }
-                                            //}
-                                        }
-                                    }
-                                }
-                            }
-                            if ($fcount == 0) {
-                                $newbid = $xoopsDB->genId($xoopsDB->prefix('newblocks').'_bid_seq');
-                                $block_name = addslashes($blocks[$i]['name']);
-                                $sql = "INSERT INTO ".$xoopsDB->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES (".$newbid.", ".$mid.", ".$i.",'".addslashes($options)."','".$block_name."', '".$block_name."', '', 0, 0, 0, 'M', 1, '".addslashes($dirname)."', '".addslashes($blocks[$i]['file'])."', '".addslashes($blocks[$i]['show_func'])."', '".addslashes($editfunc)."', '".$template."', ".time().")";
-                                $result = $xoopsDB->query($sql);
-                                if (!$result) {
-                                    $msgs[] = '&nbsp;&nbsp;ERROR: Could not create '.$blocks[$i]['name'];
-                                } else {
-                                    if (empty($newbid)) {
-                                        $newbid = $xoopsDB->getInsertId();
-                                    }
-                                    if ($template != '') {
-                                        $tplfile =& $tplfile_handler->create();
-                                        $tplfile->setVar('tpl_module', $dirname);
-                                        $tplfile->setVar('tpl_refid', $newbid);
-                                        $tplfile->setVar('tpl_source', $content, true);
-                                        $tplfile->setVar('tpl_tplset', 'default');
-                                        $tplfile->setVar('tpl_file', $blocks[$i]['template'], true);
-                                        $tplfile->setVar('tpl_type', 'block');
-                                        $tplfile->setVar('tpl_lastimported', 0);
-                                        $tplfile->setVar('tpl_lastmodified', time());
-                                        $tplfile->setVar('tpl_desc', $blocks[$i]['description'], true);
-                                        if (!$tplfile_handler->insert($tplfile)) {
-                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$blocks[$i]['template'].'</b> to the database.</span>';
-                                        } else {
-                                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> inserted to the database.';
-                                        }
-                                    }
-                                    $msgs[] = '&nbsp;&nbsp;Block <b>'.$blocks[$i]['name'].'</b> created. Block ID: <b>'.$newbid.'</b>';
-                                }
-                            }
-                        }
-                    }
-                }
-                $block_arr = XoopsBlock::getByModule($mid);
-                foreach ($block_arr as $block) {
-                    if (!in_array($block->getVar('show_func'), $showfuncs) || !in_array($block->getVar('func_file'), $funcfiles)) {
-                        $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix('newblocks'), $block->getVar('bid'));
-                        if(!$xoopsDB->query($sql)) {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not delete block <b>'.$block->getVar('name').'</b>. Block ID: <b>'.$block->getVar('bid').'</b></span>';
-                        } else {
-                            $msgs[] = '&nbsp;&nbsp;Block <b>'.$block->getVar('name').' deleted. Block ID: <b>'.$block->getVar('bid').'</b>';
-                        }
-                    }
-                }
-
-                $configs = $modules[$mid]->getInfo('config');
-                if ($configs != false) {
-                    if ($modules[$mid]->getVar('hascomments') != 0) {
-                        include_once(XOOPS_ROOT_PATH.'/include/comment_constants.php');
-                        array_push($configs, array('name' => 'com_rule', 'title' => '_CM_COMRULES', 'description' => '', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 1, 'options' => array('_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)));
-                        array_push($configs, array('name' => 'com_anonpost', 'title' => '_CM_COMANONPOST', 'description' => '', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0));
-                    }
-                } else {
-                    if ($modules[$mid]->getVar('hascomments') != 0) {
-                        $configs = array();
-                        include_once(XOOPS_ROOT_PATH.'/include/comment_constants.php');
-                        $configs[] = array('name' => 'com_rule', 'title' => '_CM_COMRULES', 'description' => '', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 1, 'options' => array('_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN));
-                        array_push($configs, array('name' => 'com_anonpost', 'title' => '_CM_COMANONPOST', 'description' => '', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0));
-                    }
-                }
-                // RMV-NOTIFY
-                if ($modules[$mid]->getVar('hasnotification') != 0) {
-                    if (empty($configs)) {
-                        $configs = array();
-                    }
-                    include_once(XOOPS_ROOT_PATH.'/include/notification_constants.php');
-                    $configs[] = array ('name' => 'notification_enabled', 'title' => '_NOT_CONFIG_ENABLED', 'description' => '_NOT_CONFIG_ENABLEDDSC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => XOOPS_NOTIFICATION_ENABLEBOTH, 'options' => $options);
-                }
-
-                if ($configs != false) {
-                    $msgs[] = 'Adding module config data...';
-                    $config_handler =& xoops_gethandler('config');
-                    $order = 0;
-                    foreach ($configs as $config) {
-                        $confobj =& $config_handler->createConfig();
-                        $confobj->setVar('conf_modid', $newmid);
-                        $confobj->setVar('conf_catid', 0);
-                        $confobj->setVar('conf_name', $config['name']);
-                        $confobj->setVar('conf_title', $config['title'], true);
-                        $confobj->setVar('conf_desc', $config['description'], true);
-                        $confobj->setVar('conf_formtype', $config['formtype']);
-                        $confobj->setVar('conf_valuetype', $config['valuetype']);
-                        $confobj->setVar('conf_value', $config['default'], true);
-                        $confobj->setVar('conf_order', $order);
-                        $confop_msgs = '';
-                        if (isset($config['options']) && is_array($config['options'])) {
-                            foreach ($config['options'] as $key => $value) {
-                                $confop =& $config_handler->createConfigOption();
-                                $confop->setVar('confop_name', $key, true);
-                                $confop->setVar('confop_value', $value, true);
-                                $confobj->setConfOptions($confop);
-                                $confop_msgs .= '<br />&nbsp;&nbsp;&nbsp;&nbsp;Config option added. Name: <b>'.$key.'</b> Value: <b>'.$value.'</b>';
-                                unset($confop);
-                            }
-                        }
-                        $order++;
-                        if ($config_handler->insertConfig($confobj) != false) {
-                            $msgs[] = '&nbsp;&nbsp;Config <b>'.$config['name'].'</b> added to the database.'.$confop_msgs;
-                        } else {
-                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert config <b>'.$config['name'].'</b> to the database.</span>';
-                        }
-                        unset($confobj);
-                    }
-                    unset($configs);
-                }
-                foreach ($msgs as $msg) {
-                    echo '<code>'.$msg.'</code><br />';
-                }
-            }
-            // data for table 'block_module_link'
-            include_once './class/dbmanager.php';
-            $dbm = new db_manager;
-            $sql = 'SELECT bid, side FROM '.$dbm->prefix('newblocks');
-            $result = $dbm->query($sql);
-
-            while ($myrow = $dbm->fetchArray($result)) {
-                if ($myrow['side'] == 0) {
-                    $dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", 0)");
-                } else {
-                    $dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", -1)");
-                }
-            }
-        }
-        echo '<br />';
-        flush();
-        sleep(1);
-    }
-    $title = _INSTALL_L142;
-    $content = "<table width='80%' align='center'><tr><td align='left'>\n";
-    $content .= ob_get_contents();
-    $content .= "</td></tr></table>\n";
-    ob_end_clean();
-    $b_next = array('updateComments', _INSTALL_L14);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateSmilies.inc.php
diff -u xoops2jp/html/install/widzards/install_updateSmilies.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateSmilies.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateSmilies.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateSmilies.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,5 +0,0 @@
-<?php
-    $content = '<p>'._INSTALL_L150.'</p>';
-    $b_next = array('updateSmilies_go', _INSTALL_L140);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateSmilies_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateSmilies_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateSmilies_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateSmilies_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateSmilies_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,55 +0,0 @@
-<?php
-    unset($xoopsOption['nocommon']);
-    include('../mainfile.php');
-    $result = $xoopsDB->query("SELECT * FROM ".$xoopsDB->prefix('smiles'));
-    $content = '';
-    $title = _INSTALL_L155;
-    if (!defined('XOOPS_UPLOAD_PATH')) {
-        define('XOOPS_UPLOAD_PATH', '../uploads');
-    }
-    while ($smiley = $xoopsDB->fetchArray($result)) {
-        if (file_exists('../images/smilies/'.$smiley['smile_url']) && false != $fp = fopen('../images/smilies/'.$smiley['smile_url'], 'rb')) {
-            $binary = fread($fp, filesize('../images/smilies/'.$smiley['smile_url']));
-            fclose($fp);
-            if (!preg_match("/\.([a-zA-Z0-9]+)$/", $smiley['smile_url'], $matched)) {
-                continue;
-            }
-            $newsmiley = uniqid('smil').'.'.strtolower($matched[1]);
-            if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newsmiley, 'wb')) {
-                if (-1 != fwrite($fp, $binary)) {
-                    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('smiles')." SET smile_url='".$newsmiley."' WHERE id=".$smiley['id']);
-                    $content .= _OKIMG.sprintf(_INSTALL_L154, $smiley['smile_url']).'<br />';
-                } else {
-                    $content .= _NGIMG.sprintf(_INSTALL_L153, $smiley['smile_url']).'<br />';
-                }
-                fclose($fp);
-            }
-        } else {
-            $content .= _OKIMG.sprintf(_INSTALL_L152, $smiley['smile_url']).'<br />';
-        }
-    }
-    $result = $xoopsDB->query("SELECT * FROM ".$xoopsDB->prefix('ranks'));
-    while ($rank = $xoopsDB->fetchArray($result)) {
-        if (file_exists('../images/ranks/'.$rank['rank_image']) && false != $fp = fopen('../images/ranks/'.$rank['rank_image'], 'rb')) {
-            $binary = fread($fp, filesize('../images/ranks/'.$rank['rank_image']));
-            fclose($fp);
-            if (!preg_match("/\.([a-zA-Z0-9]+)$/", $rank['rank_image'], $matched)) {
-                continue;
-            }
-            $newrank = uniqid('rank').'.'.strtolower($matched[1]);
-            if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newrank, 'wb')) {
-                if (-1 != fwrite($fp, $binary)) {
-                    $content .= _OKIMG.sprintf(_INSTALL_L154, $rank['rank_image']).'<br />';
-                    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('ranks')." SET rank_image='".$newrank."' WHERE rank_id=".$rank['rank_id']);
-                } else {
-                    $content .= _NGIMG.sprintf(_INSTALL_L153, $rank['rank_image']).'<br />';
-                }
-                fclose($fp);
-            }
-        } else {
-            $content .= _OKIMG.sprintf(_INSTALL_L152, $rank['rank_image']).'<br />';
-        }
-    }
-    $b_next = array('updateAvatars', _INSTALL_L14);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateTables.inc.php
diff -u xoops2jp/html/install/widzards/install_updateTables.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateTables.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateTables.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateTables.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,22 +0,0 @@
-<?php
-    include_once "../mainfile.php";
-    include_once './class/dbmanager.php';
-    $db = new db_manager;
-    $sql = 'SELECT * FROM '.$db->prefix('groups');
-    $result = $db->query($sql);
-    $content = '<h5>'._INSTALL_L157.'</h5>';
-    $content .= '<table align="center" cellspacing="0" border="1"><tr><td>'._INSTALL_L158.'</td><td>'._INSTALL_L159.'</td><td>'._INSTALL_L160.'</td><td>'._INSTALL_L161.'</td></tr>';
-    while ($myrow = $db->fetchArray($result)) {
-        if ($myrow['type'] == 'Admin') {
-            $content .= '<tr><td>'.$myrow['name'].'</td><td><input type="radio" name="g_webmasters" value="'.$myrow['groupid'].'" /></td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-        } elseif ($myrow['type'] == 'User') {
-            $content .= '<tr><td>'.$myrow['name'].'</td><td>&nbsp;</td><td><input type="radio" name="g_users" value="'.$myrow['groupid'].'" /></td><td>&nbsp;</td></tr>';
-        } else {
-            $content .= '<tr><td>'.$myrow['name'].'</td><td>&nbsp;</td><td>&nbsp;</td><td><input type="radio" name="g_anonymous" value="'.$myrow['groupid'].'" /></td></tr>';
-        }
-    }
-    $content .= '</table>';
-    $b_back = array();
-    $b_next = array('updateTables_go', _INSTALL_L132);
-    include 'install_tpl.php';
-?>
Index: xoops2jp/html/install/widzards/install_updateTables_go.inc.php
diff -u xoops2jp/html/install/widzards/install_updateTables_go.inc.php:1.1.2.1 xoops2jp/html/install/widzards/install_updateTables_go.inc.php:removed
--- xoops2jp/html/install/widzards/install_updateTables_go.inc.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/widzards/install_updateTables_go.inc.php	Sat Apr  1 10:32:57 2006
@@ -1,44 +0,0 @@
-<?php
-    include_once "../mainfile.php";
-    $error = false;
-    $g_webmasters = isset($g_webmasters) ? intval($g_webmasters) : 0;
-    $g_users = isset($g_users) ? intval($g_users) : 0;
-    $g_anonymous = isset($g_anonymous) ? intval($g_anonymous) : 0;
-    if (empty($g_webmasters) || empty($g_users) || empty($g_anonymous)) {
-        $error = true;
-    } else {
-        include_once "./class/mainfilemanager.php";
-        $title = _INSTALL_L88;
-        $mm = new mainfile_manager("../mainfile.php");
-        $mm->setRewrite('XOOPS_GROUP_ADMIN', $g_webmasters);
-        $mm->setRewrite('XOOPS_GROUP_USERS', $g_users);
-        $mm->setRewrite('XOOPS_GROUP_ANONYMOUS', $g_anonymous);
-
-        $ret = $mm->doRewrite();
-        if(!$ret){
-            $content = _INSTALL_L60;
-            include 'install_tpl.php';
-            exit();
-        }
-    }
-    if (false != $error) {
-        $b_back = array();
-        $content = _INSTALL_L162;
-        include 'install_tpl.php';
-        break;
-    }
-    include_once './class/dbmanager.php';
-    $dbm = new db_manager;
-    if (!$dbm->query("ALTER TABLE ".$dbm->prefix("newblocks")." ADD dirname VARCHAR(50) NOT NULL, ADD func_file VARCHAR(50) NOT NULL, ADD show_func VARCHAR(50) NOT NULL, ADD edit_func VARCHAR(50) NOT NULL")) {
-    }
-    $result = $dbm->queryFromFile('./sql/upgrade/'.XOOPS_DB_TYPE.'.structure.sql');
-    $content = $dbm->report();
-    if (!$result) {
-        $content .= "<p>"._INSTALL_L135."</p>\n";
-        $b_back = array();
-    } else {
-        $content .= "<p>"._INSTALL_L136."</p>\n";
-        $b_next = array('updateConfig', _INSTALL_L14);
-    }
-    include 'install_tpl.php';
-?>

From nobunobu ＠ users.sourceforge.jp  Sat Apr  1 10:33:00 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sat,  1 Apr 2006 10:33:00 +0900
Subject: [xoops-cvslog 2611] CVS update: xoops2jp/html/install/wizards
Message-ID: <20060401013300.F19942AC01F@users.sourceforge.jp>

Index: xoops2jp/html/install/wizards/index.html
diff -u /dev/null xoops2jp/html/install/wizards/index.html:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/index.html	Sat Apr  1 10:33:00 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/install/wizards/install_checkDB.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_checkDB.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_checkDB.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,32 @@
+<?php
+    include_once '../mainfile.php';
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+    $title = _INSTALL_L104;
+    if (! $dbm->isConnectable()) {
+        $wizard->addArray('checks',_NGIMG._INSTALL_L106);
+        $wizard->addArray('msgs',_INSTALL_L107);
+        $wizard->setBack(array('start', _INSTALL_L103));
+        $wizard->setReload(true);
+    } else {
+        $wizard->addArray('checks',_OKIMG._INSTALL_L108);
+        if (! $dbm->dbExists()) {
+            $wizard->addArray('checks',_NGIMG.sprintf(_INSTALL_L109, XOOPS_DB_NAME));
+            $wizard->addArray('msgs',_INSTALL_L21.'<br /><b>'.XOOPS_DB_NAME.'</b>');
+            $wizard->addArray('msgs',_INSTALL_L22);
+        } else {
+            $wizard->addArray('checks',_OKIMG.sprintf(_INSTALL_L110, XOOPS_DB_NAME));
+            if (!$dbm->tableExists('users')) {
+                $wizard->addArray('msgs',_INSTALL_L111);
+                $wizard->setNext(array('createTables', _INSTALL_L40));
+            } else if (!$dbm->tableExists('config')) {
+                $wizard->addArray('msgs',_INSTALL_L130);
+                $wizard->setNext(array('updateTables', _INSTALL_L14));
+            } else {
+                $wizard->addArray('checks',_NGIMG._INSTALL_L131);
+                $wizard->setNext('');
+            }
+        }
+    }
+    $wizard->render('install_checkDB.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_createDB.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_createDB.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_createDB.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,13 @@
+<?php
+    include_once '../mainfile.php';
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+    if(! $dbm->createDB()){
+        $wizard->setContent('<p>'._INSTALL_L31.'</p>');
+        $wizard->setNext(array('checkDB', _INSTALL_L104));
+        $wizard->setBack(array('start', _INSTALL_L103));
+    } else {
+        $wizard->setContent('<p>'.sprintf(_INSTALL_L43, XOOPS_DB_NAME).'</p>');
+    }
+    $wizard->render();
+?>
Index: xoops2jp/html/install/wizards/install_createTables.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_createTables.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_createTables.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,16 @@
+<?php
+    include_once '../mainfile.php';
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+
+    $tables = array();
+    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.structure.sql');
+    $wizard->assign('reports',$dbm->report());
+    if(! $result ){
+        $wizard->assign('message',_INSTALL_L114);
+        $wizard->setBack(array('start', _INSTALL_L103));
+    }else{
+        $wizard->assign('message',_INSTALL_L115);
+    }
+    $wizard->render('install_createTables.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_dbconfirm.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_dbconfirm.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_dbconfirm.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,14 @@
+<?php
+    include_once 'class/settingmanager.php';
+    $sm = new setting_manager(true);
+
+    $content = $sm->checkData();
+    if (!empty($content)) {
+        $wizard->setTitle(_INSTALL_L93);
+        $wizard->setContent($content . $sm->editform());
+        $wizard->setNext(array('dbconfirm',_INSTALL_L91));
+    } else {
+        $wizard->setContent($sm->confirmForm());
+    }
+    $wizard->render();
+?>
Index: xoops2jp/html/install/wizards/install_dbform.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_dbform.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_dbform.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,8 @@
+<?php
+    include_once '../mainfile.php';
+    include_once 'class/settingmanager.php';
+    $sm = new setting_manager();
+    $sm->readConstant();
+    $wizard->setContent($sm->editform());
+    $wizard->render();
+?>
Index: xoops2jp/html/install/wizards/install_dbsave.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_dbsave.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_dbsave.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,42 @@
+<?php
+    include_once './class/mainfilemanager.php';
+    $mm = new mainfile_manager('../mainfile.php');
+
+    $ret = $mm->copyDistFile();
+    if(! $ret){
+        $wizard->setContent(_INSTALL_L60);
+        $wizard->error();
+        exit();
+    }
+
+    $mm->setRewrite('XOOPS_ROOT_PATH', $myts->stripSlashesGPC($_POST['root_path']));
+    $mm->setRewrite('XOOPS_URL', $myts->stripSlashesGPC($_POST['xoops_url']));
+    $mm->setRewrite('XOOPS_DB_TYPE', $myts->stripSlashesGPC($_POST['database']));
+    $mm->setRewrite('XOOPS_DB_PREFIX', $myts->stripSlashesGPC($_POST['prefix']));
+    $mm->setRewrite('XOOPS_DB_HOST', $myts->stripSlashesGPC($_POST['dbhost']));
+    $mm->setRewrite('XOOPS_DB_USER', $myts->stripSlashesGPC($_POST['dbuname']));
+    $mm->setRewrite('XOOPS_DB_PASS', $myts->stripSlashesGPC($_POST['dbpass']));
+    $mm->setRewrite('XOOPS_DB_NAME', $myts->stripSlashesGPC($_POST['dbname']));
+    $mm->setRewrite('XOOPS_DB_PCONNECT', intval($_POST['db_pconnect']));
+    $mm->setRewrite('XOOPS_GROUP_ADMIN', 1);
+    $mm->setRewrite('XOOPS_GROUP_USERS', 2);
+    $mm->setRewrite('XOOPS_GROUP_ANONYMOUS', 3);
+
+    // Check if XOOPS_CHECK_PATH should be initially set or not
+    $xoopsPathTrans = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
+    if ( DIRECTORY_SEPARATOR != '/' ) {
+        // IIS6 doubles the \ chars
+        $xoopsPathTrans = str_replace( strpos( $xoopsPathTrans, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsPathTrans);
+    }
+    $mm->setRewrite('XOOPS_CHECK_PATH', strcasecmp( substr($xoopsPathTrans, 0, strlen(XOOPS_ROOT_PATH)), $_POST['root_path']) ? 0 : 1 );
+
+    $ret = $mm->doRewrite();
+    if(! $ret){
+        $wizard->setContent(_INSTALL_L60);
+        $wizard->error();
+        exit();
+    }
+    $wizard->assign('reports', $mm->report());
+    $wizard->assign('message',_INSTALL_L62);
+    $wizard->render('install_dbsave.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_finish.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_finish.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_finish.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    include './language/'.$language.'/finish.php'; //This will set message to $content;
+    $wizard->assign('finish', $content);
+    $wizard->render('install_finish.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_initial.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_initial.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_initial.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    // confirm database setting
+    include_once "../mainfile.php";
+    $wizard->render('install_initial.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_insertData.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_insertData.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_insertData.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,58 @@
+<?php
+    $adminname = $myts->stripSlashesGPC(trim($_POST['adminname']));
+    $adminpass = $myts->stripSlashesGPC($_POST['adminpass']);
+    $adminmail = $myts->stripSlashesGPC(trim($_POST['adminmail']));
+
+    if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$adminmail)) {
+        $wizard->setContent('<p>'._INSTALL_L73.'</p>');
+        $wizard->setBack(array('', _INSTALL_L112));
+        $wizard->error();
+        exit();
+    }
+    if ( !isset($adminname) || !isset($adminpass) || !isset($adminmail) || $adminmail == "" || $adminname =="" || $adminpass =="" || $adminpass != $adminpass2) {
+        $wizard->setContent('<p>'._INSTALL_L41.'</p>');
+        $wizard->setBack(array('', _INSTALL_L112));
+        $wizard->error();
+        exit();
+    }
+
+    include_once '../mainfile.php';
+    include_once './include/makedata.php';
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+    include_once './class/cachemanager.php';
+    $cm = new cache_manager;
+
+    $language = check_language($language);
+    if ( file_exists('./language/'.$language.'/install2.php') ) {
+        include_once './language/'.$language.'/install2.php';
+    } elseif ( file_exists('./language/english/install2.php') ) {
+        include_once './language/english/install2.php';
+        $language = 'english';
+    } else {
+        echo 'no language file (install2.php).';
+        exit();
+    }
+
+    //$tables = array();
+    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.data.sql');
+
+    $result = $dbm->queryFromFile('./language/'.$language.'/'.XOOPS_DB_TYPE.'.lang.data.sql');
+
+    $group = make_groups($dbm);
+    $result = make_data($dbm, $cm, $adminname, $adminpass, $adminmail, $language, $group);
+
+    $wizard->assign('dbm_reports',$dbm->report());
+    $wizard->assign('cm_reports',$cm->report());
+
+    include_once './class/mainfilemanager.php';
+    $mm = new mainfile_manager('../mainfile.php');
+    foreach($group as $key => $val){
+        $mm->setRewrite($key, intval($val));
+    }
+    $result = $mm->doRewrite();
+    $wizard->assign('mm_reports',$mm->report());
+
+    setcookie('xoops_session', '', time() - 3600);
+    $wizard->render('install_insertData.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_langselect.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_langselect.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_langselect.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,15 @@
+<?php
+    if (!defined('_INSTALL_L128')) {
+        define('_INSTALL_L128', 'Choose language to be used for the installation process');
+    }
+    $langarr = getDirList('./language/');
+    foreach ($langarr as $lang) {
+        $wizard->addArray('languages', $lang);
+        if (strtolower($lang) == $language) {
+            $wizard->addArray('selected','selected="selected"');
+        } else {
+            $wizard->addArray('selected','');
+        }
+    }
+    $wizard->render('install_langselect.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_mainfile.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_mainfile.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_mainfile.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,30 @@
+<?php
+    // checking XOOPS_ROOT_PATH and XOOPS_URL
+    include_once '../mainfile.php';
+
+    $detected = str_replace('\\', '/', getcwd()); // "
+    $detected = str_replace('/install', "", $detected);
+    if ( substr($detected, -1) == '/' ) {
+        $detected = substr($detected, 0, -1);
+    }
+
+    if (empty($detected)){
+        $wizard->addArray('checks', _NGIMG._INSTALL_L95);
+    } elseif ( XOOPS_ROOT_PATH != $detected ) {
+        $wizard->addArray('checks', _NGIMG.sprintf(_INSTALL_L96,$detected));
+    } else {
+        $wizard->addArray('checks', _OKIMG._INSTALL_L97);
+    }
+
+    if(!is_dir(XOOPS_ROOT_PATH)){
+        $wizard->addArray('checks', _NGIMG._INSTALL_L99);
+    }
+
+    if(preg_match('/^http[s]?:\/\/(.*)[^\/]+$/i',XOOPS_URL)){
+        $wizard->addArray('checks', _OKIMG._INSTALL_L100);
+    }else{
+        $wizard->addArray('checks', _NGIMG._INSTALL_L101);
+    }
+
+    $wizard->render('install_mainfile.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_modcheck.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_modcheck.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_modcheck.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,33 @@
+<?php
+    $writeok = array('uploads/', 'cache/', 'templates_c/', 'mainfile.php');
+    $error = false;
+    foreach ($writeok as $wok) {
+        if (!is_dir('../'.$wok)) {
+            if ( file_exists('../'.$wok) ) {
+                @chmod('../'.$wok, 0666);
+                if (! is_writeable('../'.$wok)) {
+                    $wizard->addArray('checks',_NGIMG.sprintf(_INSTALL_L83, $wok));
+                    $error = true;
+                }else{
+                    $wizard->addArray('checks',_OKIMG.sprintf(_INSTALL_L84, $wok));
+                }
+            }
+        } else {
+            @chmod('../'.$wok, 0777);
+            if (! is_writeable('../'.$wok)) {
+                $wizard->addArray('checks',_NGIMG.sprintf(_INSTALL_L85, $wok));
+                $error = true;
+            }else{
+                $wizard->addArray('checks',_OKIMG.sprintf(_INSTALL_L86, $wok));
+            }
+        }
+    }
+
+    if(! $error) {
+        $wizard->assign('message',_INSTALL_L87);
+    }else{
+        $wizard->assign('message',_INSTALL_L46);
+        $wizard->setReload(true);
+    }
+    $wizard->render('install_modcheck.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_siteInit.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_siteInit.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_siteInit.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,4 @@
+<?php
+    include_once '../mainfile.php';
+    $wizard->render('install_siteInit.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_start.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_start.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_start.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    include './language/'.$language.'/welcome.php'; //This will set message to $content;
+    $wizard->assign('welcome', $content);
+    $wizard->render('install_start.tpl.php');
+?>
Index: xoops2jp/html/install/wizards/install_updateAvatars.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateAvatars.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateAvatars.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    $content = '<p>'._INSTALL_L151.'</p>';
+    $b_next = array('updateAvatars_go', _INSTALL_L139);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateAvatars_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,57 @@
+<?php
+    unset($xoopsOption['nocommon']);
+    include('../mainfile.php');
+    $content = '';
+    $title = _INSTALL_L156;
+    $avatars = getImageFileList(XOOPS_ROOT_PATH.'/images/avatar/users/');
+    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif'");
+    $avt_handler =& xoops_gethandler('avatar');
+    if (!defined('XOOPS_UPLOAD_PATH')) {
+        define('XOOPS_UPLOAD_PATH', '../uploads');
+    }
+    foreach ($avatars as $avatar_file) {
+        if (preg_match("/^([0-9]+)\.([a-zA-Z]+)$/", $avatar_file, $matched)) {
+            $user_id = intval($matched[1]);
+            if ($user_id > 0 && false != $fp = fopen('../images/avatar/users/'.$avatar_file, 'rb')) {
+                $binary = fread($fp, filesize('../images/avatar/users/'.$avatar_file));
+                fclose($fp);
+                $newavatar = uniqid('cavt').'.'.strtolower($matched[2]);
+                if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newavatar, 'wb')) {
+                    if (-1 != fwrite($fp, $binary)) {
+                        $error = false;
+                        if (!$xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='".$newavatar."' WHERE uid=".$user_id)) {
+                            $error = true;
+                        } else {
+                            $avatar =& $avt_handler->create();
+                            $avatar->setVar('avatar_file', $newavatar);
+                            $avatar->setVar('avatar_name', 'custom');
+                            $avatar->setVar('avatar_mimetype', '');
+                            $avatar->setVar('avatar_display', 1);
+                            $avatar->setVar('avatar_type', 'C');
+                            if(!$avt_handler->insert($avatar)) {
+                                $error = true;
+                            } else {
+                                $avt_handler->addUser($avatar->getVar('avatar_id'), $user['uid']);
+                            }
+                        }
+                        if (false != $error) {
+                            $content .= _NGIMG.sprintf(_INSTALL_L153, $avatar_file).'<br />';
+                            @unlink(XOOPS_UPLOAD_PATH.'/'.$newavatar);
+                        } else {
+                            $content .= _OKIMG.sprintf(_INSTALL_L154, $avatar_file).'<br />';
+                        }
+                    } else {
+                        $content .= _NGIMG.sprintf(_INSTALL_L153, $avatar_file).'<br />';
+                        $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE uid=".$user_id);
+                    }
+                    fclose($fp);
+                }
+            } else {
+                $content .= _NGIMG.sprintf(_INSTALL_L152, $avatar_file).'<br />';
+            }
+        }
+    }
+
+    $b_next = array('finish', _INSTALL_L14);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateComments.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateComments.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateComments.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    $content = "<p>"._INSTALL_L149."</p>\n";
+    $b_next = array('updateComments_go', _INSTALL_L138);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateComments_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateComments_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateComments_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,47 @@
+<?php
+    unset($xoopsOption['nocommon']);
+    include '../mainfile.php';
+    include '../class/xoopscomments.php';
+    include '../include/comment_constants.php';
+    $module_handler =& xoops_gethandler('module');
+    $old_commentd_mods = array('news' => 'comments', 'xoopspoll' => 'xoopspollcomments');
+    $title = _INSTALL_L147;
+    $content = '';
+    foreach ($old_commentd_mods as $module => $com_table) {
+        $moduleobj =& $module_handler->getByDirname($module);
+        if (is_object($moduleobj)) {
+            $content .= '<h5>'.$moduleobj->getVar('name').'</h5>';
+            $comment_handler =& xoops_gethandler('comment');
+            $criteria = new CriteriaCompo();
+            $criteria->setOrder('DESC');
+            $criteria->setSort('com_id');
+            $criteria->setLimit(1);
+            $last_comment =& $comment_handler->getObjects($criteria);
+            $offset = (is_array($last_comment) && count($last_comment) > 0) ? $last_comment[0]->getVar('com_id') : 0;
+            $xc = new XoopsComments($xoopsDB->prefix($com_table));
+            $top_comments =& $xc->getAllComments(array('pid=0'));
+
+            foreach ($top_comments as $tc) {
+                $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_ip, com_sig, com_itemid, com_rootid, com_status, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, '%s', '%s', '%s', %u, %u, %u, '%s', %u, %u, %u, %u, %u, %u, %u, %u, %u)", $xoopsDB->prefix('xoopscomments'), $tc->getVar('comment_id') + $offset, 0, $moduleobj->getVar('mid'), '', addslashes($tc->getVar('subject', 'n')), addslashes($tc->getVar('comment', 'n')), $tc->getVar('date'), $tc->getVar('date'), $tc->getVar('user_id'), $tc->getVar('ip'), 0, $tc->getVar('item_id'), $tc->getVar('comment_id') + $offset, XOOPS_COMMENT_ACTIVE, 0, 1, 1, 1, 1);
+
+                if (!$xoopsDB->query($sql)) {
+                    $content .= _NGIMG.sprintf(_INSTALL_L146, $tc->getVar('comment_id') + $offset).'<br />';
+                } else {
+                    $content .= _OKIMG.sprintf(_INSTALL_L145, $tc->getVar('comment_id') + $offset).'<br />';
+                    $child_comments = $tc->getCommentTree();
+                    foreach ($child_comments as $cc) {
+                        $sql = sprintf("INSERT INTO %s (com_id, com_pid, com_modid, com_icon, com_title, com_text, com_created, com_modified, com_uid, com_ip, com_sig, com_itemid, com_rootid, com_status, dohtml, dosmiley, doxcode, doimage, dobr) VALUES (%u, %u, %u, '%s', '%s', '%s', %u, %u, %u, '%s', %u, %u, %u, %u, %u, %u, %u, %u, %u)", $xoopsDB->prefix('xoopscomments'), $cc->getVar('comment_id') + $offset, $cc->getVar('pid') + $offset, $moduleobj->getVar('mid'), '', addslashes($cc->getVar('subject', 'n')), addslashes($cc->getVar('comment', 'n')), $cc->getVar('date'), $cc->getVar('date'), $cc->getVar('user_id'), $cc->getVar('ip'), 0, $cc->getVar('item_id'), $tc->getVar('comment_id') + $offset, XOOPS_COMMENT_ACTIVE, 0, 1, 1, 1, 1);
+                        if (!$xoopsDB->query($sql)) {
+                            $content .= _NGIMG.sprintf(_INSTALL_L146, $cc->getVar('comment_id') + $offset).'<br />';
+                        } else {
+                            $content .= _OKIMG.sprintf(_INSTALL_L145, $cc->getVar('comment_id') + $offset).'<br />';
+                        }
+                    }
+                }
+            }
+        }
+    }
+    $xoopsDB->query('ALTER TABLE '.$xoopsDB->prefix('xoopscomments').' CHANGE com_id com_id mediumint(8) unsigned NOT NULL auto_increment PRIMARY KEY');
+    $b_next = array('updateSmilies', _INSTALL_L14);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateConfig.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateConfig.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateConfig.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    $b_next = array('updateConfig_go', _INSTALL_L144);
+    $content = "<p>"._INSTALL_L143."</p>\n";
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateConfig_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateConfig_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateConfig_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,168 @@
+<?php
+    include_once "../mainfile.php";
+
+    $language = check_language($language);
+    if ( file_exists("./language/".$language."/install2.php") ) {
+        include_once "./language/".$language."/install2.php";
+    } elseif ( file_exists("./language/english/install2.php") ) {
+        include_once "./language/english/install2.php";
+        $language = 'english';
+    } else {
+        echo 'no language file (install2.php).';
+        exit();
+    }
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+
+    // default settings
+    $xoopsConfig['sitename'] = 'XOOPS Cube Site';
+    $xoopsConfig['slogan'] = 'Just use it!';
+    $xoopsConfig['adminmail'] = '';
+    $xoopsConfig['language'] = 'english';
+    $xoopsConfig['anonymous'] = 'Anonymous';
+    $xoopsConfig['minpass'] = 5;
+    $xoopsConfig['anonpost'] = 0;
+    $xoopsConfig['new_user_notify'] = 0;
+    $xoopsConfig['new_user_notify_group'] = 1;
+    $xoopsConfig['self_delete'] = 0;
+    $xoopsConfig['gzip_compression'] = 0;
+    $xoopsConfig['uname_test_level'] = 0;
+    $xoopsConfig['usercookie'] = "xoops_user";
+    $xoopsConfig['sessioncookie'] = "xoops_session";
+    $xoopsConfig['sessionexpire'] = 4500;
+    $xoopsConfig['server_TZ'] = 0;
+    $xoopsConfig['default_TZ'] = 0;
+    $xoopsConfig['banners'] = 1;
+    $xoopsConfig['com_mode'] = "nest";
+    $xoopsConfig['com_order'] = 1;
+    $xoopsConfig['my_ip'] = "127.0.0.1";
+    $xoopsConfig['avatar_allow_upload'] = 0;
+    $xoopsConfig['avatar_width'] = 120;
+    $xoopsConfig['avatar_height'] = 120;
+    $xoopsConfig['avatar_maxsize'] = 15000;
+
+    // override deafault with 1.3.x settings if any
+    if (file_exists('../modules/system/cache/config.php')) {
+        include_once('../modules/system/cache/config.php');
+    }
+
+    $dbm->insert('config', " VALUES (1, 0, 1, 'sitename', '_MD_AM_SITENAME', '".addslashes($xoopsConfig['sitename'])."', '_MD_AM_SITENAMEDSC', 'textbox', 'text', 0)");
+    $dbm->insert('config', " VALUES (2, 0, 1, 'slogan', '_MD_AM_SLOGAN', '".addslashes($xoopsConfig['slogan'])."', '_MD_AM_SLOGANDSC', 'textbox', 'text', 2)");
+    $dbm->insert('config', " VALUES (3, 0, 1, 'language', '_MD_AM_LANGUAGE', '".$xoopsConfig['language']."', '_MD_AM_LANGUAGEDSC', 'language', 'other', 4)");
+    $dbm->insert('config', " VALUES (4, 0, 1, 'startpage', '_MD_AM_STARTPAGE', '--', '_MD_AM_STARTPAGEDSC', 'startpage', 'other', 6)");
+    $dbm->insert('config', " VALUES (5, 0, 1, 'server_TZ', '_MD_AM_SERVERTZ', '".addslashes($xoopsConfig['server_TZ'])."', '_MD_AM_SERVERTZDSC', 'timezone', 'float', 8)");
+    $dbm->insert('config', " VALUES (6, 0, 1, 'default_TZ', '_MD_AM_DEFAULTTZ', '".addslashes($xoopsConfig['default_TZ'])."', '_MD_AM_DEFAULTTZDSC', 'timezone', 'float', 10)");
+    $dbm->insert('config', " VALUES (7, 0, 1, 'theme_set', '_MD_AM_DTHEME', 'default', '_MD_AM_DTHEMEDSC', 'theme', 'other', 12)");
+    $dbm->insert('config', " VALUES (8, 0, 1, 'anonymous', '_MD_AM_ANONNAME', '".addslashes($xoopsConfig['anonymous'])."', '_MD_AM_ANONNAMEDSC', 'textbox', 'text', 15)");
+    $dbm->insert('config', " VALUES (9, 0, 1, 'gzip_compression', '_MD_AM_USEGZIP', '".intval($xoopsConfig['gzip_compression'])."', '_MD_AM_USEGZIPDSC', 'yesno', 'int', 16)");
+    $dbm->insert('config', " VALUES (10, 0, 1, 'usercookie', '_MD_AM_USERCOOKIE', '".addslashes($xoopsConfig['usercookie'])."', '_MD_AM_USERCOOKIEDSC', 'textbox', 'text', 18)");
+    $dbm->insert('config', " VALUES (11, 0, 1, 'session_expire', '_MD_AM_SESSEXPIRE', '15', '_MD_AM_SESSEXPIREDSC', 'textbox', 'int', 22)");
+    $dbm->insert('config', " VALUES (12, 0, 1, 'banners', '_MD_AM_BANNERS', '".intval($xoopsConfig['banners'])."', '_MD_AM_BANNERSDSC', 'yesno', 'int', 26)");
+    $dbm->insert('config', " VALUES (13, 0, 1, 'debug_mode', '_MD_AM_DEBUGMODE', '1', '_MD_AM_DEBUGMODEDSC', 'select', 'int', 24)");
+    $dbm->insert('config', " VALUES (14, 0, 1, 'my_ip', '_MD_AM_MYIP', '".addslashes($xoopsConfig['my_ip'])."', '_MD_AM_MYIPDSC', 'textbox', 'text', 29)");
+    $dbm->insert('config', " VALUES (15, 0, 1, 'use_ssl', '_MD_AM_USESSL', '0', '_MD_AM_USESSLDSC', 'yesno', 'int', 30)");
+    $dbm->insert('config', " VALUES (16, 0, 1, 'session_name', '_MD_AM_SESSNAME', 'xoops_session', '_MD_AM_SESSNAMEDSC', 'textbox', 'text', 20)");
+    $dbm->insert('config', " VALUES (17, 0, 2, 'minpass', '_MD_AM_MINPASS', '".intval($xoopsConfig['minpass'])."', '_MD_AM_MINPASSDSC', 'textbox', 'int', 1)");
+    $dbm->insert('config', " VALUES (18, 0, 2, 'minuname', '_MD_AM_MINUNAME', '5', '_MD_AM_MINUNAMEDSC', 'textbox', 'int', 2)");
+    $dbm->insert('config', " VALUES (19, 0, 2, 'new_user_notify', '_MD_AM_NEWUNOTIFY', '".intval($xoopsConfig['new_user_notify'])."', '_MD_AM_NEWUNOTIFYDSC', 'yesno', 'int', 4)");
+    $dbm->insert('config', " VALUES (20, 0, 2, 'new_user_notify_group', '_MD_AM_NOTIFYTO', ".intval($xoopsConfig['new_user_notify_group']).", '_MD_AM_NOTIFYTODSC', 'group', 'int', 6)");
+    $dbm->insert('config', " VALUES (21, 0, 2, 'activation_type', '_MD_AM_ACTVTYPE', '0', '_MD_AM_ACTVTYPEDSC', 'select', 'int', 8)");
+    $dbm->insert('config', " VALUES (22, 0, 2, 'activation_group', '_MD_AM_ACTVGROUP', ".XOOPS_GROUP_ADMIN.", '_MD_AM_ACTVGROUPDSC', 'group', 'int', 10)");
+    $dbm->insert('config', " VALUES (23, 0, 2, 'uname_test_level', '_MD_AM_UNAMELVL', '".intval($xoopsConfig['uname_test_level'])."', '_MD_AM_UNAMELVLDSC', 'select', 'int', 12)");
+    $dbm->insert('config', " VALUES (24, 0, 2, 'avatar_allow_upload', '_MD_AM_AVATARALLOW', '".intval($xoopsConfig['avatar_allow_upload'])."', '_MD_AM_AVATARALWDSC', 'yesno', 'int', 14)");
+    $dbm->insert('config', " VALUES (27, 0, 2, 'avatar_width', '_MD_AM_AVATARW', '".intval($xoopsConfig['avatar_width'])."', '_MD_AM_AVATARWDSC', 'textbox', 'int', 16)");
+    $dbm->insert('config', " VALUES (28, 0, 2, 'avatar_height', '_MD_AM_AVATARH', '".intval($xoopsConfig['avatar_height'])."', '_MD_AM_AVATARHDSC', 'textbox', 'int', 18)");
+    $dbm->insert('config', " VALUES (29, 0, 2, 'avatar_maxsize', '_MD_AM_AVATARMAX', '".intval($xoopsConfig['avatar_maxsize'])."', '_MD_AM_AVATARMAXDSC', 'textbox', 'int', 20)");
+    $dbm->insert('config', " VALUES (30, 0, 1, 'adminmail', '_MD_AM_ADMINML', '".addslashes($xoopsConfig['adminmail'])."', '_MD_AM_ADMINMLDSC', 'textbox', 'text', 3)");
+    $dbm->insert('config', " VALUES (31, 0, 2, 'self_delete', '_MD_AM_SELFDELETE', '".intval($xoopsConfig['self_delete'])."', '_MD_AM_SELFDELETEDSC', 'yesno', 'int', 22)");
+    $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', '".addslashes($xoopsConfig['com_mode'])."', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
+    $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '".intval($xoopsConfig['com_order'])."', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
+    $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
+    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
+    $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
+    $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
+    $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
+    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+    $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
+    $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
+    $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
+    $dbm->insert('config', " VALUES (43, 0, 3, 'meta_robots', '_MD_AM_METAROBOTS', 'index,follow', '_MD_AM_METAROBOTSDSC', 'select', 'text', 2)");
+    $dbm->insert('config', " VALUES (44, 0, 5, 'enable_search', '_MD_AM_DOSEARCH', '1', '_MD_AM_DOSEARCHDSC', 'yesno', 'int', 0)");
+    $dbm->insert('config', " VALUES (45, 0, 5, 'keyword_min', '_MD_AM_MINSEARCH', '5', '_MD_AM_MINSEARCHDSC', 'textbox', 'int', 1)");
+    $dbm->insert('config', " VALUES (46, 0, 2, 'avatar_minposts', '_MD_AM_AVATARMP', '0', '_MD_AM_AVATARMPDSC', 'textbox', 'int', 15)");
+    $dbm->insert('config', " VALUES (47, 0, 1, 'enable_badips', '_MD_AM_DOBADIPS', '0', '_MD_AM_DOBADIPSDSC', 'yesno', 'int', 40)");
+    $dbm->insert('config', " VALUES (48, 0, 3, 'meta_rating', '_MD_AM_METARATING', 'general', '_MD_AM_METARATINGDSC', 'select', 'text', 4)");
+    $dbm->insert('config', " VALUES (49, 0, 3, 'meta_author', '_MD_AM_METAAUTHOR', 'XOOPS', '_MD_AM_METAAUTHORDSC', 'textbox', 'text', 6)");
+    $dbm->insert('config', " VALUES (50, 0, 3, 'meta_copyright', '_MD_AM_METACOPYR', 'Copyright &copy; 2001-2003', '_MD_AM_METACOPYRDSC', 'textbox', 'text', 8)");
+    $dbm->insert('config', " VALUES (51, 0, 3, 'meta_description', '_MD_AM_METADESC', 'XOOPS is a dynamic Object Oriented based open source portal script written in PHP.', '_MD_AM_METADESCDSC', 'textarea', 'text', 1)");
+    $dbm->insert('config', " VALUES (52, 0, 2, 'allow_chgmail', '_MD_AM_ALLWCHGMAIL', '0', '_MD_AM_ALLWCHGMAILDSC', 'yesno', 'int', 3)");
+    $dbm->insert('config', " VALUES (53, 0, 1, 'use_mysession', '_MD_AM_USEMYSESS', '0', '_MD_AM_USEMYSESSDSC', 'yesno', 'int', 19)");
+    $dbm->insert('config', " VALUES (54, 0, 2, 'reg_dispdsclmr', '_MD_AM_DSPDSCLMR', 1, '_MD_AM_DSPDSCLMRDSC', 'yesno', 'int', 30)");
+    $dbm->insert('config', " VALUES (55, 0, 2, 'reg_disclaimer', '_MD_AM_REGDSCLMR', '".addslashes(_INSTALL_DISCLMR)."', '_MD_AM_REGDSCLMRDSC', 'textarea', 'text', 32)");
+    $dbm->insert('config', " VALUES (56, 0, 2, 'allow_register', '_MD_AM_ALLOWREG', 1, '_MD_AM_ALLOWREGDSC', 'yesno', 'int', 0)");
+    $dbm->insert('config', " VALUES (57, 0, 1, 'theme_fromfile', '_MD_AM_THEMEFILE', '0', '_MD_AM_THEMEFILEDSC', 'yesno', 'int', 13)");
+    $dbm->insert('config', " VALUES (58, 0, 1, 'closesite', '_MD_AM_CLOSESITE', '0', '_MD_AM_CLOSESITEDSC', 'yesno', 'int', 26)");
+    $dbm->insert('config', " VALUES (59, 0, 1, 'closesite_okgrp', '_MD_AM_CLOSESITEOK', '".addslashes(serialize(array('1')))."', '_MD_AM_CLOSESITEOKDSC', 'group_multi', 'array', 27)");
+    $dbm->insert('config', " VALUES (60, 0, 1, 'closesite_text', '_MD_AM_CLOSESITETXT', '"._INSTALL_L165."', '_MD_AM_CLOSESITETXTDSC', 'textarea', 'text', 28)");
+    $dbm->insert('config', " VALUES (61, 0, 1, 'sslpost_name', '_MD_AM_SSLPOST', 'xoops_ssl', '_MD_AM_SSLPOSTDSC', 'textbox', 'text', 31)");
+    $dbm->insert('config', " VALUES (62, 0, 1, 'module_cache', '_MD_AM_MODCACHE', '', '_MD_AM_MODCACHEDSC', 'module_cache', 'array', 50)");
+    $dbm->insert('config', " VALUES (63, 0, 1, 'template_set', '_MD_AM_DTPLSET', 'default', '_MD_AM_DTPLSETDSC', 'tplset', 'other', 14)");
+    $dbm->insert('config', " VALUES (64,0,6,'mailmethod','_MD_AM_MAILERMETHOD','mail','_MD_AM_MAILERMETHODDESC','select','text',4)");
+    $dbm->insert('config', " VALUES (65,0,6,'smtphost','_MD_AM_SMTPHOST','a:1:{i:0;s:0:\"\";}', '_MD_AM_SMTPHOSTDESC','textarea','array',6)");
+    $dbm->insert('config', " VALUES (66,0,6,'smtpuser','_MD_AM_SMTPUSER','','_MD_AM_SMTPUSERDESC','textbox','text',7)");
+    $dbm->insert('config', " VALUES (67,0,6,'smtppass','_MD_AM_SMTPPASS','','_MD_AM_SMTPPASSDESC','password','text',8)");
+    $dbm->insert('config', " VALUES (68,0,6,'sendmailpath','_MD_AM_SENDMAILPATH','/usr/sbin/sendmail','_MD_AM_SENDMAILPATHDESC','textbox','text',5)");
+    $dbm->insert('config', " VALUES (69,0,6,'from','_MD_AM_MAILFROM','','_MD_AM_MAILFROMDESC','textbox','text',1)");
+    $dbm->insert('config', " VALUES (70,0,6,'fromname','_MD_AM_MAILFROMNAME','','_MD_AM_MAILFROMNAMEDESC','textbox','text',2)");
+    $dbm->insert('config', " VALUES (71, 0, 1, 'sslloginlink', '_MD_AM_SSLLINK', 'https://', '_MD_AM_SSLLINKDSC', 'textbox', 'text', 33)");
+    $dbm->insert('config', " VALUES (72, 0, 1, 'theme_set_allowed', '_MD_AM_THEMEOK', '".serialize(array('default'))."', '_MD_AM_THEMEOKDSC', 'theme_multi', 'array', 13)");
+    $dbm->insert('config', " VALUES (73,0,6,'fromuid','_MD_AM_MAILFROMUID','1','_MD_AM_MAILFROMUIDDESC','user','int',3)");
+
+
+    // default the default theme
+
+    $time = time();
+    $dbm->insert('tplset', " VALUES (1, 'default', 'XOOPS Default Theme', '', ".$time.")");
+
+//  include_once './class/cachemanager.php';
+//    $cm = new cache_manager;
+//  $skinfiles = array('1' => 'skin.html', '2' => 'style.css'
+//                        , '3' => 'styleNN.css','4' =>  'styleMAC.css'
+//                        , '5' => 'skin_blockleft.html', '6' => 'skin_blockright.html'
+//                        , '7' => 'skin_blockcenter_l.html', '8' => 'skin_blockcenter_c.html'
+//                        , '9' => 'skin_blockcenter_r.html');
+//    foreach ($skinfiles as $key => $skinfile) {
+//        if(preg_match('/\.css$/', $skinfile)) {
+//            $type = 'css';
+//        }else{
+//            $type = 'skin';
+//        }
+//        $dbm->insert('tplfile', " VALUES ($key, 0, '', 'default', '$skinfile', '', $time, $time, '$type')");
+
+//        $fp = fopen('./templates/default_skin/'.$skinfile, 'r');
+//        $skinsource = fread($fp, filesize('./templates/default_skin/'.$skinfile));
+//        fclose($fp);
+//        $dbm->insert('tplsource', " (tpl_id, tpl_source) VALUES ($key, '".addslashes($skinsource)."')");
+//        if(preg_match('/\.css$/',$skinfile)) {
+//            $cm->write($skinfile, $skinsource);
+//        }
+//    }
+
+        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, block_id FROM ".$dbm->prefix('groups_blocks_link'));
+        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'block_read'");
+        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, mid FROM ".$dbm->prefix('groups_modules_link') ." WHERE type='A'");
+        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'module_admin' WHERE gperm_name = ''");
+        $dbm->query("INSERT INTO ".$dbm->prefix('group_permission')." (gperm_groupid, gperm_itemid) SELECT groupid, mid FROM ".$dbm->prefix('groups_modules_link')." WHERE type='R'");
+        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_name = 'module_read' WHERE gperm_name = ''");
+        $dbm->query("UPDATE ".$dbm->prefix('group_permission')." SET gperm_modid = 1");
+        $dbm->query('DROP TABLE '.$dbm->prefix('groups_blocks_link'));
+        $dbm->query('DROP TABLE '.$dbm->prefix('groups_modules_link'));
+
+    // insert some more data
+    $result = $dbm->queryFromFile('./sql/'.XOOPS_DB_TYPE.'.data.sql');
+
+    $content = $dbm->report();
+    //$content .= $cm->report();
+    $b_next = array('updateModules', _INSTALL_L14);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateModules.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateModules.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateModules.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    $b_next = array('updateModules_go', _INSTALL_L137);
+    $content = "<p>"._INSTALL_L141."</p>\n";
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateModules_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateModules_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateModules_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,248 @@
+<?php
+    unset($xoopsOption['nocommon']);
+    include_once "../mainfile.php";
+    error_reporting(E_ERROR);
+    ob_start();
+    $module_handler =& xoops_gethandler('module');
+    $modules =& $module_handler->getObjects(null, true);
+    foreach (array_keys($modules) as $mid) {
+        echo '<h5>'.$modules[$mid]->getVar('name').'</h5>';
+        $dirname = $modules[$mid]->getVar('dirname');
+        if (is_dir(XOOPS_ROOT_PATH.'/modules/'.$dirname)) {
+            $modules[$mid]->loadInfoAsVar($dirname, false);
+            if (!$module_handler->insert($modules[$mid])) {
+                echo '<p>Could not update '.$modules[$mid]->getVar('name').'</p>';
+            } else {
+                $newmid = $modules[$mid]->getVar('mid');
+                $msgs = array();
+                $msgs[] = 'Module data updated.';
+                $tplfile_handler =& xoops_gethandler('tplfile');
+                $templates = $modules[$mid]->getInfo('templates');
+                if ($templates != false) {
+                    $msgs[] = 'Generating templates...';
+                    foreach ($templates as $tpl) {
+                        $tpl['file'] = trim($tpl['file']);
+                        $tpldata =& xoops_module_gettemplate($dirname, $tpl['file']);
+                        $tplfile =& $tplfile_handler->create();
+                        $tplfile->setVar('tpl_refid', $newmid);
+                        $tplfile->setVar('tpl_lastimported', 0);
+                        $tplfile->setVar('tpl_lastmodified', time());
+                        if (preg_match("/\.css$/i", $tpl['file'])) {
+                            $tplfile->setVar('tpl_type', 'css');
+                        } else {
+                            $tplfile->setVar('tpl_type', 'module');
+                            //if ($xoopsConfig['default_theme'] == 'default') {
+                            //  include_once XOOPS_ROOT_PATH.'/class/template.php';
+                            //  xoops_template_touch($tplfile->getVar('tpl_id'));
+                            //}
+                        }
+                        $tplfile->setVar('tpl_source', $tpldata, true);
+                        $tplfile->setVar('tpl_module', $dirname);
+                        $tplfile->setVar('tpl_tplset', 'default');
+                        $tplfile->setVar('tpl_file', $tpl['file'], true);
+                        $tplfile->setVar('tpl_desc', $tpl['description'], true);
+                        if (!$tplfile_handler->insert($tplfile)) {
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$tpl['file'].'</b> to the database.</span>';
+                        } else {
+                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$tpl['file'].'</b> inserted to the database.';
+                        }
+                        unset($tpldata);
+                    }
+                }
+                $blocks = $modules[$mid]->getInfo('blocks');
+                $msgs[] = 'Rebuilding blocks...';
+                $showfuncs = array();
+                $funcfiles = array();
+                if ($blocks != false) {
+                    $count = count($blocks);
+                    include_once(XOOPS_ROOT_PATH.'/class/xoopsblock.php');
+                    for ( $i = 1; $i <= $count; $i++ ) {
+                        if (isset($blocks[$i]['show_func']) && $blocks[$i]['show_func'] != '' && isset($blocks[$i]['file']) && $blocks[$i]['file'] != '') {
+                            $editfunc = isset($blocks[$i]['edit_func']) ? $blocks[$i]['edit_func'] : '';
+                            $showfuncs[] = $blocks[$i]['show_func'];
+                            $funcfiles[] = $blocks[$i]['file'];
+                            $template = '';
+                            if ((isset($blocks[$i]['template']) && trim($blocks[$i]['template']) != '')) {
+                                $content =& xoops_module_gettemplate($dirname, $blocks[$i]['template'], true);
+                                $template = $blocks[$i]['template'];
+                            }
+                            if (!$content) {
+                                $content = '';
+                            }
+                            $options = '';
+                            if (isset($blocks[$i]['options']) && $blocks[$i]['options'] != '') {
+                                $options = $blocks[$i]['options'];
+                            }
+                            $sql = "SELECT bid, name FROM ".$xoopsDB->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i;
+                            $fresult = $xoopsDB->query($sql);
+                            $fcount = 0;
+                            while ($fblock = $xoopsDB->fetchArray($fresult)) {
+                                $fcount++;
+                                $sql = "UPDATE ".$xoopsDB->prefix("newblocks")." SET name='".addslashes($blocks[$i]['name'])."', title='".addslashes($blocks[$i]['name'])."', dirname='".addslashes($dirname)."',  func_file='".addslashes($blocks[$i]['file'])."', show_func='".addslashes($blocks[$i]['show_func'])."', template='".addslashes($template)."', edit_func='".addslashes($editfunc)."', options='".addslashes($options)."', content='', template='".$template."', last_modified=".time()." WHERE bid=".$fblock['bid'];
+                                $result = $xoopsDB->query($sql);
+                                if (!$result) {
+                                    $msgs[] = '&nbsp;&nbsp;ERROR: Could not update '.$fblock['name'];
+                                } else {
+                                    $msgs[] = '&nbsp;&nbsp;Block <b>'.$fblock['name'].'</b> updated. Block ID: <b>'.$fblock['bid'].'</b>';
+                                    if ($template != '') {
+                                        $tplfile =& $tplfile_handler->create();
+                                        $tplfile->setVar('tpl_refid', $fblock['bid']);
+                                        $tplfile->setVar('tpl_source', $content, true);
+                                        $tplfile->setVar('tpl_tplset', 'default');
+                                        $tplfile->setVar('tpl_file', $blocks[$i]['template']);
+                                        $tplfile->setVar('tpl_module', $dirname);
+                                        $tplfile->setVar('tpl_type', 'block');
+                                        $tplfile->setVar('tpl_desc', $blocks[$i]['description'], true);
+                                        $tplfile->setVar('tpl_lastimported', 0);
+                                        $tplfile->setVar('tpl_lastmodified', time());
+                                        if (!$tplfile_handler->insert($tplfile)) {
+                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$blocks[$i]['template'].'</b> to the database.</span>';
+                                        } else {
+                                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> inserted to the database.';
+                                            //if ($xoopsConfig['default_theme'] == 'default') {
+                                            //  if (!xoops_template_touch($tplfile[0]->getVar('tpl_id'))) {
+                                            //      $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not recompile template <b>'.$blocks[$i]['template'].'</b>.</span>';
+                                            //  } else {
+                                            //      $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> recompiled.';
+                                            //  }
+                                            //}
+                                        }
+                                    }
+                                }
+                            }
+                            if ($fcount == 0) {
+                                $newbid = $xoopsDB->genId($xoopsDB->prefix('newblocks').'_bid_seq');
+                                $block_name = addslashes($blocks[$i]['name']);
+                                $sql = "INSERT INTO ".$xoopsDB->prefix("newblocks")." (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, isactive, dirname, func_file, show_func, edit_func, template, last_modified) VALUES (".$newbid.", ".$mid.", ".$i.",'".addslashes($options)."','".$block_name."', '".$block_name."', '', 0, 0, 0, 'M', 1, '".addslashes($dirname)."', '".addslashes($blocks[$i]['file'])."', '".addslashes($blocks[$i]['show_func'])."', '".addslashes($editfunc)."', '".$template."', ".time().")";
+                                $result = $xoopsDB->query($sql);
+                                if (!$result) {
+                                    $msgs[] = '&nbsp;&nbsp;ERROR: Could not create '.$blocks[$i]['name'];
+                                } else {
+                                    if (empty($newbid)) {
+                                        $newbid = $xoopsDB->getInsertId();
+                                    }
+                                    if ($template != '') {
+                                        $tplfile =& $tplfile_handler->create();
+                                        $tplfile->setVar('tpl_module', $dirname);
+                                        $tplfile->setVar('tpl_refid', $newbid);
+                                        $tplfile->setVar('tpl_source', $content, true);
+                                        $tplfile->setVar('tpl_tplset', 'default');
+                                        $tplfile->setVar('tpl_file', $blocks[$i]['template'], true);
+                                        $tplfile->setVar('tpl_type', 'block');
+                                        $tplfile->setVar('tpl_lastimported', 0);
+                                        $tplfile->setVar('tpl_lastmodified', time());
+                                        $tplfile->setVar('tpl_desc', $blocks[$i]['description'], true);
+                                        if (!$tplfile_handler->insert($tplfile)) {
+                                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert template <b>'.$blocks[$i]['template'].'</b> to the database.</span>';
+                                        } else {
+                                            $msgs[] = '&nbsp;&nbsp;Template <b>'.$blocks[$i]['template'].'</b> inserted to the database.';
+                                        }
+                                    }
+                                    $msgs[] = '&nbsp;&nbsp;Block <b>'.$blocks[$i]['name'].'</b> created. Block ID: <b>'.$newbid.'</b>';
+                                }
+                            }
+                        }
+                    }
+                }
+                $block_arr = XoopsBlock::getByModule($mid);
+                foreach ($block_arr as $block) {
+                    if (!in_array($block->getVar('show_func'), $showfuncs) || !in_array($block->getVar('func_file'), $funcfiles)) {
+                        $sql = sprintf("DELETE FROM %s WHERE bid = %u", $xoopsDB->prefix('newblocks'), $block->getVar('bid'));
+                        if(!$xoopsDB->query($sql)) {
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not delete block <b>'.$block->getVar('name').'</b>. Block ID: <b>'.$block->getVar('bid').'</b></span>';
+                        } else {
+                            $msgs[] = '&nbsp;&nbsp;Block <b>'.$block->getVar('name').' deleted. Block ID: <b>'.$block->getVar('bid').'</b>';
+                        }
+                    }
+                }
+
+                $configs = $modules[$mid]->getInfo('config');
+                if ($configs != false) {
+                    if ($modules[$mid]->getVar('hascomments') != 0) {
+                        include_once(XOOPS_ROOT_PATH.'/include/comment_constants.php');
+                        array_push($configs, array('name' => 'com_rule', 'title' => '_CM_COMRULES', 'description' => '', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 1, 'options' => array('_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN)));
+                        array_push($configs, array('name' => 'com_anonpost', 'title' => '_CM_COMANONPOST', 'description' => '', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0));
+                    }
+                } else {
+                    if ($modules[$mid]->getVar('hascomments') != 0) {
+                        $configs = array();
+                        include_once(XOOPS_ROOT_PATH.'/include/comment_constants.php');
+                        $configs[] = array('name' => 'com_rule', 'title' => '_CM_COMRULES', 'description' => '', 'formtype' => 'select', 'valuetype' => 'int', 'default' => 1, 'options' => array('_CM_COMAPPROVEALL' => XOOPS_COMMENT_APPROVEALL, '_CM_COMAPPROVEUSER' => XOOPS_COMMENT_APPROVEUSER, '_CM_COMAPPROVEADMIN' => XOOPS_COMMENT_APPROVEADMIN));
+                        array_push($configs, array('name' => 'com_anonpost', 'title' => '_CM_COMANONPOST', 'description' => '', 'formtype' => 'yesno', 'valuetype' => 'int', 'default' => 0));
+                    }
+                }
+                // RMV-NOTIFY
+                if ($modules[$mid]->getVar('hasnotification') != 0) {
+                    if (empty($configs)) {
+                        $configs = array();
+                    }
+                    include_once(XOOPS_ROOT_PATH.'/include/notification_constants.php');
+                    $configs[] = array ('name' => 'notification_enabled', 'title' => '_NOT_CONFIG_ENABLED', 'description' => '_NOT_CONFIG_ENABLEDDSC', 'formtype' => 'select', 'valuetype' => 'int', 'default' => XOOPS_NOTIFICATION_ENABLEBOTH, 'options' => $options);
+                }
+
+                if ($configs != false) {
+                    $msgs[] = 'Adding module config data...';
+                    $config_handler =& xoops_gethandler('config');
+                    $order = 0;
+                    foreach ($configs as $config) {
+                        $confobj =& $config_handler->createConfig();
+                        $confobj->setVar('conf_modid', $newmid);
+                        $confobj->setVar('conf_catid', 0);
+                        $confobj->setVar('conf_name', $config['name']);
+                        $confobj->setVar('conf_title', $config['title'], true);
+                        $confobj->setVar('conf_desc', $config['description'], true);
+                        $confobj->setVar('conf_formtype', $config['formtype']);
+                        $confobj->setVar('conf_valuetype', $config['valuetype']);
+                        $confobj->setVar('conf_value', $config['default'], true);
+                        $confobj->setVar('conf_order', $order);
+                        $confop_msgs = '';
+                        if (isset($config['options']) && is_array($config['options'])) {
+                            foreach ($config['options'] as $key => $value) {
+                                $confop =& $config_handler->createConfigOption();
+                                $confop->setVar('confop_name', $key, true);
+                                $confop->setVar('confop_value', $value, true);
+                                $confobj->setConfOptions($confop);
+                                $confop_msgs .= '<br />&nbsp;&nbsp;&nbsp;&nbsp;Config option added. Name: <b>'.$key.'</b> Value: <b>'.$value.'</b>';
+                                unset($confop);
+                            }
+                        }
+                        $order++;
+                        if ($config_handler->insertConfig($confobj) != false) {
+                            $msgs[] = '&nbsp;&nbsp;Config <b>'.$config['name'].'</b> added to the database.'.$confop_msgs;
+                        } else {
+                            $msgs[] = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert config <b>'.$config['name'].'</b> to the database.</span>';
+                        }
+                        unset($confobj);
+                    }
+                    unset($configs);
+                }
+                foreach ($msgs as $msg) {
+                    echo '<code>'.$msg.'</code><br />';
+                }
+            }
+            // data for table 'block_module_link'
+            include_once './class/dbmanager.php';
+            $dbm = new db_manager;
+            $sql = 'SELECT bid, side FROM '.$dbm->prefix('newblocks');
+            $result = $dbm->query($sql);
+
+            while ($myrow = $dbm->fetchArray($result)) {
+                if ($myrow['side'] == 0) {
+                    $dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", 0)");
+                } else {
+                    $dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", -1)");
+                }
+            }
+        }
+        echo '<br />';
+        flush();
+        sleep(1);
+    }
+    $title = _INSTALL_L142;
+    $content = "<table width='80%' align='center'><tr><td align='left'>\n";
+    $content .= ob_get_contents();
+    $content .= "</td></tr></table>\n";
+    ob_end_clean();
+    $b_next = array('updateComments', _INSTALL_L14);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateSmilies.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateSmilies.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateSmilies.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,5 @@
+<?php
+    $content = '<p>'._INSTALL_L150.'</p>';
+    $b_next = array('updateSmilies_go', _INSTALL_L140);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateSmilies_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,55 @@
+<?php
+    unset($xoopsOption['nocommon']);
+    include('../mainfile.php');
+    $result = $xoopsDB->query("SELECT * FROM ".$xoopsDB->prefix('smiles'));
+    $content = '';
+    $title = _INSTALL_L155;
+    if (!defined('XOOPS_UPLOAD_PATH')) {
+        define('XOOPS_UPLOAD_PATH', '../uploads');
+    }
+    while ($smiley = $xoopsDB->fetchArray($result)) {
+        if (file_exists('../images/smilies/'.$smiley['smile_url']) && false != $fp = fopen('../images/smilies/'.$smiley['smile_url'], 'rb')) {
+            $binary = fread($fp, filesize('../images/smilies/'.$smiley['smile_url']));
+            fclose($fp);
+            if (!preg_match("/\.([a-zA-Z0-9]+)$/", $smiley['smile_url'], $matched)) {
+                continue;
+            }
+            $newsmiley = uniqid('smil').'.'.strtolower($matched[1]);
+            if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newsmiley, 'wb')) {
+                if (-1 != fwrite($fp, $binary)) {
+                    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('smiles')." SET smile_url='".$newsmiley."' WHERE id=".$smiley['id']);
+                    $content .= _OKIMG.sprintf(_INSTALL_L154, $smiley['smile_url']).'<br />';
+                } else {
+                    $content .= _NGIMG.sprintf(_INSTALL_L153, $smiley['smile_url']).'<br />';
+                }
+                fclose($fp);
+            }
+        } else {
+            $content .= _OKIMG.sprintf(_INSTALL_L152, $smiley['smile_url']).'<br />';
+        }
+    }
+    $result = $xoopsDB->query("SELECT * FROM ".$xoopsDB->prefix('ranks'));
+    while ($rank = $xoopsDB->fetchArray($result)) {
+        if (file_exists('../images/ranks/'.$rank['rank_image']) && false != $fp = fopen('../images/ranks/'.$rank['rank_image'], 'rb')) {
+            $binary = fread($fp, filesize('../images/ranks/'.$rank['rank_image']));
+            fclose($fp);
+            if (!preg_match("/\.([a-zA-Z0-9]+)$/", $rank['rank_image'], $matched)) {
+                continue;
+            }
+            $newrank = uniqid('rank').'.'.strtolower($matched[1]);
+            if (false != $fp = fopen(XOOPS_UPLOAD_PATH.'/'.$newrank, 'wb')) {
+                if (-1 != fwrite($fp, $binary)) {
+                    $content .= _OKIMG.sprintf(_INSTALL_L154, $rank['rank_image']).'<br />';
+                    $xoopsDB->query("UPDATE ".$xoopsDB->prefix('ranks')." SET rank_image='".$newrank."' WHERE rank_id=".$rank['rank_id']);
+                } else {
+                    $content .= _NGIMG.sprintf(_INSTALL_L153, $rank['rank_image']).'<br />';
+                }
+                fclose($fp);
+            }
+        } else {
+            $content .= _OKIMG.sprintf(_INSTALL_L152, $rank['rank_image']).'<br />';
+        }
+    }
+    $b_next = array('updateAvatars', _INSTALL_L14);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateTables.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateTables.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateTables.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,22 @@
+<?php
+    include_once "../mainfile.php";
+    include_once './class/dbmanager.php';
+    $db = new db_manager;
+    $sql = 'SELECT * FROM '.$db->prefix('groups');
+    $result = $db->query($sql);
+    $content = '<h5>'._INSTALL_L157.'</h5>';
+    $content .= '<table align="center" cellspacing="0" border="1"><tr><td>'._INSTALL_L158.'</td><td>'._INSTALL_L159.'</td><td>'._INSTALL_L160.'</td><td>'._INSTALL_L161.'</td></tr>';
+    while ($myrow = $db->fetchArray($result)) {
+        if ($myrow['type'] == 'Admin') {
+            $content .= '<tr><td>'.$myrow['name'].'</td><td><input type="radio" name="g_webmasters" value="'.$myrow['groupid'].'" /></td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        } elseif ($myrow['type'] == 'User') {
+            $content .= '<tr><td>'.$myrow['name'].'</td><td>&nbsp;</td><td><input type="radio" name="g_users" value="'.$myrow['groupid'].'" /></td><td>&nbsp;</td></tr>';
+        } else {
+            $content .= '<tr><td>'.$myrow['name'].'</td><td>&nbsp;</td><td>&nbsp;</td><td><input type="radio" name="g_anonymous" value="'.$myrow['groupid'].'" /></td></tr>';
+        }
+    }
+    $content .= '</table>';
+    $b_back = array();
+    $b_next = array('updateTables_go', _INSTALL_L132);
+    include 'install_tpl.php';
+?>
Index: xoops2jp/html/install/wizards/install_updateTables_go.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_updateTables_go.inc.php:1.1.2.1
--- /dev/null	Sat Apr  1 10:33:00 2006
+++ xoops2jp/html/install/wizards/install_updateTables_go.inc.php	Sat Apr  1 10:33:00 2006
@@ -0,0 +1,44 @@
+<?php
+    include_once "../mainfile.php";
+    $error = false;
+    $g_webmasters = isset($g_webmasters) ? intval($g_webmasters) : 0;
+    $g_users = isset($g_users) ? intval($g_users) : 0;
+    $g_anonymous = isset($g_anonymous) ? intval($g_anonymous) : 0;
+    if (empty($g_webmasters) || empty($g_users) || empty($g_anonymous)) {
+        $error = true;
+    } else {
+        include_once "./class/mainfilemanager.php";
+        $title = _INSTALL_L88;
+        $mm = new mainfile_manager("../mainfile.php");
+        $mm->setRewrite('XOOPS_GROUP_ADMIN', $g_webmasters);
+        $mm->setRewrite('XOOPS_GROUP_USERS', $g_users);
+        $mm->setRewrite('XOOPS_GROUP_ANONYMOUS', $g_anonymous);
+
+        $ret = $mm->doRewrite();
+        if(!$ret){
+            $content = _INSTALL_L60;
+            include 'install_tpl.php';
+            exit();
+        }
+    }
+    if (false != $error) {
+        $b_back = array();
+        $content = _INSTALL_L162;
+        include 'install_tpl.php';
+        break;
+    }
+    include_once './class/dbmanager.php';
+    $dbm = new db_manager;
+    if (!$dbm->query("ALTER TABLE ".$dbm->prefix("newblocks")." ADD dirname VARCHAR(50) NOT NULL, ADD func_file VARCHAR(50) NOT NULL, ADD show_func VARCHAR(50) NOT NULL, ADD edit_func VARCHAR(50) NOT NULL")) {
+    }
+    $result = $dbm->queryFromFile('./sql/upgrade/'.XOOPS_DB_TYPE.'.structure.sql');
+    $content = $dbm->report();
+    if (!$result) {
+        $content .= "<p>"._INSTALL_L135."</p>\n";
+        $b_back = array();
+    } else {
+        $content .= "<p>"._INSTALL_L136."</p>\n";
+        $b_next = array('updateConfig', _INSTALL_L14);
+    }
+    include 'install_tpl.php';
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:06:01 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:06:01 +0900
Subject: [xoops-cvslog 2612] CVS update: xoops2jp/html/class
Message-ID: <20060402130601.D0F452AC059@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ModuleController.class.php
diff -u xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.6 xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.7
--- xoops2jp/html/class/XCube_ModuleController.class.php:1.1.2.6	Wed Jan 11 12:34:39 2006
+++ xoops2jp/html/class/XCube_ModuleController.class.php	Sun Apr  2 22:06:01 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: XCube_ModuleController.class.php,v 1.1.2.6 2006/01/11 03:34:39 minahito Exp $
+// $Id: XCube_ModuleController.class.php,v 1.1.2.7 2006/04/02 13:06:01 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
@@ -65,7 +65,7 @@
 	 * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
 	 * @return bool
 	 */
-	function isPermission()
+	function hasPermission()
 	{
 		return false;
 	}

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:06:02 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:06:02 +0900
Subject: [xoops-cvslog 2613] CVS update: xoops2jp/html/kernel
Message-ID: <20060402130602.0B32C2AC0C2@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.6 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.7
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.6	Fri Feb  3 15:01:38 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Sun Apr  2 22:06:01 2006
@@ -238,7 +238,7 @@
 			if(!$this->mModuleController->isActive())
 				die('NOT ACTIVE');	///< @todo
 
-			if(!$this->mModuleController->isPermission())
+   			if(!$this->mModuleController->hasPermission())
 				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);	// TODO Depens on const message catalog.
 
 			$this->mModuleController->setupLanguage();

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:06:02 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:06:02 +0900
Subject: [xoops-cvslog 2614] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060402130602.382492AC0C9@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.12 xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.13
--- xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php:1.1.2.12	Tue Mar 28 22:29:21 2006
+++ xoops2jp/html/modules/base/class/Legacy_AdminModuleController.class.php	Sun Apr  2 22:06:02 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.12 2006/03/28 13:29:21 minahito Exp $
+// $Id: Legacy_AdminModuleController.class.php,v 1.1.2.13 2006/04/02 13:06:02 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -85,7 +85,7 @@
 	 * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
 	 * @return bool
 	 */
-	function isPermission()
+	function hasPermission()
 	{
 		$xoopsUser =& $this->mController->getXoopsUser();
 

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:06:02 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:06:02 +0900
Subject: [xoops-cvslog 2615] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060402130602.605B52AC0CA@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.4 xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.5
--- xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php:1.1.2.4	Tue Mar 28 22:30:15 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_ModuleController.class.php	Sun Apr  2 22:06:02 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: Legacy_ModuleController.class.php,v 1.1.2.4 2006/03/28 13:30:15 minahito Exp $
+// $Id: Legacy_ModuleController.class.php,v 1.1.2.5 2006/04/02 13:06:02 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPS Cube - PHP Content Management System                   //
 //                  Copyright (c) 2005 XOOPS Cube.org                        //
@@ -74,7 +74,7 @@
 	 * @todo This method re-writes $GLOBAL['xoopsUserIsAdmin']! Wmm...
 	 * @return bool
 	 */
-	function isPermission()
+	function hasPermission()
 	{
 		$xoopsUser =& $this->mController->mXoopsUser;
 		$xoopsModule=&$this->mModuleObject;

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:47 +0900
Subject: [xoops-cvslog 2616] CVS update: xoops2jp/html/class
Message-ID: <20060402130747.BDACD2AC059@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_Utils.class.php
diff -u xoops2jp/html/class/XCube_Utils.class.php:1.1.2.2 xoops2jp/html/class/XCube_Utils.class.php:1.1.2.3
--- xoops2jp/html/class/XCube_Utils.class.php:1.1.2.2	Tue Nov 15 21:42:56 2005
+++ xoops2jp/html/class/XCube_Utils.class.php	Sun Apr  2 22:07:47 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: XCube_Utils.class.php,v 1.1.2.2 2005/11/15 12:42:56 minahito Exp $
+// $Id: XCube_Utils.class.php,v 1.1.2.3 2006/04/02 13:07:47 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                  Copyright (c) 2000 XOOPSCube.org                         //
@@ -126,6 +126,28 @@
 
 		return str_replace($searches,$replaces,$subject);
 	}
+
+    function checkSystemModules() {
+        $root=&XCube_Root::getSingleton();
+        $systemModules = explode(',',$root->getSiteConfig('Cube','SystemModules'));
+        $moduleHandler =& xoops_gethandler('module');
+        $uninstalledModules = array();
+        $disabledModules = array();
+        foreach($systemModules as $systemModule) {
+            if(!empty($systemModule)) {
+                if(!($moduleObject =& $moduleHandler->getByDirname($systemModule))) {
+                    $uninstalledModules[] = $systemModule;
+                } else if(!$moduleObject->getVar('isactive')) {
+                    $disabledModules[] = $systemModule;
+                }
+            }
+        }
+        if ((count($uninstalledModules)==0)&&(count($disabledModules)==0)) {
+            return true;
+        } else {
+            return array('uninstalled' =>$uninstalledModules, 'disabled'=>$disabledModules);
+        }
+	}
 }
 
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:47 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:47 +0900
Subject: [xoops-cvslog 2617] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060402130747.E1BCE2AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/global.php
diff -u xoops2jp/html/modules/base/language/english/global.php:1.1.2.3 xoops2jp/html/modules/base/language/english/global.php:1.1.2.4
--- xoops2jp/html/modules/base/language/english/global.php:1.1.2.3	Thu Jan 12 14:49:12 2006
+++ xoops2jp/html/modules/base/language/english/global.php	Sun Apr  2 22:07:47 2006
@@ -1,7 +1,14 @@
 <?php
-// $Id: global.php,v 1.1.2.3 2006/01/12 05:49:12 minahito Exp $
+// $Id: global.php,v 1.1.2.4 2006/04/02 13:07:47 nobunobu Exp $
 
 define('_TOKEN_ERROR', 'CSRF was detected. Confirm carefully, then operate once again');
+define('_SYSTEM_MODULE_ERROR', 'Following System Modules are not installed.');
+define('_INSTALL','Install');
+define('_UNINSTALL','Uninstall');
+define('_SYS_MODULE_UNINSTALLED','Not Installed');
+define('_SYS_MODULE_DISABLED','Disabled');
+define('_SYS_OPTION_MODULES','Optional Modules');
+define('_UNINSTALL_CONFIRM','Are you sure to uninstall system module?');
 
 //%%%%%%	File Name mainfile.php 	%%%%%
 define("_PLEASEWAIT","Please Wait");

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:48 +0900
Subject: [xoops-cvslog 2618] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060402130748.10D0C2AC059@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/global.php
diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.3 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.4
--- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.3	Thu Jan 12 14:49:06 2006
+++ xoops2jp/html/modules/base/language/japanese/global.php	Sun Apr  2 22:07:47 2006
@@ -1,6 +1,13 @@
 <?php
 
 define('_TOKEN_ERROR', 'CSRFを検出しました。表示を確認し、もう一度操作を行って下さい');
+define('_SYSTEM_MODULE_ERROR', '以下の必須モジュールが導入されていません');
+define('_INSTALL','インストール');
+define('_UNINSTALL','削除');
+define('_SYS_MODULE_UNINSTALLED','未導入');
+define('_SYS_MODULE_DISABLED','無効');
+define('_SYS_OPTION_MODULES','選択導入可能');
+define('_UNINSTALL_CONFIRM','必須モジュールのアンインストールを行いますか？');
 
 //%%%%%%	File Name mainfile.php 	%%%%%
 define('_PLEASEWAIT','しばらくお待ちください');

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:48 +0900
Subject: [xoops-cvslog 2619] CVS update:
	xoops2jp/html/modules/base/preload/SiteClose
Message-ID: <20060402130748.3DFE62AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.5 xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.6
--- xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.5	Tue Mar 28 22:30:25 2006
+++ xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php	Sun Apr  2 22:07:48 2006
@@ -6,7 +6,7 @@
 {
 	function preBlockFilter()
 	{
-		if($this->mController->mConfig['closesite']==1) {
+        if(($this->mController->mConfig['closesite']==1)||is_array(XCube_Utils::checkSystemModules())) {
 			$this->mController->mRoot->mEventManager->add("Site.Login",new XCube_InstanceDelegate($this,"callbackSiteLogin"));
 			$this->mController->mRoot->mEventManager->add("Site.CheckLogin.Success",new XCube_InstanceDelegate($this,"callbackCheckLoginSuccess"));
 		}
@@ -27,6 +27,101 @@
 				}
 			}
 		}
+        // @todo Devide following lines to another preload file
+        if ($accessAllowFlag) {
+            $retArray = XCube_Utils::checkSystemModules();
+            if (is_array($retArray)) {
+               if (in_array(XOOPS_GROUP_ADMIN, $this->mController->mXoopsUser->getGroups())) {
+                    $GLOBALS['xoopsUser'] = $this->mController->mXoopsUser;
+                    if (!empty($_POST['cube_module_install'])) { //@todo use Ticket
+                        require_once XOOPS_BASE_PATH."/admin/class/ModuleInstaller.class.php";
+                        if (isset($_POST['uninstalled_modules']) && is_array($_POST['uninstalled_modules']) ){
+                            foreach($_POST['uninstalled_modules'] as $module) {
+                                $module = basename($module);
+                                if (in_array($module, $retArray['uninstalled'])) {
+                                    $installer = new Legacy_ModuleInstaller($module);
+                                    $installer->execute();
+                                }
+                            }
+                        }
+                        if (isset($_POST['disabled_modules']) &&is_array($_POST['disabled_modules'])){
+                            $moduleHandler =& xoops_gethandler('module');
+                            foreach($_POST['disabled_modules'] as $module) {
+                                $module = basename($module);
+                                if (in_array($module, $retArray['disabled'])) {
+                                    if($moduleObject =& $moduleHandler->getByDirname($module)) {
+                                        $moduleObject->setVar('isactive',1);
+                                        $moduleHandler->insert($moduleObject);
+                                    }
+                                }
+                            }
+                        }
+                        if (isset($_POST['option_modules']) && is_array($_POST['option_modules']) ){
+                            $handler =& xoops_getmodulehandler('non_installation_module','base');
+                            $objects = $handler->getObjects();
+                            $optionModules = array();
+                            foreach($objects as $module) {
+                                if (!in_array($module->getVar('dirname'), $retArray['uninstalled'])) {
+                                    $optionModules[] = $module->getVar('dirname');
+                                }
+                            }
+                            foreach($_POST['option_modules'] as $module) {
+                                $module = basename($module);
+                                if (in_array($module, $optionModules)) {
+                                    $installer = new Legacy_ModuleInstaller($module);
+                                    $installer->execute();
+                                }
+                            }
+                        }
+                        XCube_Utils::redirectHeader(XOOPS_URL,1);
+                    } else if (!empty($_GET['cube_module_uninstall'])) {
+                        require_once XOOPS_ROOT_PATH.'/class/template.php';
+                        $xoopsTpl = new XoopsTpl();
+                        $xoopsTpl->assign('cube_module_uninstall',htmlspecialchars($_GET['cube_module_uninstall'],ENT_QUOTES));
+                        $xoopsTpl->assign( array(
+                                       'xoops_sitename' => htmlspecialchars($this->mController->mConfig['sitename']),
+                                       'xoops_themecss' => xoops_getcss(),
+                                       'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
+                                       ));
+                        ///< @todo filebase template with absolute file path
+                        $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_uninstall_modules.html');
+                        exit();
+                    } else if (!empty($_POST['cube_module_uninstallok'])) { //@todo use Ticket
+                        require_once XOOPS_BASE_PATH."/admin/class/ModuleUninstaller.class.php";
+                        $module = basename($_POST['cube_module_uninstallok']);
+                        if (in_array($module, $retArray['disabled'])) {
+                            $uninstaller = new Legacy_ModuleUninstaller($module);
+                            $uninstaller->execute();
+                        }
+                        XCube_Utils::redirectHeader(XOOPS_URL,1);
+                    } else {
+                        $handler =& xoops_getmodulehandler('non_installation_module','base');
+                        $objects = $handler->getObjects();
+                        $optionModules = array();
+                        foreach($objects as $module) {
+                            if (!in_array($module->getVar('dirname'), $retArray['uninstalled'])) {
+                                $optionModules[] = $module->getVar('dirname');
+                            }
+                        }
+                        require_once XOOPS_ROOT_PATH.'/class/template.php';
+                        $xoopsTpl = new XoopsTpl();
+                        $xoopsTpl->assign('uninstalled',$retArray['uninstalled']);
+                        $xoopsTpl->assign('disabled',$retArray['disabled']);
+                        $xoopsTpl->assign('option',$optionModules);
+                        $xoopsTpl->assign( array(
+                                       'xoops_sitename' => htmlspecialchars($this->mController->mConfig['sitename']),
+                                       'xoops_themecss' => xoops_getcss(),
+                                       'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
+                                       ));
+                        ///< @todo filebase template with absolute file path
+                        $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_install_modules.html');
+                        exit();
+                    }
+               } else {
+                    $accessAllowFlag = false;
+               }
+            }
+        }
 
 	    if (!$accessAllowFlag) {
 	        require_once XOOPS_ROOT_PATH.'/class/template.php';
@@ -39,7 +134,8 @@
 	                                   'lang_password' => _PASSWORD,
 	                                   'lang_siteclosemsg' => $this->mController->mConfig['closesite_text']));
 	        $xoopsTpl->xoops_setCaching(1);
-	        $xoopsTpl->display('db:system_siteclosed.html');	///< @todo depends schema
+            // @todo filebase template with absolute file path
+            $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_site_closed.html');
 	        exit();
 	    }
 	}

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:48 +0900
Subject: [xoops-cvslog 2620] CVS update: xoops2jp/html/settings
Message-ID: <20060402130748.619D82AC059@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.7 xoops2jp/html/settings/site_default.ini.php:1.1.2.8
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.7	Thu Mar 23 17:17:20 2006
+++ xoops2jp/html/settings/site_default.ini.php	Sun Apr  2 22:07:48 2006
@@ -3,11 +3,10 @@
 
 [Cube]
 Controller=Legacy_Controller
-
+SystemModules=base, user,legacyRender
 CacheSystem.path=/modules/stdCache/kernel
 CacheSystem.class=StdRenderCache
 
-
 #
 # You can register plural render systems.
 #

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 22:07:48 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 22:07:48 +0900
Subject: [xoops-cvslog 2621] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060402130748.8969F2AC0C9@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_install_modules.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_install_modules.html:1.1.2.1
--- /dev/null	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_install_modules.html	Sun Apr  2 22:07:48 2006
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
+<title><{$xoops_sitename}></title>
+<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css" />
+
+</head>
+<body>
+  <table cellspacing="0">
+    <tr id="header">
+      <td style="width: 250px; background-color: #000080; vertical-align: middle; text-align:center; height:100px"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>images/logo.gif" width="200" alt="" /></a></td>
+      <td style="width: 100%; background-color: #000080; vertical-align: middle; text-align:center;">&nbsp;</td>
+    </tr>
+    <tr>
+      <td style="height: 8px; border-bottom: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  <table cellspacing="1" align="center" width="80%" border="0" cellpadding="10px;">
+    <tr>
+      <td align="center"><div style="background-color: #ddffdf; color: #136C99; text-align: center; border-top: 1px solid #ddffdf; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;"><{$smarty.const._SYSTEM_MODULE_ERROR}></div></td>
+    </tr>
+  </table>
+  
+  <form action="<{$xoops_url}>/index.php" method="post">
+      <table cellspacing="0" align="center" style="border: 1px solid silver; width: 380px;">
+        <tr>
+          <th style="border: 1px solid silver;background-color: #c2cdd6; color: #FFFFFF; padding : 2px;">&nbsp;</th>
+          <th style="border: 1px solid silver;background-color: #c2cdd6; color: #FFFFFF; padding : 2px;">Module</th>
+          <th colspan="2" style="border: 1px solid silver;background-color: #c2cdd6; color: #FFFFFF; padding : 2px;">Status</th>
+        </tr>
+<{foreach item=module from=$uninstalled}>
+        <tr>
+          <td style="border: 1px solid silver;width:30px; padding: 2px;"><input type="hidden" name="uninstalled_modules[]" value="<{$module}>"/>&nbsp;</td>
+          <td style="border: 1px solid silver;width:150px; padding: 2px;"><b><{$module}></b></td>
+          <td colspan="2" style="border: 1px solid silver;width:200px; padding: 2px;"><{$smarty.const._SYS_MODULE_UNINSTALLED}></td>
+        </tr>
+<{/foreach}>
+<{foreach item=module from=$disabled}>
+        <tr>
+          <td style="border: 1px solid silver;width:30px; padding: 2px;"><input type="hidden" name="disabled_modules[]" value="<{$module}>"/>&nbsp;</td>
+          <td style="border: 1px solid silver;width:150px; padding: 2px;"><b><{$module}></b></td>
+          <td style="border: 1px solid silver;width:100px; padding: 2px;"><{$smarty.const._SYS_MODULE_DISABLED}></td>
+          <td style="border: 1px solid silver;width:100px; padding: 2px;"><a href="<{$xoops_url}>/index.php?cube_module_uninstall=<{$module}>"><{$smarty.const._UNINSTALL}></a></td>
+        </tr>
+<{/foreach}>
+<{foreach item=module from=$option}>
+        <tr>
+          <td style="border: 1px solid silver;width:30px; padding: 2px;"><input type="checkbox" name="option_modules[]" value="<{$module}>"/></td>
+          <td style="border: 1px solid silver;width:150px; padding: 2px;"><{$module}></td>
+          <td colspan="2" style="border: 1px solid silver;width:200px; padding: 2px;"><{$smarty.const._SYS_OPTION_MODULES}></td>
+        </tr>
+<{/foreach}>
+        <tr><td colspan="4" style="text-align:center;padding: 2px;">
+         <input type="hidden" name="cube_module_install" value="1"/>
+         <input type="submit" value="<{$smarty.const._INSTALL}>" />
+        </td></tr>
+      </table>
+  </form>
+
+  <table cellspacing="0" width="100%">
+    <tr>
+      <td style="height:8px; border-bottom: 1px solid silver; border-top: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  </body>
+</html>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_site_closed.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_site_closed.html:1.1.2.1
--- /dev/null	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_site_closed.html	Sun Apr  2 22:07:48 2006
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
+<title><{$xoops_sitename}></title>
+<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css" />
+
+</head>
+<body>
+  <table cellspacing="0">
+    <tr id="header">
+      <td style="width: 250px; background-color: #000080; vertical-align: middle; text-align:center; height:100px"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>images/logo.gif" width="200" alt="" /></a></td>
+      <td style="width: 100%; background-color: #000080; vertical-align: middle; text-align:center;">&nbsp;</td>
+    </tr>
+    <tr>
+      <td style="height: 8px; border-bottom: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  <table cellspacing="1" align="center" width="80%" border="0" cellpadding="10px;">
+    <tr>
+      <td align="center"><div style="background-color: #ddffdf; color: #136C99; text-align: center; border-top: 1px solid #ddffdf; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;"><{$lang_siteclosemsg}></div></td>
+    </tr>
+  </table>
+  
+  <form action="<{$xoops_url}>/user.php" method="post">
+    <table cellspacing="0" align="center" style="border: 1px solid silver; width: 200px;">
+      <tr>
+        <th style="background-color: #c2cdd6; color: #FFFFFF; padding : 2px; vertical-align : middle;" colspan="2"><{$lang_login}></th>
+      </tr>
+      <tr>
+        <td style="padding: 2px;"><{$lang_username}></td><td style="padding: 2px;"><input type="text" name="uname" size="12" value="" /></td>
+      </tr>
+      <tr>
+        <td style="padding: 2px;"><{$lang_password}></td><td style="padding: 2px;"><input type="password" name="pass" size="12" /></td>
+      </tr>
+      <tr>
+        <td style="padding: 2px;">&nbsp;</td>
+        <td style="padding: 2px;"><input type="hidden" name="xoops_login" value="1" /><input type="submit" value="<{$lang_login}>" /></td>
+      </tr>
+    </table>
+  </form>
+
+  <table cellspacing="0" width="100%">
+    <tr>
+      <td style="height:8px; border-bottom: 1px solid silver; border-top: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  </body>
+</html>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_uninstall_modules.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_uninstall_modules.html:1.1.2.1
--- /dev/null	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_uninstall_modules.html	Sun Apr  2 22:07:48 2006
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+<meta http-equiv="content-language" content="<{$xoops_langcode}>" />
+<title><{$xoops_sitename}></title>
+<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_url}>/xoops.css" />
+
+</head>
+<body>
+  <table cellspacing="0">
+    <tr id="header">
+      <td style="width: 250px; background-color: #000080; vertical-align: middle; text-align:center; height:100px"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>images/logo.gif" width="200" alt="" /></a></td>
+      <td style="width: 100%; background-color: #000080; vertical-align: middle; text-align:center;">&nbsp;</td>
+    </tr>
+    <tr>
+      <td style="height: 8px; border-bottom: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  <table cellspacing="1" align="center" width="80%" border="0" cellpadding="10px;">
+    <tr>
+      <td align="center"><div style="background-color: #ddffdf; color: #136C99; text-align: center; border-top: 1px solid #ddffdf; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;"><{$smarty.const._UNINSTALL_CONFIRM}></div></td>
+    </tr>
+  </table>
+  
+  <form action="<{$xoops_url}>/index.php" method="post">
+      <table cellspacing="0" align="center" style="border: 1px solid silver; width: 380px;">
+        <tr><td colspan="4" style="text-align:center;padding: 2px;">
+         <input type="hidden" name="cube_module_uninstallok" value="<{$cube_module_uninstall}>"/>
+         <input type="submit" value="<{$smarty.const._UNINSTALL}>" />
+        </td></tr>
+      </table>
+  </form>
+
+  <table cellspacing="0" width="100%">
+    <tr>
+      <td style="height:8px; border-bottom: 1px solid silver; border-top: 1px solid silver; background-color: #eeeeee;" colspan="2">&nbsp;</td>
+    </tr>
+  </table>
+
+  </body>
+</html>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 23:42:44 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 23:42:44 +0900
Subject: [xoops-cvslog 2622] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060402144244.813DF2AC047@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.9 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.10
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.9	Wed Mar 29 22:52:01 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Sun Apr  2 23:42:44 2006
@@ -77,12 +77,16 @@
     			//
     			// Add a permission which administrators can read.
     			//
-    			$readPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-    			$readPerm->setVar('gperm_name', 'module_read');
-
-    			if (!$gpermHandler->insert($readPerm)) {
-    				$log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
-    			}
+			    $root = $root=&XCube_Root::getSingleton();
+                $groups = $root->mController->mXoopsUser->getGroups();
+				foreach($groups as $mygroup) {
+        			$readPerm =& $this->_createPermission($mygroup);
+    			    $readPerm->setVar('gperm_name', 'module_read');
+
+       			    if (!$gpermHandler->insert($readPerm)) {
+    			    	$log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
+    				}
+				}
     		}
 		}
 	}
Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.12 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.13
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.12	Wed Mar 29 22:52:01 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Sun Apr  2 23:42:44 2006
@@ -301,10 +301,15 @@
         				}
         			}
 				} else {
-    				$bperm->setVar('gperm_groupid', XOOPS_GROUP_ADMIN);
-    				if (!$gpermHandler->insert($bperm)) {
-    					$log->addWarn("Could not set block permission " . $blockObj->getVar('name'));
-				    }
+				    $root = $root=&XCube_Root::getSingleton();
+                    $groups = $root->mController->mXoopsUser->getGroups();var_dump($groups);
+                    foreach ($groups as $mygroup) {
+        				$bperm->setVar('gperm_groupid', $mygroup);
+        				$bperm->setNew();
+        				if (!$gpermHandler->insert($bperm)) {
+        					$log->addWarn("Could not set block permission " . $blockObj->getVar('name'));
+    				    }
+    				}
 				}
 			}
 

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 23:54:54 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 23:54:54 +0900
Subject: [xoops-cvslog 2623] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060402145454.E38022AC01A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/modulePreloadWating.class.php
diff -u /dev/null xoops2jp/html/modules/base/class/modulePreloadWating.class.php:1.1.2.1
--- /dev/null	Sun Apr  2 23:54:54 2006
+++ xoops2jp/html/modules/base/class/modulePreloadWating.class.php	Sun Apr  2 23:54:54 2006
@@ -0,0 +1,89 @@
+<?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) {
+        // for News Module
+        $module_handler =& xoops_gethandler('module');
+        if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("stories")." WHERE published=0");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle";
+                list($blockVal['pendingnum']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_SUBMS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+        }
+        // for MyLinks Module
+        if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_WLNKS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mylinks_broken"));
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listBrokenLinks";
+                list($blockVal['pendingnum']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_BLNK;
+                $eventArgs['modules'][] = $blockVal;
+            }
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mylinks_mod"));
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listModReq";
+                list($blockVal['pendingnum']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_MLNKS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+        }
+        // for MyDownloads Modules
+        if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_WDLS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mydownloads_broken")."");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listBrokenDownloads";
+                list($blockVal['pendingnum']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_BFLS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mydownloads_mod")."");
+            if ( $result ) {
+                $blockVal = array();
+                $blockVal['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listModReq";
+                list($blockVal['pendingnum']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                $blockVal['lang_linkname'] = _MB_BASE_MFLS;
+                $eventArgs['modules'][] = $blockVal;
+            }
+        }
+        // for Comments
+        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+            $blockVal['lang_linkname'] =_MB_BASE_COMPEND;
+            $eventArgs['modules'][] = $blockVal;
+        }
+    }
+}
+?>

From nobunobu ＠ users.sourceforge.jp  Sun Apr  2 23:54:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  2 Apr 2006 23:54:57 +0900
Subject: [xoops-cvslog 2624] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20060402145457.A6AF52AC01A@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.1 xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_waiting.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_waiting.php	Sun Apr  2 23:54:57 2006
@@ -3,61 +3,9 @@
     global $xoopsUser;
     $xoopsDB =& Database::getInstance();
     $module_handler =& xoops_gethandler('module');
-    $block = array();
-    if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories")." WHERE published=0");
-        if ( $result ) {
-            $block['modules'][0]['adminlink'] = XOOPS_URL."/modules/news/admin/index.php?op=newarticle";
-            list($block['modules'][0]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][0]['lang_linkname'] = _MB_BASE_SUBMS;
-        }
-    }
-    if ($module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_links")." WHERE status=0");
-        if ( $result ) {
-            $block['modules'][1]['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listNewLinks";
-            list($block['modules'][1]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][1]['lang_linkname'] = _MB_BASE_WLNKS;
-        }
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_broken"));
-        if ( $result ) {
-            $block['modules'][2]['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listBrokenLinks";
-            list($block['modules'][2]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][2]['lang_linkname'] = _MB_BASE_BLNK;
-        }
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mylinks_mod"));
-        if ( $result ) {
-            $block['modules'][3]['adminlink'] = XOOPS_URL."/modules/mylinks/admin/index.php?op=listModReq";
-            list($block['modules'][3]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][3]['lang_linkname'] = _MB_BASE_MLNKS;
-        }
-    }
-    if ($module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status=0");
-        if ( $result ) {
-            $block['modules'][4]['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listNewDownloads";
-            list($block['modules'][4]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][4]['lang_linkname'] = _MB_BASE_WDLS;
-        }
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_broken")."");
-        if ( $result ) {
-            $block['modules'][5]['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listBrokenDownloads";
-            list($block['modules'][5]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][5]['lang_linkname'] = _MB_BASE_BFLS;
-        }
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("mydownloads_mod")."");
-        if ( $result ) {
-            $block['modules'][6]['adminlink'] = XOOPS_URL."/modules/mydownloads/admin/index.php?op=listModReq";
-            list($block['modules'][6]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][6]['lang_linkname'] = _MB_BASE_MFLS;
-        }
-    }
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xoopscomments")." WHERE com_status=1");
-        if ( $result ) {
-            $block['modules'][7]['adminlink'] = XOOPS_URL."/modules/system/admin.php?module=0&amp;status=1&amp;fct=comments";
-            list($block['modules'][7]['pendingnum']) = $xoopsDB->fetchRow($result);
-            $block['modules'][7]['lang_linkname'] =_MB_BASE_COMPEND;
-        }
+
+    $modules = array();
+    $block =& XCube_EventUtils::quickRaiseEvent('Legacyblock.Wating.Show', array('modules'=>&$modules));
     return $block;
 }
 ?>

From nobunobu ＠ users.sourceforge.jp  Mon Apr  3 14:43:58 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  3 Apr 2006 14:43:58 +0900
Subject: [xoops-cvslog 2625] CVS update:
	xoops2jp/html/modules/base/templates/blocks
Message-ID: <20060403054358.552842AC024@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html
diff -u xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:1.1.2.1 xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html:1.1.2.1	Sun Mar 26 15:07:49 2006
+++ xoops2jp/html/modules/base/templates/blocks/legacy_block_mainmenu.html	Mon Apr  3 14:43:58 2006
@@ -1,7 +1,7 @@
 <table cellspacing="0">
   <tr>
     <td id="mainmenu">
-      <a class="menuTop" href="<{$xoops_url}>/"><{$smary.const._MB_BASE_HOME}></a>
+      <a class="menuTop" href="<{$xoops_url}>/"><{$smarty.const._MB_BASE_HOME}></a>
 <{foreach item=module from=$block.modules}>
       <a class="menuMain" href="<{$xoops_url}>/modules/<{$module.directory}>/"><{$module.name}></a>
 <{foreach item=sublink from=$module.sublinks}>

From nobunobu ＠ users.sourceforge.jp  Mon Apr  3 14:44:19 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  3 Apr 2006 14:44:19 +0900
Subject: [xoops-cvslog 2626] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060403054419.BEAD12AC024@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.1 xoops2jp/html/modules/base/class/modulePreloadWating.class.php:1.1.2.2
--- xoops2jp/html/modules/base/class/modulePreloadWating.class.php:1.1.2.1	Sun Apr  2 23:54:54 2006
+++ xoops2jp/html/modules/base/class/modulePreloadWating.class.php	Mon Apr  3 14:44:19 2006
@@ -9,78 +9,79 @@
     }
     
     function callbackWatingShow(&$controller,&$eventArgs) {
+        $xoopsDB =& Database::getInstance();
         // for News Module
         $module_handler =& xoops_gethandler('module');
         if ($module_handler->getCount(new Criteria('dirname', 'news'))) {
-            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("stories")." WHERE published=0");
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                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 = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mylinks_links")." WHERE status=0");
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
                 $blockVal['lang_linkname'] = _MB_BASE_WLNKS;
                 $eventArgs['modules'][] = $blockVal;
             }
-            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mylinks_broken"));
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
                 $blockVal['lang_linkname'] = _MB_BASE_BLNK;
                 $eventArgs['modules'][] = $blockVal;
             }
-            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mylinks_mod"));
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                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 = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mydownloads_downloads")." WHERE status=0");
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
                 $blockVal['lang_linkname'] = _MB_BASE_WDLS;
                 $eventArgs['modules'][] = $blockVal;
             }
-            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mydownloads_broken")."");
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
                 $blockVal['lang_linkname'] = _MB_BASE_BFLS;
                 $eventArgs['modules'][] = $blockVal;
             }
-            $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("mydownloads_mod")."");
+            $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+                list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
                 $blockVal['lang_linkname'] = _MB_BASE_MFLS;
                 $eventArgs['modules'][] = $blockVal;
             }
         }
         // for Comments
-        $result = $GLOBALS['xoopsDB']->query("SELECT COUNT(*) FROM ".$GLOBALS['xoopsDB']->prefix("xoopscomments")." WHERE com_status=1");
+        $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']) = $GLOBALS['xoopsDB']->fetchRow($result);
+            list($blockVal['pendingnum']) = $xoopsDB->fetchRow($result);
             $blockVal['lang_linkname'] =_MB_BASE_COMPEND;
             $eventArgs['modules'][] = $blockVal;
         }

From nobunobu ＠ users.sourceforge.jp  Mon Apr  3 14:44:24 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon,  3 Apr 2006 14:44:24 +0900
Subject: [xoops-cvslog 2627] CVS update: xoops2jp/html/modules/base/blocks
Message-ID: <20060403054424.6877A2AC024@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/blocks/legacy_mainmenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_mainmenu.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_mainmenu.php	Mon Apr  3 14:44:24 2006
@@ -1,7 +1,11 @@
 <?php
 function b_legacy_mainmenu_show() {
-    global $xoopsUser,$xoopsModule;
+    $root =& XCube_Root::getSingleton();
+    $xoopsModule =& $root->mController->mModuleController->mModuleObject;
+    $xoopsUser =& $root->mController->mXoopsUser;
+    
     $block = array();
+
     $module_handler =& xoops_gethandler('module');
     $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
     $criteria->add(new Criteria('isactive', 1));
Index: xoops2jp/html/modules/base/blocks/legacy_usermenu.php
diff -u xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.1 xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.2
--- xoops2jp/html/modules/base/blocks/legacy_usermenu.php:1.1.2.1	Sun Mar 26 15:07:46 2006
+++ xoops2jp/html/modules/base/blocks/legacy_usermenu.php	Mon Apr  3 14:44:24 2006
@@ -1,7 +1,9 @@
 <?php
 function b_legacy_usermenu_show()
 {
-    global $xoopsUser;
+    $root =& XCube_Root::getSingleton();
+    $xoopsUser =& $root->mController->mXoopsUser;
+
     if (is_object($xoopsUser)) {
         $pm_handler =& xoops_gethandler('privmessage');
         $block = array();

From minahito ＠ users.sourceforge.jp  Wed Apr  5 11:34:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 11:34:23 +0900
Subject: [xoops-cvslog 2628] CVS update: xoops2jp/html/install/templates
Message-ID: <20060405023423.09E782AC00E@users.sourceforge.jp>

Index: xoops2jp/html/install/templates/install_insertData.tpl.php
diff -u xoops2jp/html/install/templates/install_insertData.tpl.php:1.1.2.1 xoops2jp/html/install/templates/install_insertData.tpl.php:1.1.2.2
--- xoops2jp/html/install/templates/install_insertData.tpl.php:1.1.2.1	Tue Mar  7 22:11:40 2006
+++ xoops2jp/html/install/templates/install_insertData.tpl.php	Wed Apr  5 11:34:22 2006
@@ -4,8 +4,10 @@
 <?php } ?>
 </td></tr></table>
 <table align="center"><tr><td align="left">
-<?php foreach($this->v('cm_reports') as $report) { ?>
-    <?php echo $report ?><br />
+<?php if (is_array($this->v('cm_reports'))) { ?>
+    <?php foreach($this->v('cm_reports') as $report) { ?>
+        <?php echo $report ?><br />
+    <?php } ?>
 <?php } ?>
 </td></tr></table>
 <table align="center"><tr><td align="left">

From nobunobu ＠ users.sourceforge.jp  Wed Apr  5 17:40:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  5 Apr 2006 17:40:57 +0900
Subject: [xoops-cvslog 2629] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060405084057.8735C2AC02C@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_edit.html
diff -u xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.11 xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.12
--- xoops2jp/html/modules/user/admin/templates/user_edit.html:1.1.2.11	Sat Feb  4 16:28:25 2006
+++ xoops2jp/html/modules/user/admin/templates/user_edit.html	Wed Apr  5 17:40:57 2006
@@ -158,7 +158,7 @@
       <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_NO_SPECIAL_RANK}></option>
+        <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}>

From nobunobu ＠ users.sourceforge.jp  Wed Apr  5 17:40:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  5 Apr 2006 17:40:57 +0900
Subject: [xoops-cvslog 2630] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060405084057.AD0CB2AC06E@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.11 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.12
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.11	Wed Mar  8 19:24:40 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Wed Apr  5 17:40:57 2006
@@ -66,7 +66,7 @@
 define('_AD_USER_LANG_LEVEL', "Level");
 define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?");
 define('_AD_USER_LANG_NAME', "Real name");
-define('_AD_USER_LANG_NO_SPECIAL_RANK', "NO_SPECIAL_RANK");
+define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
 define('_AD_USER_LANG_NOTIFY_METHOD', "Notification Method : When you monitor e.g. a forum, how would you like to receive notifications of updates?");
 define('_AD_USER_LANG_NOTIFY_MODE', "Default Notification Mode");
 define('_AD_USER_LANG_OFF', "Off");

From nobunobu ＠ users.sourceforge.jp  Wed Apr  5 17:40:57 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Wed,  5 Apr 2006 17:40:57 +0900
Subject: [xoops-cvslog 2631] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060405084057.E29052AC02C@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.20 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.21
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.20	Wed Mar  8 19:24:46 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Wed Apr  5 17:40:57 2006
@@ -66,7 +66,7 @@
 define('_AD_USER_LANG_LEVEL', "レベル");
 define('_AD_USER_LANG_MAILOK', "当サイトの新着情報などをメールで受け取る");
 define('_AD_USER_LANG_NAME', "本名");
-define('_AD_USER_LANG_NO_SPECIAL_RANK', "NO_SPECIAL_RANK");
+define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
 define('_AD_USER_LANG_NOTIFY_METHOD', "イベント更新通知メッセージの受取方法");
 define('_AD_USER_LANG_NOTIFY_MODE', "イベント通知のタイミング");
 define('_AD_USER_LANG_OFF', "オフ");

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:56:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:56:55 +0900
Subject: [xoops-cvslog 2632] CVS update: xoops2jp/html/modules/base
Message-ID: <20060405105655.D9EE02AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/users.xml
diff -u xoops2jp/html/modules/base/users.xml:1.1.2.1 xoops2jp/html/modules/base/users.xml:removed
--- xoops2jp/html/modules/base/users.xml:1.1.2.1	Thu Jan 26 01:17:25 2006
+++ xoops2jp/html/modules/base/users.xml	Wed Apr  5 19:56:55 2006
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="UsersEditForm" type="XCube_ActionForm">
-		<form-property name="uid" type="Int" />
-		<form-property name="name" type="String" />
-		<form-property name="uname" type="String" />
-		<form-property name="email" type="String" />
-		<form-property name="url" type="String" />
-		<form-property name="user_avatar" type="String" />
-		<form-property name="user_regdate" type="Int" />
-		<form-property name="user_icq" type="String" />
-		<form-property name="user_from" type="String" />
-		<form-property name="user_sig" type="Text" />
-		<form-property name="user_viewemail" type="Int" />
-		<form-property name="actkey" type="String" />
-		<form-property name="user_aim" type="String" />
-		<form-property name="user_yim" type="String" />
-		<form-property name="user_msnm" type="String" />
-		<form-property name="pass" type="String" />
-		<form-property name="posts" type="Int" />
-		<form-property name="attachsig" type="Int" />
-		<form-property name="rank" type="Int" />
-		<form-property name="level" type="Int" />
-		<form-property name="theme" type="String" />
-		<form-property name="timezone_offset" type="Float" />
-		<form-property name="last_login" type="Int" />
-		<form-property name="umode" type="String" />
-		<form-property name="uorder" type="Int" />
-		<form-property name="notify_method" type="Int" />
-		<form-property name="notify_mode" type="Int" />
-		<form-property name="user_occ" type="String" />
-		<form-property name="bio" type="Text" />
-		<form-property name="user_intrest" type="String" />
-		<form-property name="user_mailok" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="uid" depends="required">
-			<arg0 key="const._MD_BASE_LANG_UID" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="name" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_NAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="60" />
-		</field property>
-		<field property="uname" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_UNAME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="25" />
-		</field property>
-		<field property="email" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_EMAIL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="60" />
-		</field property>
-		<field property="url" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_URL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field property>
-		<field property="user_avatar" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_AVATAR" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="30" />
-		</field property>
-		<field property="user_regdate" depends="required">
-			<arg0 key="const._MD_BASE_LANG_USER_REGDATE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="user_icq" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_ICQ" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="15" />
-		</field property>
-		<field property="user_from" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_FROM" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field property>
-		<field property="user_sig" depends="required">
-			<arg0 key="const._MD_BASE_LANG_USER_SIG" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="user_viewemail" depends="required">
-			<arg0 key="const._MD_BASE_LANG_USER_VIEWEMAIL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="actkey" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_ACTKEY" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="8" />
-		</field property>
-		<field property="user_aim" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_AIM" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="18" />
-		</field property>
-		<field property="user_yim" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_YIM" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="25" />
-		</field property>
-		<field property="user_msnm" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_MSNM" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field property>
-		<field property="pass" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_PASS" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="32" />
-		</field property>
-		<field property="posts" depends="required">
-			<arg0 key="const._MD_BASE_LANG_POSTS" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="attachsig" depends="required">
-			<arg0 key="const._MD_BASE_LANG_ATTACHSIG" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="rank" depends="required">
-			<arg0 key="const._MD_BASE_LANG_RANK" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="level" depends="required">
-			<arg0 key="const._MD_BASE_LANG_LEVEL" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="theme" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_THEME" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field property>
-		<field property="timezone_offset" depends="required">
-			<arg0 key="const._MD_BASE_LANG_TIMEZONE_OFFSET" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="last_login" depends="required">
-			<arg0 key="const._MD_BASE_LANG_LAST_LOGIN" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="umode" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_UMODE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="10" />
-		</field property>
-		<field property="uorder" depends="required">
-			<arg0 key="const._MD_BASE_LANG_UORDER" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="notify_method" depends="required">
-			<arg0 key="const._MD_BASE_LANG_NOTIFY_METHOD" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="notify_mode" depends="required">
-			<arg0 key="const._MD_BASE_LANG_NOTIFY_MODE" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="user_occ" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_OCC" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="100" />
-		</field property>
-		<field property="bio" depends="required">
-			<arg0 key="const._MD_BASE_LANG_BIO" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-		<field property="user_intrest" depends="required,maxlength">
-			<arg0 key="const._MD_BASE_LANG_USER_INTREST" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-			<arg1 key="${var:maxlength}" />
-			<msg name="maxlength" key="const._MD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="150" />
-		</field property>
-		<field property="user_mailok" depends="required">
-			<arg0 key="const._MD_BASE_LANG_USER_MAILOK" />
-			<msg name="required" key="const._MD_BASE_ERROR_REQUIRED" />
-		</field property>
-	</form-validation>
-</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:57:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:57:11 +0900
Subject: [xoops-cvslog 2633] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20060405105711.A2C912AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/menu.php
diff -u xoops2jp/html/modules/base/admin/menu.php:1.1.2.8 xoops2jp/html/modules/base/admin/menu.php:1.1.2.9
--- xoops2jp/html/modules/base/admin/menu.php:1.1.2.8	Tue Feb 21 20:39:21 2006
+++ xoops2jp/html/modules/base/admin/menu.php	Wed Apr  5 19:57:11 2006
@@ -1,29 +1,37 @@
-<?php
-/**
- * @version $Id: menu.php,v 1.1.2.8 2006/02/21 11:39:21 minahito Exp $
- */
-
-$adminmenu[1]['title']=_MI_BASE_MENU_ACTIONSEARCH;
-$adminmenu[1]['link']="admin/index.php?action=ActSearch";
-
-$adminmenu[2]['title']=_MI_BASE_MENU_MODULELIST;
-$adminmenu[2]['keywords']=_MI_BASE_KEYWORD_MODULELIST;
-$adminmenu[2]['link']="admin/index.php?action=ModuleList";
-
-$adminmenu[3]['title']=_MI_BASE_MENU_MODULEINSTALL;
-$adminmenu[3]['keywords']=_MI_BASE_KEYWORD_MODULEINSTALL;
-$adminmenu[3]['link']="admin/index.php?action=InstallList";
-
-$adminmenu[4]['title']=_MI_BASE_MENU_CREATE_SMILES;
-$adminmenu[4]['link']="admin/index.php?action=SmilesEdit";
-$adminmenu[4]['keywords']=_MI_BASE_KEYWORD_CREATE_SMILES;
-$adminmenu[4]['show']=false;
-
-$adminmenu[5]['title']=_MI_BASE_MENU_SMILES_MANAGE;
-$adminmenu[5]['keywords']=_MI_BASE_KEYWORD_SMILES_MANAGE;
-$adminmenu[5]['link']="admin/index.php?action=SmilesList";
-
-$adminmenu[6]['title']=_MI_BASE_MENU_COMMENT_MANAGE;
-$adminmenu[6]['link']="admin/index.php?action=CommentList";
-
-?>
\ No newline at end of file
+<?php
+/**
+ * @version $Id: menu.php,v 1.1.2.9 2006/04/05 10:57:11 minahito Exp $
+ */
+
+$adminmenu[1]['title']=_MI_BASE_MENU_ACTIONSEARCH;
+$adminmenu[1]['link']="admin/index.php?action=ActSearch";
+
+$adminmenu[2]['title']=_MI_BASE_MENU_MODULELIST;
+$adminmenu[2]['keywords']=_MI_BASE_KEYWORD_MODULELIST;
+$adminmenu[2]['link']="admin/index.php?action=ModuleList";
+
+$adminmenu[3]['title']=_MI_BASE_MENU_MODULEINSTALL;
+$adminmenu[3]['keywords']=_MI_BASE_KEYWORD_MODULEINSTALL;
+$adminmenu[3]['link']="admin/index.php?action=InstallList";
+
+$adminmenu[4]['title']=_MI_BASE_MENU_BLOCKLIST;
+$adminmenu[4]['keywords']=_MI_BASE_KEYWORD_BLOCKLIST;
+$adminmenu[4]['link']="admin/index.php?action=BlockList";
+
+$adminmenu[5]['title']=_MI_BASE_MENU_BLOCKINSTALL;
+$adminmenu[5]['keywords']=_MI_BASE_KEYWORD_BLOCKINSTALL;
+$adminmenu[5]['link']="admin/index.php?action=BlockInstallList";
+
+$adminmenu[6]['title']=_MI_BASE_MENU_CREATE_SMILES;
+$adminmenu[6]['link']="admin/index.php?action=SmilesEdit";
+$adminmenu[6]['keywords']=_MI_BASE_KEYWORD_CREATE_SMILES;
+$adminmenu[6]['show']=false;
+
+$adminmenu[7]['title']=_MI_BASE_MENU_SMILES_MANAGE;
+$adminmenu[7]['keywords']=_MI_BASE_KEYWORD_SMILES_MANAGE;
+$adminmenu[7]['link']="admin/index.php?action=SmilesList";
+
+$adminmenu[8]['title']=_MI_BASE_MENU_COMMENT_MANAGE;
+$adminmenu[8]['link']="admin/index.php?action=CommentList";
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:57:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:57:26 +0900
Subject: [xoops-cvslog 2634] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060405105726.CB7F82AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/block_edit.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_edit.xml	Wed Apr  5 19:57:26 2006
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BlockEditForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+		<form-property name="options" type="String[]" />
+		<form-property name="name" type="String" />
+		<form-property name="title" type="String" />
+		<form-property name="side" type="Int" />
+		<form-property name="weight" type="Int" />
+		<form-property name="bcachetime" type="Int" />
+		<form-property name="bmodule" type="Int[]" />
+		<form-property name="groupid" type="Int[]" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="name" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_NAME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="150" />
+		</field>
+		<field property="title" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_TITLE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="side" depends="required">
+			<arg0 key="const._AD_BASE_LANG_SIDE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="weight" depends="required">
+			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="bcachetime" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/newblocks_edit.xml	Wed Apr  5 19:57:26 2006
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="NewblocksAdminEditForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+		<form-property name="mid" type="Int" />
+		<form-property name="func_num" type="Int" />
+		<form-property name="options" type="String" />
+		<form-property name="name" type="String" />
+		<form-property name="title" type="String" />
+		<form-property name="content" type="Text" />
+		<form-property name="side" type="Bool" />
+		<form-property name="weight" type="Int" />
+		<form-property name="visible" type="Bool" />
+		<form-property name="block_type" type="String" />
+		<form-property name="c_type" type="String" />
+		<form-property name="isactive" type="Bool" />
+		<form-property name="dirname" type="String" />
+		<form-property name="func_file" type="String" />
+		<form-property name="show_func" type="String" />
+		<form-property name="edit_func" type="String" />
+		<form-property name="template" type="String" />
+		<form-property name="bcachetime" type="Int" />
+		<form-property name="last_modified" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="mid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_MID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="func_num" depends="required">
+			<arg0 key="const._AD_BASE_LANG_FUNC_NUM" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="options" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_OPTIONS" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="name" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_NAME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="150" />
+		</field>
+		<field property="title" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_TITLE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="content" depends="required">
+			<arg0 key="const._AD_BASE_LANG_CONTENT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="weight" depends="required">
+			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="block_type" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_BLOCK_TYPE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="1" />
+		</field>
+		<field property="c_type" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_C_TYPE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="1" />
+		</field>
+		<field property="dirname" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_DIRNAME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+		<field property="func_file" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_FUNC_FILE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+		<field property="show_func" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_SHOW_FUNC" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+		<field property="edit_func" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_EDIT_FUNC" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+		<field property="template" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_TEMPLATE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="50" />
+		</field>
+		<field property="bcachetime" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="last_modified" depends="required">
+			<arg0 key="const._AD_BASE_LANG_LAST_MODIFIED" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/newblocks_delete.xml	Wed Apr  5 19:57:26 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="NewblocksAdminDeleteForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/blockinstall_edit.xml	Wed Apr  5 19:57:26 2006
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BlockInstallEditForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+		<form-property name="options" type="String[]" />
+		<form-property name="name" type="String" />
+		<form-property name="title" type="String" />
+		<form-property name="side" type="Int" />
+		<form-property name="weight" type="Int" />
+		<form-property name="bcachetime" type="Int" />
+		<form-property name="bmodule" type="Int[]" />
+		<form-property name="groupid" type="Int[]" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="name" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_NAME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="150" />
+		</field>
+		<field property="title" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_TITLE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="side" depends="required">
+			<arg0 key="const._AD_BASE_LANG_SIDE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="weight" depends="required">
+			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="bcachetime" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_uninstall.xml	Wed Apr  5 19:57:26 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BlockUninstallForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_BASE_LANG_BID" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:57:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:57:52 +0900
Subject: [xoops-cvslog 2635] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060405105752.C7FFA2AC06B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php	Wed Apr  5 19:57:52 2006
@@ -0,0 +1,35 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once dirname(__FILE__) . "/BlockEditAction.class.php";
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/BlockInstallEditForm.class.php";
+
+class Legacy_BlockInstallEditAction extends Legacy_BlockEditAction
+{
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_BlockInstallEditForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		parent::executeViewInput($controller, $xoopsUser, $render);
+		$render->setTemplateName("blockinstall_edit.html");
+	}
+	
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BlockInstallList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php	Wed Apr  5 19:57:52 2006
@@ -0,0 +1,51 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/BlockUninstallForm.class.php";
+
+class Legacy_BlockUninstallAction extends Legacy_AbstractEditAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('newblocks');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_BlockUninstallForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("block_uninstall.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		
+		//
+		// lazy loading
+		//
+		$this->mObject->loadModule();
+		
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BlockList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BlockList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Wed Apr  5 19:57:52 2006
@@ -0,0 +1,93 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/BlockEditForm.class.php";
+
+class Legacy_BlockEditAction extends Legacy_AbstractEditAction
+{
+	/**
+	 * @var string
+	 */
+	var $_mOptionForm = null;
+	
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('newblocks');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_BlockEditForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("block_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		
+		//
+		// lazy loading
+		//
+		$this->mObject->loadModule();
+		
+		$render->setAttribute('object', $this->mObject);
+
+		$handler =& xoops_gethandler('module');
+		$moduleArr =& $handler->getObjects();
+		$render->setAttribute('moduleArr', $moduleArr);
+		
+		$handler =& xoops_getmodulehandler('columnside');
+		$columnSideArr =& $handler->getObjects();
+		$render->setAttribute('columnSideArr', $columnSideArr);
+
+		$handler =& xoops_gethandler('group');
+		$groupArr =& $handler->getObjects();
+		$render->setAttribute('groupArr', $groupArr);
+		
+		//
+		// Get html of option form rendered.
+		//
+		if ($this->mObject->get('func_file') && $this->mObject->get('edit_func')) {
+			$func_file = XOOPS_MODULE_PATH . "/" . $this->mObject->get('dirname') . "/blocks/" . $this->mObject->get('func_file');
+			if (file_exists($func_file)) {
+				require $func_file;
+				$edit_func = $this->mObject->get('edit_func');
+				
+				$options = explode('|', $this->mObject->get('options'));
+				
+				if (function_exists($edit_func)) {
+					//
+					// load language file.
+					//
+					$root =& XCube_Root::getSingleton();
+					$langManager =& $root->getLanguageManager();
+					$langManager->loadBlockLanguage($this->mObject->get('dirname'));
+					
+					$this->_mOptionForm = call_user_func($edit_func, $options);
+				}
+			}
+		}
+		$render->setAttribute('optionForm', $this->_mOptionForm);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BlockList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BlockList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php	Wed Apr  5 19:57:52 2006
@@ -0,0 +1,41 @@
+<?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/admin/forms/BlockFilterForm.class.php";
+
+class Legacy_BlockListAction extends Legacy_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('newblocks');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_BlockFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=NewblocksList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("block_list.html");
+		#cubson::lazy_load_array('newblocks', $this->mObjects);
+		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/admin/actions/BlockInstallListAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockInstallListAction.class.php	Wed Apr  5 19:57:52 2006
@@ -0,0 +1,44 @@
+<?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/admin/forms/BlockInstallFilterForm.class.php";
+
+class Legacy_BlockInstallListAction extends Legacy_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('newblocks');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new Legacy_BlockInstallFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=BlockInstallList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("blockinstall_list.html");
+
+		//
+		// Lazy load
+		//
+		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  Wed Apr  5 19:58:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:58:08 +0900
Subject: [xoops-cvslog 2636] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060405105808.220252AC06B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:08 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Wed Apr  5 19:58:07 2006
@@ -0,0 +1,91 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
+
+define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
+define('NEWBLOCKS_SORT_KEY_BID', 1);
+define('NEWBLOCKS_SORT_KEY_MID', 2);
+define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
+define('NEWBLOCKS_SORT_KEY_OPTIONS', 4);
+define('NEWBLOCKS_SORT_KEY_NAME', 5);
+define('NEWBLOCKS_SORT_KEY_TITLE', 6);
+define('NEWBLOCKS_SORT_KEY_CONTENT', 7);
+define('NEWBLOCKS_SORT_KEY_SIDE', 8);
+define('NEWBLOCKS_SORT_KEY_WEIGHT', 9);
+define('NEWBLOCKS_SORT_KEY_VISIBLE', 10);
+define('NEWBLOCKS_SORT_KEY_BLOCK_TYPE', 11);
+define('NEWBLOCKS_SORT_KEY_C_TYPE', 12);
+define('NEWBLOCKS_SORT_KEY_ISACTIVE', 13);
+define('NEWBLOCKS_SORT_KEY_DIRNAME', 14);
+define('NEWBLOCKS_SORT_KEY_FUNC_FILE', 15);
+define('NEWBLOCKS_SORT_KEY_SHOW_FUNC', 16);
+define('NEWBLOCKS_SORT_KEY_EDIT_FUNC', 17);
+define('NEWBLOCKS_SORT_KEY_TEMPLATE', 18);
+define('NEWBLOCKS_SORT_KEY_BCACHETIME', 19);
+define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
+define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
+
+class Legacy_BlockInstallFilterForm extends Legacy_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
+		NEWBLOCKS_SORT_KEY_BID => 'bid',
+		NEWBLOCKS_SORT_KEY_MID => 'mid',
+		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
+		NEWBLOCKS_SORT_KEY_OPTIONS => 'options',
+		NEWBLOCKS_SORT_KEY_NAME => 'name',
+		NEWBLOCKS_SORT_KEY_TITLE => 'title',
+		NEWBLOCKS_SORT_KEY_CONTENT => 'content',
+		NEWBLOCKS_SORT_KEY_SIDE => 'side',
+		NEWBLOCKS_SORT_KEY_WEIGHT => 'weight',
+		NEWBLOCKS_SORT_KEY_VISIBLE => 'visible',
+		NEWBLOCKS_SORT_KEY_BLOCK_TYPE => 'block_type',
+		NEWBLOCKS_SORT_KEY_C_TYPE => 'c_type',
+		NEWBLOCKS_SORT_KEY_ISACTIVE => 'isactive',
+		NEWBLOCKS_SORT_KEY_DIRNAME => 'dirname',
+		NEWBLOCKS_SORT_KEY_FUNC_FILE => 'func_file',
+		NEWBLOCKS_SORT_KEY_SHOW_FUNC => 'show_func',
+		NEWBLOCKS_SORT_KEY_EDIT_FUNC => 'edit_func',
+		NEWBLOCKS_SORT_KEY_TEMPLATE => 'template',
+		NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime',
+		NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
+			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['mid'])) {
+			$this->_mNavi->addExtra('mid', xoops_getrequest('mid'));
+			$this->_mCriteria->add(new Criteria('mid', array(XOBJ_DTYPE_INT, xoops_getrequest('mid'))));
+		}
+	
+		if (isset($_REQUEST['name'])) {
+			$this->_mNavi->addExtra('name', xoops_getrequest('name'));
+			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+		}
+	
+		if (isset($_REQUEST['title'])) {
+			$this->_mNavi->addExtra('title', xoops_getrequest('title'));
+			$this->_mCriteria->add(new Criteria('title', array(XOBJ_DTYPE_STRING, xoops_getrequest('title'))));
+		}
+	
+		if (isset($_REQUEST['dirname'])) {
+			$this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+			$this->_mCriteria->add(new Criteria('dirname', array(XOBJ_DTYPE_STRING, xoops_getrequest('dirname'))));
+		}
+
+		$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 0)));
+		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:08 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallEditForm.class.php	Wed Apr  5 19:58:07 2006
@@ -0,0 +1,21 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once dirname(__FILE__) . "/BlockEditForm.class.php";
+
+class Legacy_BlockInstallEditForm extends Legacy_BlockEditForm
+{
+	function getTokenName()
+	{
+		return "module.base.BlockInstallEditForm.TOKEN" . $this->get('bid');
+	}
+	
+	function update(&$obj)
+	{
+		parent::update($obj);
+		$obj->set('visible', true);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:08 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php	Wed Apr  5 19:58:07 2006
@@ -0,0 +1,44 @@
+<?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_BlockUninstallForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.base.BlockUninstallForm.TOKEN" . $this->get('bid');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
+		$this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+		$obj->set('last_modified', time());
+		$obj->set('visible', false);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:08 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Wed Apr  5 19:58:07 2006
@@ -0,0 +1,116 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
+
+define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
+define('NEWBLOCKS_SORT_KEY_BID', 1);
+define('NEWBLOCKS_SORT_KEY_MID', 2);
+define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
+define('NEWBLOCKS_SORT_KEY_OPTIONS', 4);
+define('NEWBLOCKS_SORT_KEY_NAME', 5);
+define('NEWBLOCKS_SORT_KEY_TITLE', 6);
+define('NEWBLOCKS_SORT_KEY_CONTENT', 7);
+define('NEWBLOCKS_SORT_KEY_SIDE', 8);
+define('NEWBLOCKS_SORT_KEY_WEIGHT', 9);
+define('NEWBLOCKS_SORT_KEY_VISIBLE', 10);
+define('NEWBLOCKS_SORT_KEY_BLOCK_TYPE', 11);
+define('NEWBLOCKS_SORT_KEY_C_TYPE', 12);
+define('NEWBLOCKS_SORT_KEY_ISACTIVE', 13);
+define('NEWBLOCKS_SORT_KEY_DIRNAME', 14);
+define('NEWBLOCKS_SORT_KEY_FUNC_FILE', 15);
+define('NEWBLOCKS_SORT_KEY_SHOW_FUNC', 16);
+define('NEWBLOCKS_SORT_KEY_EDIT_FUNC', 17);
+define('NEWBLOCKS_SORT_KEY_TEMPLATE', 18);
+define('NEWBLOCKS_SORT_KEY_BCACHETIME', 19);
+define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
+define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
+
+class Legacy_BlockFilterForm extends Legacy_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
+		NEWBLOCKS_SORT_KEY_BID => 'bid',
+		NEWBLOCKS_SORT_KEY_MID => 'mid',
+		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
+		NEWBLOCKS_SORT_KEY_OPTIONS => 'options',
+		NEWBLOCKS_SORT_KEY_NAME => 'name',
+		NEWBLOCKS_SORT_KEY_TITLE => 'title',
+		NEWBLOCKS_SORT_KEY_CONTENT => 'content',
+		NEWBLOCKS_SORT_KEY_SIDE => 'side',
+		NEWBLOCKS_SORT_KEY_WEIGHT => 'weight',
+		NEWBLOCKS_SORT_KEY_VISIBLE => 'visible',
+		NEWBLOCKS_SORT_KEY_BLOCK_TYPE => 'block_type',
+		NEWBLOCKS_SORT_KEY_C_TYPE => 'c_type',
+		NEWBLOCKS_SORT_KEY_ISACTIVE => 'isactive',
+		NEWBLOCKS_SORT_KEY_DIRNAME => 'dirname',
+		NEWBLOCKS_SORT_KEY_FUNC_FILE => 'func_file',
+		NEWBLOCKS_SORT_KEY_SHOW_FUNC => 'show_func',
+		NEWBLOCKS_SORT_KEY_EDIT_FUNC => 'edit_func',
+		NEWBLOCKS_SORT_KEY_TEMPLATE => 'template',
+		NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime',
+		NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
+			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['bid'])) {
+			$this->_mNavi->addExtra('bid', xoops_getrequest('bid'));
+			$this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid'))));
+		}
+	
+		if (isset($_REQUEST['mid'])) {
+			$this->_mNavi->addExtra('mid', xoops_getrequest('mid'));
+			$this->_mCriteria->add(new Criteria('mid', array(XOBJ_DTYPE_INT, xoops_getrequest('mid'))));
+		}
+	
+		if (isset($_REQUEST['name'])) {
+			$this->_mNavi->addExtra('name', xoops_getrequest('name'));
+			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+		}
+	
+		if (isset($_REQUEST['title'])) {
+			$this->_mNavi->addExtra('title', xoops_getrequest('title'));
+			$this->_mCriteria->add(new Criteria('title', array(XOBJ_DTYPE_STRING, xoops_getrequest('title'))));
+		}
+	
+		if (isset($_REQUEST['side'])) {
+			$this->_mNavi->addExtra('side', xoops_getrequest('side'));
+			$this->_mCriteria->add(new Criteria('side', array(XOBJ_DTYPE_BOOL, xoops_getrequest('side'))));
+		}
+	
+		if (isset($_REQUEST['weight'])) {
+			$this->_mNavi->addExtra('weight', xoops_getrequest('weight'));
+			$this->_mCriteria->add(new Criteria('weight', array(XOBJ_DTYPE_INT, xoops_getrequest('weight'))));
+		}
+	
+		if (isset($_REQUEST['block_type'])) {
+			$this->_mNavi->addExtra('block_type', xoops_getrequest('block_type'));
+			$this->_mCriteria->add(new Criteria('block_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('block_type'))));
+		}
+	
+		if (isset($_REQUEST['c_type'])) {
+			$this->_mNavi->addExtra('c_type', xoops_getrequest('c_type'));
+			$this->_mCriteria->add(new Criteria('c_type', array(XOBJ_DTYPE_STRING, xoops_getrequest('c_type'))));
+		}
+	
+		if (isset($_REQUEST['dirname'])) {
+			$this->_mNavi->addExtra('dirname', xoops_getrequest('dirname'));
+			$this->_mCriteria->add(new Criteria('dirname', array(XOBJ_DTYPE_STRING, xoops_getrequest('dirname'))));
+		}
+	
+		$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1)));
+		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:08 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php	Wed Apr  5 19:58:07 2006
@@ -0,0 +1,87 @@
+<?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_BlockEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.base.BlockEditForm.TOKEN" . $this->get('bid');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+		$this->mFormProperties['options'] =& new XCube_StringArrayProperty('options');
+		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
+		$this->mFormProperties['title'] =& new XCube_StringProperty('title');
+		$this->mFormProperties['side'] =& new XCube_IntProperty('side');
+		$this->mFormProperties['weight'] =& new XCube_IntProperty('weight');
+		$this->mFormProperties['bcachetime'] =& new XCube_IntProperty('bcachetime');
+		$this->mFormProperties['bmodule'] =& new XCube_IntArrayProperty('bmodule');
+		$this->mFormProperties['groupid'] =& new XCube_IntArrayProperty('groupid');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
+		$this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
+	
+		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['name']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_NAME, '150');
+		$this->mFieldProperties['name']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_NAME, '150');
+		$this->mFieldProperties['name']->addVar('maxlength', '150');
+	
+		$this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['title']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_TITLE, '255');
+		$this->mFieldProperties['title']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_TITLE, '255');
+		$this->mFieldProperties['title']->addVar('maxlength', '255');
+	
+		$this->mFieldProperties['side'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['side']->setDependsByArray(array('required'));
+		$this->mFieldProperties['side']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_SIDE);
+	
+		$this->mFieldProperties['weight'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['weight']->setDependsByArray(array('required'));
+		$this->mFieldProperties['weight']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_WEIGHT);
+	
+		$this->mFieldProperties['bcachetime'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['bcachetime']->setDependsByArray(array('required'));
+		$this->mFieldProperties['bcachetime']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BCACHETIME);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+		$this->set('name', $obj->get('name'));
+		$this->set('title', $obj->get('title'));
+		$this->set('side', $obj->get('side'));
+		$this->set('weight', $obj->get('weight'));
+		$this->set('bcachetime', $obj->get('bcachetime'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+		$obj->set('options', implode('|', $this->get('options')));
+		$obj->set('name', $this->get('name'));
+		$obj->set('title', $this->get('title'));
+		$obj->set('side', $this->get('side'));
+		$obj->set('weight', $this->get('weight'));
+		$obj->set('bcachetime', $this->get('bcachetime'));
+
+		$obj->set('last_modified', time());
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:58:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:58:23 +0900
Subject: [xoops-cvslog 2637] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060405105823.D98FF2AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html	Wed Apr  5 19:58:23 2006
@@ -0,0 +1,97 @@
+<p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
+
+<div class="tips">
+  <{$smarty.const._AD_BASE_TIPS_BLOCK_UNINSTALL}>
+</div>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_MID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('side')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_VISIBLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_C_TYPE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_DIRNAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bcachetime')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=BlockUninstall" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html	Wed Apr  5 19:58:23 2006
@@ -0,0 +1,80 @@
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=BlockInstallEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name="side">
+          <{foreach item=side from=$columnSideArr}>
+            <option value="<{$side->getVar('id')}>"><{$side->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=bcachetime value=$actionForm->getVar('bcachetime')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='bmodule[]' multiple='multiple'>
+          <{foreach item=module from=$moduleArr}>
+            <option value="<{$module->getVar('mid')}>"><{$module->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='groupid[]' multiple='multiple'>
+          <{foreach item=group from=$groupArr}>
+            <option value="<{$group->getVar('groupid')}>"><{$group->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <{if $optionForm != null}>
+      <tr>
+        <th><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+        <td class="<{cycle values="odd,even"}>">
+          <{$optionForm}>
+        </td>
+      </tr>
+    <{/if}>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+      </td>
+    </tr>
+  </table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Wed Apr  5 19:58:23 2006
@@ -0,0 +1,61 @@
+<div style="text-align:right;">[ <a href="index.php?action=BlockInstallList"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></strong></a> ]</div>
+<br/>
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_BASE_LANG_BID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_MID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_SIDE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_VISIBLE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_VISIBLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_VISIBLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=obj from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <td><{$obj->getVar('bid')}></td>
+      <td><{$obj->getVar('mid')}></td>
+      <td><{$obj->getVar('name')}></td>
+      <td><{$obj->getVar('title')}></td>
+      <td><{$obj->getVar('side')}></td>
+      <td><{$obj->getVar('weight')}></td>
+      <td><{$obj->getVar('visible')}></td>
+      <td><{$obj->getVar('block_type')}></td>
+      <td><{$obj->getVar('c_type')}></td>
+      <td><{$obj->getVar('bcachetime')}></td>
+      <td><{$obj->getVar('last_modified')}></td>
+      <td>
+        <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Wed Apr  5 19:58:23 2006
@@ -0,0 +1,46 @@
+<div class="tips">
+  <{$smarty.const._AD_BASE_TIPS_INSTALL_BLOCK}>
+</div>
+
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_BASE_LANG_BID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_MID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_TEMPLATE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=obj from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <td><{$obj->getVar('bid')}></td>
+      <td><{$obj->mModule->getVar('name')}></td>
+      <td><{$obj->getVar('name')}></td>
+      <td><{$obj->getVar('title')}></td>
+      <td><{$obj->getVar('block_type')}></td>
+      <td><{$obj->getVar('c_type')}></td>
+      <td><{$obj->getVar('template')}></td>
+      <td>
+        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Wed Apr  5 19:58:23 2006
@@ -0,0 +1,80 @@
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=BlockEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name="side">
+          <{foreach item=side from=$columnSideArr}>
+            <option value="<{$side->getVar('id')}>"><{$side->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=bcachetime value=$actionForm->getVar('bcachetime')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='bmodule[]' multiple='multiple'>
+          <{foreach item=module from=$moduleArr}>
+            <option value="<{$module->getVar('mid')}>"><{$module->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='groupid[]' multiple='multiple'>
+          <{foreach item=group from=$groupArr}>
+            <option value="<{$group->getVar('groupid')}>"><{$group->getVar('name')}></option>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <{if $optionForm != null}>
+      <tr>
+        <th><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+        <td class="<{cycle values="odd,even"}>">
+          <{$optionForm}>
+        </td>
+      </tr>
+    <{/if}>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+      </td>
+    </tr>
+  </table>
+</form>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:58:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:58:39 +0900
Subject: [xoops-cvslog 2638] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060405105839.3316D2AC054@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u /dev/null xoops2jp/html/modules/base/class/newblocks.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:39 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Wed Apr  5 19:58:39 2006
@@ -0,0 +1,47 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class BaseNewblocksObject extends XoopsSimpleObject
+{
+	var $mModule = null;
+	
+	function BaseNewblocksObject()
+	{
+		$this->initVar('bid', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('mid', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('func_num', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('options', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 150);
+		$this->initVar('title', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('content', XOBJ_DTYPE_TEXT, '', true);
+		$this->initVar('side', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('weight', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('visible', XOBJ_DTYPE_BOOL, '0', true);
+		$this->initVar('block_type', XOBJ_DTYPE_STRING, '', true, 1);
+		$this->initVar('c_type', XOBJ_DTYPE_STRING, '', true, 1);
+		$this->initVar('isactive', XOBJ_DTYPE_BOOL, '0', true);
+		$this->initVar('dirname', XOBJ_DTYPE_STRING, '', true, 50);
+		$this->initVar('func_file', XOBJ_DTYPE_STRING, '', true, 50);
+		$this->initVar('show_func', XOBJ_DTYPE_STRING, '', true, 50);
+		$this->initVar('edit_func', XOBJ_DTYPE_STRING, '', true, 50);
+		$this->initVar('template', XOBJ_DTYPE_STRING, '', true, 50);
+		$this->initVar('bcachetime', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('last_modified', XOBJ_DTYPE_INT, '0', true);
+	}
+	
+	function loadModule()
+	{
+		$handler =& xoops_gethandler('module');
+		$this->mModule =& $handler->get($this->get('mid'));
+	}
+}
+
+class BaseNewblocksHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "newblocks";
+	var $mPrimary = "bid";
+	var $mClass = "BaseNewblocksObject";
+}
+
+?>
Index: xoops2jp/html/modules/base/class/columnside.php
diff -u /dev/null xoops2jp/html/modules/base/class/columnside.php:1.1.2.1
--- /dev/null	Wed Apr  5 19:58:39 2006
+++ xoops2jp/html/modules/base/class/columnside.php	Wed Apr  5 19:58:39 2006
@@ -0,0 +1,81 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+require_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+
+class BaseColumnsideObject extends XoopsSimpleObject
+{
+	function BaseColumnsideObject()
+	{
+		$this->initVar('id', XOBJ_DTYPE_INT, '', true);
+		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 255);
+	}
+}
+
+class BaseColumnsideHandler extends XoopsObjectHandler
+{
+	var $_mResults = array();
+	
+	function BaseColumnsideHandler(&$db)
+	{
+		$t_arr = array (
+				0 => _AD_BASE_LANG_SIDE_BLOCK_LEFT,
+				1 => _AD_BASE_LANG_SIDE_BLOCK_RIGHT,
+				3 => _AD_BASE_LANG_CENTER_BLOCK_LEFT,
+				4 => _AD_BASE_LANG_CENTER_BLOCK_RIGHT,
+				5 => _AD_BASE_LANG_CENTER_BLOCK_CENTER
+			);
+			
+		foreach ($t_arr as $id => $name) {
+			$this->_mResults[$id] =& $this->create();
+			$this->_mResults[$id]->setVar('id', $id);
+			$this->_mResults[$id]->setVar('name', $name);
+		}
+	}
+	
+	function &create()
+	{
+		$ret =& new BaseColumnsideObject();
+		return $ret;
+	}
+	
+	function get($id)
+	{
+		if (isset($this->_mResults[$id])) {
+			return $this->_mResults[$id];
+		}
+		
+		$ret = null;
+		return $ret;
+	}
+	
+	function &getObjects($criteria = null, $id_as_key = false)
+	{
+		if ($id_as_key) {
+			return $this->_mResults;
+		}
+		else {
+			$ret = array();
+		
+			foreach (array_keys($this->_mResults) as $key) {
+				$ret[] =& $this->_mResults[$key];
+			}
+			
+			return $ret;
+		}
+	}
+	
+	function insert(&$obj)
+	{
+		return false;
+	}
+
+	function delete(&$obj)
+	{
+		return false;
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:59:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:59:03 +0900
Subject: [xoops-cvslog 2639] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060405105903.C3E812AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.11 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.12
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.11	Sun Mar 26 15:07:43 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Wed Apr  5 19:59:03 2006
@@ -1,10 +1,32 @@
 <?php
 
+define('_MI_BASE_BLOCK_COMMENTS_DESC', "最近のコメント一覧を表示します");
+define('_MI_BASE_BLOCK_COMMENTS_NAME', "最近のコメント");
+define('_MI_BASE_BLOCK_MAINMENU_DESC', "メインメニューを表示します");
+define('_MI_BASE_BLOCK_MAINMENU_NAME', "メインメニュー");
+define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "イベント通知の設定フォームを表示します");
+define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "イベント通知設定");
+define('_MI_BASE_BLOCK_SEARCH_DESC', "検索フォームを表示します");
+define('_MI_BASE_BLOCK_SEARCH_NAME', "検索");
+define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します");
+define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報");
+define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します");
+define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー");
+define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します");
+define('_MI_BASE_BLOCK_WAITING_NAME', "承認待ちコンテンツ");
+define('_MI_BASE_KEYWORD_BLOCKINSTALL', "ブロック 新規");
+define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
 define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
 define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
 define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
 define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
+define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
 define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
+define('_MI_BASE_MENU_BLOCKINSTALL', "ブロックのインストール");
+define('_MI_BASE_MENU_BLOCKLIST', "ブロックの管理");
 define('_MI_BASE_MENU_COMMENT_MANAGE', "コメントの管理");
 define('_MI_BASE_MENU_CREATE_SMILES', "顔アイコンの新規作成");
 define('_MI_BASE_MENU_MODULEINSTALL', "モジュールのインストール");
@@ -13,18 +35,4 @@
 define('_MI_BASE_NAME', "互換モジュール");
 define('_MI_BASE_NAME_DESC', "XOOPS Cube にXOOPS 2.0.x シリーズの互換性を与えます");
 
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "メインメニュー");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "メインメニューを表示します");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "検索");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "検索フォームを表示します");
-define('_MI_BASE_BLOCK_WAITING_NAME', "承認待ちコンテンツ");
-define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します");
-define('_MI_BASE_BLOCK_COMMENTS_NAME',"最近のコメント");
-define('_MI_BASE_BLOCK_COMMENTS_DESC',"最近のコメント一覧を表示します");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "イベント通知設定");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "イベント通知の設定フォームを表示します");
 ?>
Index: xoops2jp/html/modules/base/language/japanese/xoops2.html
diff -u xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.2 xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.3
--- xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.2	Thu Feb  2 23:13:38 2006
+++ xoops2jp/html/modules/base/language/japanese/xoops2.html	Wed Apr  5 19:59:03 2006
@@ -26,6 +26,15 @@
 <li>ＤＢテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。</li>
 </ul>
 
+<font color='red'>New!</font>
+<h5>ブロックの管理</h5>
+<ul>
+<li>XOOPS Cube 2.1 + Legacy モジュールでは、ブロックの考え方を整理し、「可視／不可視」をモジュール同様、<strong>インストール</strong>という概念で考えています。</li>
+<li>モジュールをインストールするとブロックも XOOPS Cube + Legacy に登録されますが、使用可能な状態ではありません。モジュールと同様に、ブロックのインストールリストへ進み、導入したいブロックのインストールアイコンをクリックしてください。</li>
+<li>アンインストールすると、そのブロックはインストール候補リストに戻ります。</li>
+<li>XOOPS Cube 2.1 では非インストールブロックには権限の概念も、アサイン列の概念も、アサインモジュールの概念もありません。ただし、設定は記憶されており、再インストール時の初期値は最後のパラメータが使用されます。</li>
+</ul>
+
 <h5>TODO</h5>
 <ul>
 <li>baseモジュールからlegacyモジュールへ名称を変更する予定です。</li>
Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.9 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.10
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.9	Sat Feb  4 12:37:35 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Wed Apr  5 19:59:03 2006
@@ -1,75 +1,95 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
-define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_MD_BASE_LANG_CODE', "code");
-define('_MD_BASE_LANG_COM_CREATED', "作成日時");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "アイコン");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
-define('_MD_BASE_LANG_COM_MODID', "モジュールID");
-define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_SIG', "署名");
-define('_MD_BASE_LANG_COM_STATUS', "ステータス");
-define('_MD_BASE_LANG_COM_TEXT', "コメント");
-define('_MD_BASE_LANG_COM_TITLE', "表題");
-define('_MD_BASE_LANG_COM_UID', "UID");
-define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
-define('_MD_BASE_LANG_CONTROL', "control");
-define('_MD_BASE_LANG_CREATE_NEW', "create new");
-define('_MD_BASE_LANG_DISPLAY', "display");
-define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
-define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
-define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
-define('_MD_BASE_LANG_EMOTION', "emotion");
-define('_MD_BASE_LANG_ID', "ID");
-define('_MD_BASE_LANG_IMAGE', "image");
-define('_MD_BASE_LANG_SMILE_URL', "smile url");
-define('_MD_BASE_LANG_SUBMIT', "送信");
-define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
-define('_MSC_AVAVATARS', "アバター一覧");
-define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
-define('_MSC_CODE', "顔文字");
-define('_MSC_EMOTION', "意味");
-define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
-define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
-define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
-define('_MSC_FRIENDEMAILC', "友達のEmail： ");
-define('_MSC_FRIENDNAMEC', "友達の名前： ");
-define('_MSC_INTSITE', "お薦めサイト： %s");
-define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
-define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
-define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
-define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
-define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
-define('_MSC_SMILIES', "顔アイコン");
-define('_MSC_YOUREMAILC', "あなたのEmail： ");
-define('_MSC_YOURNAMEC', "あなたの名前： ");
-define('_SR_ALL', "すべて（AND検索）");
-define('_SR_ANY', "いずれか（OR検索）");
-define('_SR_EXACT', "フレーズ");
-define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
-define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
-define('_SR_KEYIGNORE', "文字数が ");
-define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
-define('_SR_KEYWORDS', "キーワード");
-define('_SR_NEXT', "次のページ >>");
-define('_SR_NOMATCH', "該当データなし。");
-define('_SR_PLZENTER', "必要なデータを全て入力してください。");
-define('_SR_PREVIOUS', "<< 前のページ");
-define('_SR_SEARCH', "検索");
-define('_SR_SEARCHIN', "検索対象のモジュール");
-define('_SR_SEARCHRESULTS', "検索結果");
-define('_SR_SEARCHRULE', "検索のルール");
-define('_SR_SHOWALLR', "すべて表示");
-define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
-define('_SR_TYPE', "検索の種類");
-
-?>
+<?php
+
+define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
+define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
+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_CODE', "code");
+define('_MD_BASE_LANG_COM_CREATED', "作成日時");
+define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_MD_BASE_LANG_COM_ICON', "アイコン");
+define('_MD_BASE_LANG_COM_ID', "ID");
+define('_MD_BASE_LANG_COM_IP', "IP");
+define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
+define('_MD_BASE_LANG_COM_MODID', "モジュールID");
+define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
+define('_MD_BASE_LANG_COM_PID', "PID");
+define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_MD_BASE_LANG_COM_SIG', "署名");
+define('_MD_BASE_LANG_COM_STATUS', "ステータス");
+define('_MD_BASE_LANG_COM_TEXT', "コメント");
+define('_MD_BASE_LANG_COM_TITLE', "表題");
+define('_MD_BASE_LANG_COM_UID', "UID");
+define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
+define('_MD_BASE_LANG_CONTENT', "content");
+define('_MD_BASE_LANG_CONTROL', "control");
+define('_MD_BASE_LANG_CREATE_NEW', "create new");
+define('_MD_BASE_LANG_DIRNAME', "dirname");
+define('_MD_BASE_LANG_DISPLAY', "display");
+define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
+define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
+define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
+define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
+define('_MD_BASE_LANG_EMOTION', "emotion");
+define('_MD_BASE_LANG_FUNC_FILE', "func file");
+define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_ID', "ID");
+define('_MD_BASE_LANG_IMAGE', "image");
+define('_MD_BASE_LANG_ISACTIVE', "isactive");
+define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_MD_BASE_LANG_MID', "mid");
+define('_MD_BASE_LANG_NAME', "name");
+define('_MD_BASE_LANG_OPTIONS', "options");
+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_SUBMIT', "送信");
+define('_MD_BASE_LANG_TEMPLATE', "template");
+define('_MD_BASE_LANG_TITLE', "title");
+define('_MD_BASE_LANG_VISIBLE', "visible");
+define('_MD_BASE_LANG_WEIGHT', "weight");
+define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MSC_AVAVATARS', "アバター一覧");
+define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
+define('_MSC_CODE', "顔文字");
+define('_MSC_EMOTION', "意味");
+define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
+define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
+define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
+define('_MSC_FRIENDEMAILC', "友達のEmail： ");
+define('_MSC_FRIENDNAMEC', "友達の名前： ");
+define('_MSC_INTSITE', "お薦めサイト： %s");
+define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
+define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
+define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
+define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
+define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
+define('_MSC_SMILIES', "顔アイコン");
+define('_MSC_YOUREMAILC', "あなたのEmail： ");
+define('_MSC_YOURNAMEC', "あなたの名前： ");
+define('_SR_ALL', "すべて（AND検索）");
+define('_SR_ANY', "いずれか（OR検索）");
+define('_SR_EXACT', "フレーズ");
+define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
+define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
+define('_SR_KEYIGNORE', "文字数が ");
+define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
+define('_SR_KEYWORDS', "キーワード");
+define('_SR_NEXT', "次のページ >>");
+define('_SR_NOMATCH', "該当データなし。");
+define('_SR_PLZENTER', "必要なデータを全て入力してください。");
+define('_SR_PREVIOUS', "<< 前のページ");
+define('_SR_SEARCH', "検索");
+define('_SR_SEARCHIN', "検索対象のモジュール");
+define('_SR_SEARCHRESULTS', "検索結果");
+define('_SR_SEARCHRULE', "検索のルール");
+define('_SR_SHOWALLR', "すべて表示");
+define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
+define('_SR_TYPE', "検索の種類");
+
+?>
Index: xoops2jp/html/modules/base/language/japanese/admin.php
diff -u xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.22 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.23
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.22	Thu Mar 30 23:51:53 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Wed Apr  5 19:59:03 2006
@@ -4,10 +4,19 @@
 define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
 define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+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_LANG_ALL_STATUS', "すべてのステータス");
+define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
+define('_AD_BASE_LANG_BID', "bid");
+define('_AD_BASE_LANG_BLOCK_INSTALL', "ブロックのインストール");
+define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
+define('_AD_BASE_LANG_C_TYPE', "c type");
+define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
+define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
+define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block right");
 define('_AD_BASE_LANG_CODE', "コード");
 define('_AD_BASE_LANG_COM_CREATED', "作成日時");
 define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
@@ -28,29 +37,51 @@
 define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集");
 define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加");
 define('_AD_BASE_LANG_COMMENT_VIEW', "コメント閲覧");
+define('_AD_BASE_LANG_CONTENT', "content");
 define('_AD_BASE_LANG_CONTROL', "コントロール");
 define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
+define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "表示");
 define('_AD_BASE_LANG_DOBR', "改行を自動挿入する");
 define('_AD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
 define('_AD_BASE_LANG_DOIMAGE', "doimage");
 define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
 define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
+define('_AD_BASE_LANG_EDIT_FUNC', "edit func");
 define('_AD_BASE_LANG_EMOTION', "意味");
+define('_AD_BASE_LANG_FUNC_FILE', "func file");
+define('_AD_BASE_LANG_FUNC_NUM', "func num");
 define('_AD_BASE_LANG_ID', "ID");
+define('_AD_BASE_LANG_ISACTIVE', "isactive");
+define('_AD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_AD_BASE_LANG_MID', "mid");
+define('_AD_BASE_LANG_NAME', "name");
 define('_AD_BASE_LANG_ONLINE_IP', "online ip");
 define('_AD_BASE_LANG_ONLINE_MODULE', "online module");
 define('_AD_BASE_LANG_ONLINE_UID', "online uid");
 define('_AD_BASE_LANG_ONLINE_UNAME', "online uname");
 define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated");
+define('_AD_BASE_LANG_OPTIONS', "options");
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス");
+define('_AD_BASE_LANG_SHOW_FUNC', "show func");
+define('_AD_BASE_LANG_SIDE', "side");
+define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block left");
+define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block right");
 define('_AD_BASE_LANG_SMILE_URL', "画像");
 define('_AD_BASE_LANG_SMILES_DELETE', "顔アイコン削除");
 define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");
 define('_AD_BASE_LANG_SMILES_NEW', "顔アイコン新規追加");
 define('_AD_BASE_LANG_SUBMIT', "送信");
+define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
+define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
+define('_AD_BASE_LANG_TEMPLATE', "template");
+define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_VISIBLE', "visible");
+define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
+define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "Ｑ：ブロックをアンインストールすると？<br/>Ａ：<strong>すべての設定を記録したまま</strong>、表示やリストから消えます。設定を記録してますので、簡単に再インストールすることができます。");
+define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。<br/>管理メニューの位置を忘れたときに使いましょう (例)利用許諾文");
 define('_MB_A_BASE_LANG_MENU', "メニュー");

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:59:03 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:59:03 +0900
Subject: [xoops-cvslog 2640] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060405105903.EA2DE2AC054@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/modinfo.php
diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.11 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.12
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.11	Sun Mar 26 15:07:43 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Wed Apr  5 19:59:03 2006
@@ -1,10 +1,32 @@
 <?php
 
+define('_MI_BASE_BLOCK_COMMENTS_DESC', "Shows most recent comments");
+define('_MI_BASE_BLOCK_COMMENTS_NAME', "Recent Comments");
+define('_MI_BASE_BLOCK_MAINMENU_DESC', "Shows the main navigation menu of the site");
+define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu");
+define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options");
+define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options");
+define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search form block");
+define('_MI_BASE_BLOCK_SEARCH_NAME', "Search");
+define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic info about the site and a link to Recommend Us pop up window");
+define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info");
+define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block");
+define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu");
+define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval");
+define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents");
+define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new");
+define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
 define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload");
 define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new");
 define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
 define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list");
+define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
 define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
+define('_MI_BASE_MENU_BLOCKINSTALL', "Install block");
+define('_MI_BASE_MENU_BLOCKLIST', "BlockList");
 define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment manage");
 define('_MI_BASE_MENU_CREATE_SMILES', "Create smiles");
 define('_MI_BASE_MENU_MODULEINSTALL', "Install module");
@@ -15,18 +37,4 @@
 define('_MI_PROFILE_BASE_CONTROLLER', "This system attaches great importance to the compatibility with XOOPS 2.0.x.<br/>Pre-road mechanism of this module is very flexible, but it is low speed.<br/>");
 define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.<br/>This system can use themes of Xoops2.0.x rightly.");
 
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "Shows the main navigation menu of the site");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "Search");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search form block");
-define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents");
-define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic info about the site and a link to Recommend Us pop up window");
-define('_MI_BASE_BLOCK_COMMENTS_NAME', "Recent Comments");
-define('_MI_BASE_BLOCK_COMMENTS_DESC', "Shows most recent comments");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options");
 ?>
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.18 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.19
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.18	Thu Mar 30 23:51:54 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Wed Apr  5 19:59:03 2006
@@ -4,10 +4,19 @@
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
 define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+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_LANG_ALL_STATUS', "All status");
+define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
+define('_AD_BASE_LANG_BID', "bid");
+define('_AD_BASE_LANG_BLOCK_INSTALL', "block install");
+define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
+define('_AD_BASE_LANG_C_TYPE', "c type");
+define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
+define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
+define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block right");
 define('_AD_BASE_LANG_CODE', "Code");
 define('_AD_BASE_LANG_COM_CREATED', "Created");
 define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
@@ -28,29 +37,51 @@
 define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment");
 define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment");
 define('_AD_BASE_LANG_COMMENT_VIEW', "Comment view");
+define('_AD_BASE_LANG_CONTENT', "content");
 define('_AD_BASE_LANG_CONTROL', "Control");
 define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
+define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
 define('_AD_BASE_LANG_DOHTML', "Enable HTML tags");
 define('_AD_BASE_LANG_DOIMAGE', "doimage");
 define('_AD_BASE_LANG_DOSMILEY', "Use smilies");
 define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code");
+define('_AD_BASE_LANG_EDIT_FUNC', "edit func");
 define('_AD_BASE_LANG_EMOTION', "Emotion");
+define('_AD_BASE_LANG_FUNC_FILE', "func file");
+define('_AD_BASE_LANG_FUNC_NUM', "func num");
 define('_AD_BASE_LANG_ID', "ID");
+define('_AD_BASE_LANG_ISACTIVE', "isactive");
+define('_AD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_AD_BASE_LANG_MID', "mid");
+define('_AD_BASE_LANG_NAME', "name");
 define('_AD_BASE_LANG_ONLINE_IP', "online ip");
 define('_AD_BASE_LANG_ONLINE_MODULE', "online module");
 define('_AD_BASE_LANG_ONLINE_UID', "online uid");
 define('_AD_BASE_LANG_ONLINE_UNAME', "online uname");
 define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated");
+define('_AD_BASE_LANG_OPTIONS', "options");
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment");
+define('_AD_BASE_LANG_SHOW_FUNC', "show func");
+define('_AD_BASE_LANG_SIDE', "side");
+define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block left");
+define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block right");
 define('_AD_BASE_LANG_SMILE_URL', "Images");
 define('_AD_BASE_LANG_SMILES_DELETE', "Delete smiley");
 define('_AD_BASE_LANG_SMILES_EDIT', "Edit smiley");
 define('_AD_BASE_LANG_SMILES_NEW', "add a smiley");
 define('_AD_BASE_LANG_SUBMIT', "Submit");
+define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
+define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
+define('_AD_BASE_LANG_TEMPLATE', "template");
+define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_VISIBLE', "visible");
+define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Confirm to delete");
+define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "block uninstall");
+define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block.");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search....");
 define('_MB_A_BASE_LANG_MENU', "Menu");

From minahito ＠ users.sourceforge.jp  Wed Apr  5 19:59:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 19:59:49 +0900
Subject: [xoops-cvslog 2641] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060405105949.AF3802AC02D@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.10 xoops2jp/html/modules/base/language/english/main.php:1.1.2.11
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.10	Sat Feb  4 16:50:14 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Wed Apr  5 19:59:49 2006
@@ -1,75 +1,95 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
-define('_MD_BASE_ERROR_REQUIRED', "{0} is required.");
-define('_MD_BASE_LANG_CODE', "code");
-define('_MD_BASE_LANG_COM_CREATED', "Created");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "Icon");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
-define('_MD_BASE_LANG_COM_MODID', "Module ID");
-define('_MD_BASE_LANG_COM_MODIFIED', "Modified");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_SIG', "Signature");
-define('_MD_BASE_LANG_COM_STATUS', "Status");
-define('_MD_BASE_LANG_COM_TEXT', "Comment");
-define('_MD_BASE_LANG_COM_TITLE', "Title");
-define('_MD_BASE_LANG_COM_UID', "UID");
-define('_MD_BASE_LANG_COMMENT_RULE', "Comment rules");
-define('_MD_BASE_LANG_CONTROL', "control");
-define('_MD_BASE_LANG_CREATE_NEW', "create new");
-define('_MD_BASE_LANG_DISPLAY', "display");
-define('_MD_BASE_LANG_DOBR', "Insert line-break automatically");
-define('_MD_BASE_LANG_DOHTML', "enable HTML tags");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
-define('_MD_BASE_LANG_DOXCODE', "enable XOOPS code");
-define('_MD_BASE_LANG_EMOTION', "emotion");
-define('_MD_BASE_LANG_ID', "ID");
-define('_MD_BASE_LANG_IMAGE', "image");
-define('_MD_BASE_LANG_SMILE_URL', "Image");
-define('_MD_BASE_LANG_SUBMIT', "Submit");
-define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
-define('_MSC_AVAVATARS', "Available Avatars");
-define('_MSC_CLICKASMILIE', "Click a smilie to insert it into your message.");
-define('_MSC_CODE', "Code");
-define('_MSC_EMOTION', "Emotion");
-define('_MSC_ENTERFMAIL', "Please enter your friend's email address.");
-define('_MSC_ENTERFNAME', "Please enter your friend's name.");
-define('_MSC_ENTERYNAME', "Please enter your name.");
-define('_MSC_FRIENDEMAILC', "Friend's Email: ");
-define('_MSC_FRIENDNAMEC', "Friend's Name: ");
-define('_MSC_INTSITE', "Recommended site: %s");
-define('_MSC_INVALIDEMAIL1', "Invalid email address.");
-define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
-define('_MSC_NEEDINFO', "You must fill in required field.");
-define('_MSC_RECOMMENDSITE', "Recommend this site to a friend");
-define('_MSC_REFERENCESENT', "Your favorable message has been sent to your friend. Thank you!");
-define('_MSC_SMILIES', "Smilies");
-define('_MSC_YOUREMAILC', "Your Email: ");
-define('_MSC_YOURNAMEC', "Your Name: ");
-define('_SR_ALL', "All (AND)");
-define('_SR_ANY', "Any (OR)");
-define('_SR_EXACT', "Exact Match");
-define('_SR_FOUND', "Found ");
-define('_SR_IGNOREDWORDS', "The following words are shorter than allowed minmum length (%u chars) and were not included in your search:");
-define('_SR_KEYIGNORE', "Keywords shorter than ");
-define('_SR_KEYTOOSHORT', "Keywords must be at least ");
-define('_SR_KEYWORDS', "Keyword(s)");
-define('_SR_NEXT', "Next >>");
-define('_SR_NOMATCH', "No entries found that match your query.");
-define('_SR_PLZENTER', "Please enter all required data!");
-define('_SR_PREVIOUS', "<< Previous");
-define('_SR_SEARCH', "Search");
-define('_SR_SEARCHIN', "Search in");
-define('_SR_SEARCHRESULTS', "Search Results");
-define('_SR_SEARCHRULE', "Seach Rule");
-define('_SR_SHOWALLR', "Show all results");
-define('_SR_SHOWING', "(Showing %d - %d)");
-define('_SR_TYPE', "Type");
-
-?>
+<?php
+
+define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
+define('_MD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_MD_BASE_ERROR_REQUIRED', "{0} is required.");
+define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
+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_CODE', "code");
+define('_MD_BASE_LANG_COM_CREATED', "Created");
+define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_MD_BASE_LANG_COM_ICON', "Icon");
+define('_MD_BASE_LANG_COM_ID', "ID");
+define('_MD_BASE_LANG_COM_IP', "IP");
+define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
+define('_MD_BASE_LANG_COM_MODID', "Module ID");
+define('_MD_BASE_LANG_COM_MODIFIED', "Modified");
+define('_MD_BASE_LANG_COM_PID', "PID");
+define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_MD_BASE_LANG_COM_SIG', "Signature");
+define('_MD_BASE_LANG_COM_STATUS', "Status");
+define('_MD_BASE_LANG_COM_TEXT', "Comment");
+define('_MD_BASE_LANG_COM_TITLE', "Title");
+define('_MD_BASE_LANG_COM_UID', "UID");
+define('_MD_BASE_LANG_COMMENT_RULE', "Comment rules");
+define('_MD_BASE_LANG_CONTENT', "content");
+define('_MD_BASE_LANG_CONTROL', "control");
+define('_MD_BASE_LANG_CREATE_NEW', "create new");
+define('_MD_BASE_LANG_DIRNAME', "dirname");
+define('_MD_BASE_LANG_DISPLAY', "display");
+define('_MD_BASE_LANG_DOBR', "Insert line-break automatically");
+define('_MD_BASE_LANG_DOHTML', "enable HTML tags");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "Use smilies");
+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_FUNC_FILE', "func file");
+define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_ID', "ID");
+define('_MD_BASE_LANG_IMAGE', "image");
+define('_MD_BASE_LANG_ISACTIVE', "isactive");
+define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_MD_BASE_LANG_MID', "mid");
+define('_MD_BASE_LANG_NAME', "name");
+define('_MD_BASE_LANG_OPTIONS', "options");
+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_SUBMIT', "Submit");
+define('_MD_BASE_LANG_TEMPLATE', "template");
+define('_MD_BASE_LANG_TITLE', "title");
+define('_MD_BASE_LANG_VISIBLE', "visible");
+define('_MD_BASE_LANG_WEIGHT', "weight");
+define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MSC_AVAVATARS', "Available Avatars");
+define('_MSC_CLICKASMILIE', "Click a smilie to insert it into your message.");
+define('_MSC_CODE', "Code");
+define('_MSC_EMOTION', "Emotion");
+define('_MSC_ENTERFMAIL', "Please enter your friend's email address.");
+define('_MSC_ENTERFNAME', "Please enter your friend's name.");
+define('_MSC_ENTERYNAME', "Please enter your name.");
+define('_MSC_FRIENDEMAILC', "Friend's Email: ");
+define('_MSC_FRIENDNAMEC', "Friend's Name: ");
+define('_MSC_INTSITE', "Recommended site: %s");
+define('_MSC_INVALIDEMAIL1', "Invalid email address.");
+define('_MSC_INVALIDEMAIL2', "Please check the address and try again.");
+define('_MSC_NEEDINFO', "You must fill in required field.");
+define('_MSC_RECOMMENDSITE', "Recommend this site to a friend");
+define('_MSC_REFERENCESENT', "Your favorable message has been sent to your friend. Thank you!");
+define('_MSC_SMILIES', "Smilies");
+define('_MSC_YOUREMAILC', "Your Email: ");
+define('_MSC_YOURNAMEC', "Your Name: ");
+define('_SR_ALL', "All (AND)");
+define('_SR_ANY', "Any (OR)");
+define('_SR_EXACT', "Exact Match");
+define('_SR_FOUND', "Found ");
+define('_SR_IGNOREDWORDS', "The following words are shorter than allowed minmum length (%u chars) and were not included in your search:");
+define('_SR_KEYIGNORE', "Keywords shorter than ");
+define('_SR_KEYTOOSHORT', "Keywords must be at least ");
+define('_SR_KEYWORDS', "Keyword(s)");
+define('_SR_NEXT', "Next >>");
+define('_SR_NOMATCH', "No entries found that match your query.");
+define('_SR_PLZENTER', "Please enter all required data!");
+define('_SR_PREVIOUS', "<< Previous");
+define('_SR_SEARCH', "Search");
+define('_SR_SEARCHIN', "Search in");
+define('_SR_SEARCHRESULTS', "Search Results");
+define('_SR_SEARCHRULE', "Seach Rule");
+define('_SR_SHOWALLR', "Show all results");
+define('_SR_SHOWING', "(Showing %d - %d)");
+define('_SR_TYPE', "Type");
+
+?>

From minahito ＠ users.sourceforge.jp  Wed Apr  5 20:00:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed,  5 Apr 2006 20:00:38 +0900
Subject: [xoops-cvslog 2642] CVS update: xoops2jp/html/kernel
Message-ID: <20060405110038.1C72B2AC054@users.sourceforge.jp>

Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.7 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.8
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.7	Sun Apr  2 22:06:01 2006
+++ xoops2jp/html/kernel/XCube_Controller.class.php	Wed Apr  5 20:00:37 2006
@@ -1,5 +1,7 @@
 <?php
 
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
 require_once XOOPS_ROOT_PATH."/class/XCube_ActionFilter.class.php";
 require_once XOOPS_ROOT_PATH."/class/XCube_ModuleController.class.php";
 require_once XOOPS_ROOT_PATH."/class/XCube_BlockProcedure.class.php";

From minahito ＠ users.sourceforge.jp  Thu Apr  6 12:37:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 12:37:37 +0900
Subject: [xoops-cvslog 2643] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060406033737.9E3EB2AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u xoops2jp/html/modules/base/class/newblocks.php:1.1.2.1 xoops2jp/html/modules/base/class/newblocks.php:1.1.2.2
--- xoops2jp/html/modules/base/class/newblocks.php:1.1.2.1	Wed Apr  5 19:58:39 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Thu Apr  6 12:37:37 2006
@@ -6,6 +6,12 @@
 {
 	var $mModule = null;
 	
+	/**
+	 * Array of group objects who can access this object.
+	 * It need lazy loading to access.
+	 */
+	var $mGroup = null;
+	
 	function BaseNewblocksObject()
 	{
 		$this->initVar('bid', XOBJ_DTYPE_INT, '', true);
@@ -35,6 +41,27 @@
 		$handler =& xoops_gethandler('module');
 		$this->mModule =& $handler->get($this->get('mid'));
 	}
+
+	/**
+	 * Load group objects who can access this object. And, set the objects to mGroup.
+	 * 
+	 * TODO Need lock double loading.
+	 */	
+	function loadGroup()
+	{
+		$handler =& xoops_gethandler('groupperm');
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('gperm_modid', 1));
+		$criteria->add(new Criteria('gperm_itemid', $this->get('bid')));
+		$criteria->add(new Criteria('gperm_name', 'block_read'));
+		
+		$gpermArr =&  $handler->getObjects($criteria);
+		
+		$handler =& xoops_gethandler('group');
+		foreach ($gpermArr as $gperm) {
+			$this->mGroup[] =& $handler->get($gperm->get('gperm_groupid'));
+		}
+	}
 }
 
 class BaseNewblocksHandler extends XoopsObjectGenericHandler

From minahito ＠ users.sourceforge.jp  Thu Apr  6 12:37:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 12:37:57 +0900
Subject: [xoops-cvslog 2644] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060406033757.CD93A2AC0A3@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.1 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Thu Apr  6 12:37:57 2006
@@ -25,9 +25,7 @@
       <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
-          <{foreach item=side from=$columnSideArr}>
-            <option value="<{$side->getVar('id')}>"><{$side->getVar('name')}></option>
-          <{/foreach}>
+          <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
         </select>
       </td>
     </tr>
@@ -47,9 +45,7 @@
       <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
-          <{foreach item=module from=$moduleArr}>
-            <option value="<{$module->getVar('mid')}>"><{$module->getVar('name')}></option>
-          <{/foreach}>
+          <{xoops_optionsArray from=$moduleArr label=name value=mid}>
         </select>
       </td>
     </tr>
@@ -57,9 +53,7 @@
       <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
-          <{foreach item=group from=$groupArr}>
-            <option value="<{$group->getVar('groupid')}>"><{$group->getVar('name')}></option>
-          <{/foreach}>
+          <{xoops_optionsArray from=$groupArr value=groupid label=name}>
         </select>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 12:38:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 12:38:20 +0900
Subject: [xoops-cvslog 2645] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406033820.ED2012AC013@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.1	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Thu Apr  6 12:38:20 2006
@@ -38,9 +38,10 @@
 		// lazy loading
 		//
 		$this->mObject->loadModule();
+		$this->mObject->loadGroup();
 		
 		$render->setAttribute('object', $this->mObject);
-
+		
 		$handler =& xoops_gethandler('module');
 		$moduleArr =& $handler->getObjects();
 		$render->setAttribute('moduleArr', $moduleArr);

From minahito ＠ users.sourceforge.jp  Thu Apr  6 12:38:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 12:38:37 +0900
Subject: [xoops-cvslog 2646] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20060406033837.E7E882AC013@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php
diff -u /dev/null xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.1
--- /dev/null	Thu Apr  6 12:38:37 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Thu Apr  6 12:38:37 2006
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * Type:     function
+ * Name:     xoops_optionsArray
+ * Version:  0.1
+ * Date:     Apr 6, 2006
+ * Author:   minahito
+ * Purpose:  Build option tags from array of object who have value and text in 
+             own properties.
+ * Input:    from = template variable that is array of object 
+ *           label = property name to get the text.
+ *           value = property name to get the value.
+ *           default = selected value. variable (include Array).
+ * 
+ * -------------------------------------------------------------
+ */
+function smarty_function_xoops_optionsArray($params, &$smarty)
+{
+	//
+	// We should check more.
+	//
+	$tags = "";
+	$objectArr =& $params['from'];
+	$default = isset($params['default']) ? $params['default'] : null;
+
+	foreach ($objectArr as $object) {
+		$value = htmlspecialchars($object->get($params['value']), ENT_QUOTES);
+		$label = htmlspecialchars($object->get($params['label']), ENT_QUOTES);
+		
+		$selected = "";
+		if (is_array($default) && in_array($default, $object->get($params['value']))) {
+			$selected = " selected";
+		}
+		elseif (!is_array($default) && $object->get($params['value']) == $default) {
+			$selected = " selected";
+		}
+		
+		$tags .= "<option value=\"${value}\"${selected}>${label}</option>\n";
+	}
+	
+	print $tags;
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 13:20:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 13:20:53 +0900
Subject: [xoops-cvslog 2647] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20060406042053.C52942AC013@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php
diff -u xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.1 xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.2
--- xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php:1.1.2.1	Thu Apr  6 12:38:37 2006
+++ xoops2jp/html/class/smarty/plugins/function.xoops_optionsArray.php	Thu Apr  6 13:20:53 2006
@@ -31,7 +31,7 @@
 		$label = htmlspecialchars($object->get($params['label']), ENT_QUOTES);
 		
 		$selected = "";
-		if (is_array($default) && in_array($default, $object->get($params['value']))) {
+		if (is_array($default) && in_array($object->get($params['value']), $default)) {
 			$selected = " selected";
 		}
 		elseif (!is_array($default) && $object->get($params['value']) == $default) {

From minahito ＠ users.sourceforge.jp  Thu Apr  6 14:58:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 14:58:32 +0900
Subject: [xoops-cvslog 2648] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060406055832.17EBF2AC04F@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.19 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.20
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.19	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Thu Apr  6 14:58:31 2006
@@ -8,6 +8,7 @@
 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_LANG_ALL_MODULES', "All modules");
 define('_AD_BASE_LANG_ALL_STATUS', "All status");
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
 define('_AD_BASE_LANG_BID', "bid");
@@ -76,6 +77,7 @@
 define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
 define('_AD_BASE_LANG_TEMPLATE', "template");
 define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_TOPPAGE', "Toppage");
 define('_AD_BASE_LANG_VISIBLE', "visible");
 define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");

From minahito ＠ users.sourceforge.jp  Thu Apr  6 14:58:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 14:58:41 +0900
Subject: [xoops-cvslog 2649] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060406055841.6391B2AC04F@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.23 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.24
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.23	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Thu Apr  6 14:58:41 2006
@@ -8,6 +8,7 @@
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい");
+define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール");
 define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス");
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
 define('_AD_BASE_LANG_BID', "bid");
@@ -76,6 +77,7 @@
 define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
 define('_AD_BASE_LANG_TEMPLATE', "template");
 define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_TOPPAGE', "トップページ");
 define('_AD_BASE_LANG_VISIBLE', "visible");
 define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");

From minahito ＠ users.sourceforge.jp  Thu Apr  6 14:59:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 14:59:33 +0900
Subject: [xoops-cvslog 2650] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060406055933.644812AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/block_module_link.php
diff -u /dev/null xoops2jp/html/modules/base/class/block_module_link.php:1.1.2.1
--- /dev/null	Thu Apr  6 14:59:33 2006
+++ xoops2jp/html/modules/base/class/block_module_link.php	Thu Apr  6 14:59:33 2006
@@ -0,0 +1,21 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class BaseBlock_module_linkObject extends XoopsSimpleObject
+{
+	function BaseBlock_module_linkObject()
+	{
+		$this->initVar('block_id', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('module_id', XOBJ_DTYPE_INT, '0', true);
+	}
+}
+
+class BaseBlock_module_linkHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "block_module_link";
+	var $mPrimary = "block_id";
+	var $mClass = "BaseBlock_module_linkObject";
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:00:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:00:25 +0900
Subject: [xoops-cvslog 2651] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060406060025.B04B42AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u xoops2jp/html/modules/base/class/newblocks.php:1.1.2.2 xoops2jp/html/modules/base/class/newblocks.php:1.1.2.3
--- xoops2jp/html/modules/base/class/newblocks.php:1.1.2.2	Thu Apr  6 12:37:37 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Thu Apr  6 15:00:25 2006
@@ -10,8 +10,14 @@
 	 * Array of group objects who can access this object.
 	 * It need lazy loading to access.
 	 */
-	var $mGroup = null;
+	var $mGroup = array();
 	
+	var $mBmodule = array();
+	
+	var $mColumn = null;
+	
+	var $mCachetime = null;
+
 	function BaseNewblocksObject()
 	{
 		$this->initVar('bid', XOBJ_DTYPE_INT, '', true);
@@ -62,6 +68,26 @@
 			$this->mGroup[] =& $handler->get($gperm->get('gperm_groupid'));
 		}
 	}
+	
+	function loadBmodule()
+	{
+		$handler =& xoops_getmodulehandler('block_module_link', 'base');
+		$criteria =& new Criteria('block_id', $this->get('bid'));
+		
+		$this->mBmodule =& $handler->getObjects($criteria);
+	}
+	
+	function loadColumn()
+	{
+		$handler =& xoops_getmodulehandler('columnside', 'base');
+		$this->mColumn =& $handler->get($this->get('side'));
+	}
+	
+	function loadCachetime()
+	{
+		$handler =& xoops_gethandler('cachetime');
+		$this->mCachetime =& $handler->get($this->get('bcachetime'));
+	}
 }
 
 class BaseNewblocksHandler extends XoopsObjectGenericHandler
@@ -69,6 +95,61 @@
 	var $mTable = "newblocks";
 	var $mPrimary = "bid";
 	var $mClass = "BaseNewblocksObject";
+	
+	function insert(&$obj, $force=false)
+	{
+		if (parent::insert($obj, $force)) {
+			$handler =& xoops_getmodulehandler('block_module_link', 'base');
+			$handler->deleteAll(new Criteria('block_id', $obj->get('bid')));
+			foreach ($obj->mBmodule as $bmodule) {
+				$handler->insert($bmodule);
+			}
+
+			//
+			// Insert group permissions.
+			//
+			$currentGroupid = array();
+			foreach ($obj->mGroup as $group) {
+				$currentGroupid[] = $group->get('groupid');
+			}
+			
+			$permHandler =& xoops_gethandler('groupperm');
+			$criteria =& new CriteriaCompo();
+			$criteria->add(new Criteria('gperm_modid', 1));
+			$criteria->add(new Criteria('gperm_itemid', $obj->get('bid')));
+			$criteria->add(new Criteria('gperm_name', 'block_read'));
+			
+			$gpermArr =&  $permHandler->getObjects($criteria);
+			foreach ($gpermArr as $gperm) {
+				if (!in_array($gperm->get('gperm_groupid', $currentGroupid))) {
+					$permHandler->delete($gperm, $force);
+				}
+			}
+			
+			foreach ($obj->mGroup as $group) {
+				$insertFlag = true;
+				foreach ($gpermArr as $gperm) {
+					if ($gperm->get('gperm_groupid') == $group->get('group_id')) {
+						$insertFlag = false;
+					}
+				}
+				
+				if ($insertFlag) {
+					$gperm =& $permHandler->create();
+					$gperm->set('gperm_modid', 1);
+					$gperm->set('gperm_groupid', $group->get('groupid'));
+					$gperm->set('gperm_itemid', $obj->get('bid'));
+					$gperm->set('gperm_name', 'block_read');
+					
+					$permHandler->insert($gperm, $force);
+				}
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:00:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:00:56 +0900
Subject: [xoops-cvslog 2652] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060406060056.8A16C2AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html
diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html	Thu Apr  6 15:00:56 2006
@@ -35,7 +35,9 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SIDE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('side')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
+      </td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
@@ -79,11 +81,13 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bcachetime')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
+      </td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2" style="text-align:center;"><br />

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:01:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:01:02 +0900
Subject: [xoops-cvslog 2653] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060406060102.C01FA2AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Thu Apr  6 15:01:02 2006
@@ -20,9 +20,6 @@
     <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_VISIBLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_VISIBLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_VISIBLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -40,16 +37,15 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->getVar('mid')}></td>
+      <td><{$obj->mModule->getVar('name')}></td>
       <td><{$obj->getVar('name')}></td>
       <td><{$obj->getVar('title')}></td>
-      <td><{$obj->getVar('side')}></td>
+      <td><{if $obj->mColumn}><{$obj->mColumn->getVar('name')}><{/if}></td>
       <td><{$obj->getVar('weight')}></td>
-      <td><{$obj->getVar('visible')}></td>
       <td><{$obj->getVar('block_type')}></td>
       <td><{$obj->getVar('c_type')}></td>
-      <td><{$obj->getVar('bcachetime')}></td>
-      <td><{$obj->getVar('last_modified')}></td>
+      <td><{if $obj->mCachetime}><{$obj->mCachetime->getVar('label')}><{/if}></td>
+      <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
       <td>
         <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
         <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.2	Thu Apr  6 12:37:57 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Thu Apr  6 15:01:02 2006
@@ -38,14 +38,16 @@
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=bcachetime value=$actionForm->getVar('bcachetime')}>
+        <select name='bcachetime'>
+          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+        </select>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
-          <{xoops_optionsArray from=$moduleArr label=name value=mid}>
+          <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
         </select>
       </td>
     </tr>
@@ -53,7 +55,7 @@
       <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
-          <{xoops_optionsArray from=$groupArr value=groupid label=name}>
+          <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
         </select>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:01:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:01:28 +0900
Subject: [xoops-cvslog 2654] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060406060128.767902AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.1	Wed Apr  5 19:58:07 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php	Thu Apr  6 15:01:28 2006
@@ -68,6 +68,16 @@
 		$this->set('side', $obj->get('side'));
 		$this->set('weight', $obj->get('weight'));
 		$this->set('bcachetime', $obj->get('bcachetime'));
+		
+		$i = 0;
+		foreach ($obj->mBmodule as $module) {
+			$this->set('bmodule', $i++, $module->get('module_id'));
+		}
+
+		$i = 0;
+		foreach ($obj->mGroup as $group) {
+			$this->set('groupid', $i++, $group->get('groupid'));
+		}
 	}
 
 	function update(&$obj)
@@ -81,6 +91,22 @@
 		$obj->set('bcachetime', $this->get('bcachetime'));
 
 		$obj->set('last_modified', time());
+		
+		$obj->mBmodule = array();
+		$handler =& xoops_getmodulehandler('block_module_link', 'base');
+		foreach ($this->get('bmodule') as $mid) {
+			$t_obj =& $handler->create();
+			$t_obj->set('block_id', $this->get('bid'));
+			$t_obj->set('module_id', $mid);
+			$obj->mBmodule[] =& $t_obj;
+			unset($t_obj);
+		}
+
+		$obj->mGroup = array();
+		$handler =& xoops_gethandler('group');
+		foreach ($this->get('groupid') as $groupid) {
+			$obj->mGroup[] =& $handler->get($groupid);
+		}
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:01:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:01:39 +0900
Subject: [xoops-cvslog 2655] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406060139.9CF6A2AC055@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.1	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php	Thu Apr  6 15:01:39 2006
@@ -33,6 +33,8 @@
 		// lazy loading
 		//
 		$this->mObject->loadModule();
+		$this->mObject->loadColumn();
+		$this->mObject->loadCachetime();
 		
 		$render->setAttribute('object', $this->mObject);
 	}

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:01:43 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:01:43 +0900
Subject: [xoops-cvslog 2656] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406060143.971792AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.1	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php	Thu Apr  6 15:01:43 2006
@@ -31,6 +31,8 @@
 		#cubson::lazy_load_array('newblocks', $this->mObjects);
 		foreach (array_keys($this->mObjects) as $key) {
 			$this->mObjects[$key]->loadModule();
+			$this->mObjects[$key]->loadColumn();
+			$this->mObjects[$key]->loadCachetime();
 		}
 		
 		$render->setAttribute("objects", $this->mObjects);

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:01:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:01:47 +0900
Subject: [xoops-cvslog 2657] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406060147.7F36A2AC052@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.2	Thu Apr  6 12:38:20 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Thu Apr  6 15:01:47 2006
@@ -23,6 +23,13 @@
 		return $handler;
 	}
 
+	function _setupObject()
+	{
+		parent::_setupObject();
+		$this->mObject->loadGroup();
+		$this->mObject->loadBmodule();
+	}
+	
 	function _setupActionForm()
 	{
 		$this->mActionForm =& new Legacy_BlockEditForm();
@@ -38,12 +45,27 @@
 		// lazy loading
 		//
 		$this->mObject->loadModule();
-		$this->mObject->loadGroup();
 		
 		$render->setAttribute('object', $this->mObject);
 		
+		//
+		// Build active modules list and set.
+		//
 		$handler =& xoops_gethandler('module');
-		$moduleArr =& $handler->getObjects();
+		$moduleArr[0] =& $handler->create();
+		$moduleArr[0]->set('mid', -1);
+		$moduleArr[0]->set('name', _AD_BASE_LANG_ALL_MODULES);
+		
+		$moduleArr[1] =& $handler->create();
+		$moduleArr[1]->set('mid', 0);
+		$moduleArr[1]->set('name', _AD_BASE_LANG_TOPPAGE);
+
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('hasmain', 1));
+		$criteria->add(new Criteria('isactive', 1));
+		
+		$t_Arr =& $handler->getObjects($criteria);
+		$moduleArr = array_merge($moduleArr, $t_Arr);
 		$render->setAttribute('moduleArr', $moduleArr);
 		
 		$handler =& xoops_getmodulehandler('columnside');
@@ -55,6 +77,13 @@
 		$render->setAttribute('groupArr', $groupArr);
 		
 		//
+		// Build cachetime list and set.
+		//
+		$handler =& xoops_gethandler('cachetime');
+		$cachetimeArr =& $handler->getObjects();
+		$render->setAttribute('cachetimeArr', $cachetimeArr);
+
+		//
 		// Get html of option form rendered.
 		//
 		if ($this->mObject->get('func_file') && $this->mObject->get('edit_func')) {

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:11:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:11:32 +0900
Subject: [xoops-cvslog 2658] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060406061132.550E12AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.1	Wed Apr  5 19:58:07 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Thu Apr  6 15:11:32 2006
@@ -30,7 +30,7 @@
 class Legacy_BlockFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $mSortKeys = array(
+	var $_mSortKeys = array(
 		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:11:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:11:37 +0900
Subject: [xoops-cvslog 2659] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060406061137.F10B42AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.1	Wed Apr  5 19:58:07 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Thu Apr  6 15:11:37 2006
@@ -30,7 +30,7 @@
 class Legacy_BlockInstallFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $mSortKeys = array(
+	var $_mSortKeys = array(
 		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:12:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:12:29 +0900
Subject: [xoops-cvslog 2660] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406061229.D74C22AC04F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.2	Thu Apr  6 15:01:43 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php	Thu Apr  6 15:12:29 2006
@@ -22,7 +22,7 @@
 
 	function _getBaseUrl()
 	{
-		return "./index.php?action=NewblocksList";
+		return "./index.php?action=BlockList";
 	}
 
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:24:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:24:11 +0900
Subject: [xoops-cvslog 2661] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060406062411.410E92AC075@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.12 xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.13
--- xoops2jp/html/modules/base/language/japanese/modinfo.php:1.1.2.12	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/japanese/modinfo.php	Thu Apr  6 15:24:11 2006
@@ -1,38 +1,38 @@
-<?php
-
-define('_MI_BASE_BLOCK_COMMENTS_DESC', "最近のコメント一覧を表示します");
-define('_MI_BASE_BLOCK_COMMENTS_NAME', "最近のコメント");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "メインメニューを表示します");
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "メインメニュー");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "イベント通知の設定フォームを表示します");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "イベント通知設定");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "検索フォームを表示します");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "検索");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー");
-define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します");
-define('_MI_BASE_BLOCK_WAITING_NAME', "承認待ちコンテンツ");
-define('_MI_BASE_KEYWORD_BLOCKINSTALL', "ブロック 新規");
-define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
-define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
-define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
-define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
-define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
-define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
-define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
-define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
-define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
-define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
-define('_MI_BASE_MENU_BLOCKINSTALL', "ブロックのインストール");
-define('_MI_BASE_MENU_BLOCKLIST', "ブロックの管理");
-define('_MI_BASE_MENU_COMMENT_MANAGE', "コメントの管理");
-define('_MI_BASE_MENU_CREATE_SMILES', "顔アイコンの新規作成");
-define('_MI_BASE_MENU_MODULEINSTALL', "モジュールのインストール");
-define('_MI_BASE_MENU_MODULELIST', "モジュールの管理");
-define('_MI_BASE_MENU_SMILES_MANAGE', "顔アイコンの管理");
-define('_MI_BASE_NAME', "互換モジュール");
-define('_MI_BASE_NAME_DESC', "XOOPS Cube にXOOPS 2.0.x シリーズの互換性を与えます");
-
-?>
+<?php
+
+define('_MI_BASE_BLOCK_COMMENTS_DESC', "最近のコメント一覧を表示します");
+define('_MI_BASE_BLOCK_COMMENTS_NAME', "最近のコメント");
+define('_MI_BASE_BLOCK_MAINMENU_DESC', "メインメニューを表示します");
+define('_MI_BASE_BLOCK_MAINMENU_NAME', "メインメニュー");
+define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "イベント通知の設定フォームを表示します");
+define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "イベント通知設定");
+define('_MI_BASE_BLOCK_SEARCH_DESC', "検索フォームを表示します");
+define('_MI_BASE_BLOCK_SEARCH_NAME', "検索");
+define('_MI_BASE_BLOCK_SITEINFO_DESC', "サイトの情報を表示します");
+define('_MI_BASE_BLOCK_SITEINFO_NAME', "サイト情報");
+define('_MI_BASE_BLOCK_USERMENU_DESC', "ユーザメニューを表示します");
+define('_MI_BASE_BLOCK_USERMENU_NAME', "ユーザメニュー");
+define('_MI_BASE_BLOCK_WAITING_DESC', "承認待ちのコンテンツの存在を通知します");
+define('_MI_BASE_BLOCK_WAITING_NAME', "承認待ちコンテンツ");
+define('_MI_BASE_KEYWORD_BLOCKINSTALL', "ブロック 新規");
+define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
+define('_MI_BASE_KEYWORD_CREATE_SMILES', "スマイリー アップロード");
+define('_MI_BASE_KEYWORD_MODULEINSTALL', "モジュール 新規");
+define('_MI_BASE_KEYWORD_MODULELIST', "モジュール 順番 名前 変更 アンインストール");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
+define('_MI_BASE_KEYWORD_SMILES_MANAGE', "スマイリー 編集 変更 削除 一覧 リスト");
+define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
+define('_MI_BASE_MENU_ACTIONSEARCH', "アクションサーチ");
+define('_MI_BASE_MENU_BLOCKINSTALL', "ブロックのインストール");
+define('_MI_BASE_MENU_BLOCKLIST', "ブロックの管理");
+define('_MI_BASE_MENU_COMMENT_MANAGE', "コメントの管理");
+define('_MI_BASE_MENU_CREATE_SMILES', "顔アイコンの新規作成");
+define('_MI_BASE_MENU_MODULEINSTALL', "モジュールのインストール");
+define('_MI_BASE_MENU_MODULELIST', "モジュールの管理");
+define('_MI_BASE_MENU_SMILES_MANAGE', "顔アイコンの管理");
+define('_MI_BASE_NAME', "互換モジュール");
+define('_MI_BASE_NAME_DESC', "XOOPS Cube にXOOPS 2.0.x シリーズの互換性を与えます");
+
+?>
Index: xoops2jp/html/modules/base/language/japanese/main.php
diff -u xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.10 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.11
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.10	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Thu Apr  6 15:24:11 2006
@@ -1,95 +1,95 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
-define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
-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_CODE', "code");
-define('_MD_BASE_LANG_COM_CREATED', "作成日時");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "アイコン");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
-define('_MD_BASE_LANG_COM_MODID', "モジュールID");
-define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_SIG', "署名");
-define('_MD_BASE_LANG_COM_STATUS', "ステータス");
-define('_MD_BASE_LANG_COM_TEXT', "コメント");
-define('_MD_BASE_LANG_COM_TITLE', "表題");
-define('_MD_BASE_LANG_COM_UID', "UID");
-define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
-define('_MD_BASE_LANG_CONTENT', "content");
-define('_MD_BASE_LANG_CONTROL', "control");
-define('_MD_BASE_LANG_CREATE_NEW', "create new");
-define('_MD_BASE_LANG_DIRNAME', "dirname");
-define('_MD_BASE_LANG_DISPLAY', "display");
-define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
-define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
-define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
-define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
-define('_MD_BASE_LANG_EMOTION', "emotion");
-define('_MD_BASE_LANG_FUNC_FILE', "func file");
-define('_MD_BASE_LANG_FUNC_NUM', "func num");
-define('_MD_BASE_LANG_ID', "ID");
-define('_MD_BASE_LANG_IMAGE', "image");
-define('_MD_BASE_LANG_ISACTIVE', "isactive");
-define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
-define('_MD_BASE_LANG_MID', "mid");
-define('_MD_BASE_LANG_NAME', "name");
-define('_MD_BASE_LANG_OPTIONS', "options");
-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_SUBMIT', "送信");
-define('_MD_BASE_LANG_TEMPLATE', "template");
-define('_MD_BASE_LANG_TITLE', "title");
-define('_MD_BASE_LANG_VISIBLE', "visible");
-define('_MD_BASE_LANG_WEIGHT', "weight");
-define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
-define('_MSC_AVAVATARS', "アバター一覧");
-define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
-define('_MSC_CODE', "顔文字");
-define('_MSC_EMOTION', "意味");
-define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
-define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
-define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
-define('_MSC_FRIENDEMAILC', "友達のEmail： ");
-define('_MSC_FRIENDNAMEC', "友達の名前： ");
-define('_MSC_INTSITE', "お薦めサイト： %s");
-define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
-define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
-define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
-define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
-define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
-define('_MSC_SMILIES', "顔アイコン");
-define('_MSC_YOUREMAILC', "あなたのEmail： ");
-define('_MSC_YOURNAMEC', "あなたの名前： ");
-define('_SR_ALL', "すべて（AND検索）");
-define('_SR_ANY', "いずれか（OR検索）");
-define('_SR_EXACT', "フレーズ");
-define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
-define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
-define('_SR_KEYIGNORE', "文字数が ");
-define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
-define('_SR_KEYWORDS', "キーワード");
-define('_SR_NEXT', "次のページ >>");
-define('_SR_NOMATCH', "該当データなし。");
-define('_SR_PLZENTER', "必要なデータを全て入力してください。");
-define('_SR_PREVIOUS', "<< 前のページ");
-define('_SR_SEARCH', "検索");
-define('_SR_SEARCHIN', "検索対象のモジュール");
-define('_SR_SEARCHRESULTS', "検索結果");
-define('_SR_SEARCHRULE', "検索のルール");
-define('_SR_SHOWALLR', "すべて表示");
-define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
-define('_SR_TYPE', "検索の種類");
-
-?>
+<?php
+
+define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
+define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
+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_CODE', "code");
+define('_MD_BASE_LANG_COM_CREATED', "作成日時");
+define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_MD_BASE_LANG_COM_ICON', "アイコン");
+define('_MD_BASE_LANG_COM_ID', "ID");
+define('_MD_BASE_LANG_COM_IP', "IP");
+define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
+define('_MD_BASE_LANG_COM_MODID', "モジュールID");
+define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
+define('_MD_BASE_LANG_COM_PID', "PID");
+define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_MD_BASE_LANG_COM_SIG', "署名");
+define('_MD_BASE_LANG_COM_STATUS', "ステータス");
+define('_MD_BASE_LANG_COM_TEXT', "コメント");
+define('_MD_BASE_LANG_COM_TITLE', "表題");
+define('_MD_BASE_LANG_COM_UID', "UID");
+define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
+define('_MD_BASE_LANG_CONTENT', "content");
+define('_MD_BASE_LANG_CONTROL', "control");
+define('_MD_BASE_LANG_CREATE_NEW', "create new");
+define('_MD_BASE_LANG_DIRNAME', "dirname");
+define('_MD_BASE_LANG_DISPLAY', "display");
+define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
+define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
+define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
+define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
+define('_MD_BASE_LANG_EMOTION', "emotion");
+define('_MD_BASE_LANG_FUNC_FILE', "func file");
+define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_ID', "ID");
+define('_MD_BASE_LANG_IMAGE', "image");
+define('_MD_BASE_LANG_ISACTIVE', "isactive");
+define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_MD_BASE_LANG_MID', "mid");
+define('_MD_BASE_LANG_NAME', "name");
+define('_MD_BASE_LANG_OPTIONS', "options");
+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_SUBMIT', "送信");
+define('_MD_BASE_LANG_TEMPLATE', "template");
+define('_MD_BASE_LANG_TITLE', "title");
+define('_MD_BASE_LANG_VISIBLE', "visible");
+define('_MD_BASE_LANG_WEIGHT', "weight");
+define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MSC_AVAVATARS', "アバター一覧");
+define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
+define('_MSC_CODE', "顔文字");
+define('_MSC_EMOTION', "意味");
+define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
+define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
+define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
+define('_MSC_FRIENDEMAILC', "友達のEmail： ");
+define('_MSC_FRIENDNAMEC', "友達の名前： ");
+define('_MSC_INTSITE', "お薦めサイト： %s");
+define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
+define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
+define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
+define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
+define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
+define('_MSC_SMILIES', "顔アイコン");
+define('_MSC_YOUREMAILC', "あなたのEmail： ");
+define('_MSC_YOURNAMEC', "あなたの名前： ");
+define('_SR_ALL', "すべて（AND検索）");
+define('_SR_ANY', "いずれか（OR検索）");
+define('_SR_EXACT', "フレーズ");
+define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
+define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
+define('_SR_KEYIGNORE', "文字数が ");
+define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
+define('_SR_KEYWORDS', "キーワード");
+define('_SR_NEXT', "次のページ >>");
+define('_SR_NOMATCH', "該当データなし。");
+define('_SR_PLZENTER', "必要なデータを全て入力してください。");
+define('_SR_PREVIOUS', "<< 前のページ");
+define('_SR_SEARCH', "検索");
+define('_SR_SEARCHIN', "検索対象のモジュール");
+define('_SR_SEARCHRESULTS', "検索結果");
+define('_SR_SEARCHRULE', "検索のルール");
+define('_SR_SHOWALLR', "すべて表示");
+define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
+define('_SR_TYPE', "検索の種類");
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:48:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:48:39 +0900
Subject: [xoops-cvslog 2662] CVS update: xoops2jp/html/kernel
Message-ID: <20060406064839.D309A2AC06F@users.sourceforge.jp>

Index: xoops2jp/html/kernel/cachetime.php
diff -u /dev/null xoops2jp/html/kernel/cachetime.php:1.1.2.1
--- /dev/null	Thu Apr  6 15:48:39 2006
+++ xoops2jp/html/kernel/cachetime.php	Thu Apr  6 15:48:39 2006
@@ -0,0 +1,89 @@
+<?php
+
+class XoopsCachetime extends XoopsObject
+{
+	function XoopsCachetime()
+	{
+		$this->initVar('cachetime', XOBJ_DTYPE_OTHER, null, false);
+        $this->initVar('label', XOBJ_DTYPE_TXTBOX, null, true, 255);
+	}
+}
+
+class XoopsCachetimeHandler extends XoopsObjectHandler
+{
+	var $_mResult;
+	
+	function XoopsCachetimeHandler(&$db)
+	{
+		parent::XoopsObjectHandler($db);
+
+		//
+		// This handler not connects to database.
+		//
+		$this->_mResult = array(
+			"0"       => _NOCACHE,
+			"30"      => sprintf(_SECONDS, 30),
+			"60"      => _MINUTE,
+			"300"     => sprintf(_MINUTES, 5),
+			"1800"    => sprintf(_MINUTES, 30),
+			"3600"    => _HOUR,
+			"18000"   => sprintf(_HOURS, 5),
+			"86400"   => _DAY,
+			"259200"  => sprintf(_DAYS, 3),
+			"604800"  => _WEEK,
+			"2592000" => _MONTH
+		);
+	}
+	
+	function &create()
+	{
+		$ret =& new XoopsCachetime();
+		return $ret;
+	}
+	
+	function &get($cachetime)
+	{
+		if (isset($this->_mResult[$cachetime])) {
+			$obj =& new XoopsCachetime();
+			$obj->setVar('cachetime', $cachetime);
+			$obj->setVar('label', $this->_mResult[$cachetime]);
+
+			return $obj;
+		}
+		
+		$ret = null;
+		return $ret;
+	}
+
+	function &getObjects($criteria = null, $key_as_id = false)
+	{
+		$ret = array();
+		
+		foreach ($this->_mResult as $cachetime => $label) {
+			$obj =& new XoopsCachetime();
+			$obj->setVar('cachetime', $cachetime);
+			$obj->setVar('label', $label);
+			if ($key_as_id) {
+				$ret[$cachetime] =& $obj;
+			}
+			else {
+				$ret[] =& $obj;
+			}
+			unset($obj);
+		}
+		
+		return $ret;
+	}
+	
+	function insert(&$obj)
+	{
+		return false;
+	}
+
+	function delete(&$obj)
+	{
+		return false;
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Apr  6 15:49:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 15:49:35 +0900
Subject: [xoops-cvslog 2663] CVS update: xoops2jp/html/class
Message-ID: <20060406064935.676352AC04F@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_ActionForm.class.php
diff -u xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.30 xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.31
--- xoops2jp/html/class/XCube_ActionForm.class.php:1.1.2.30	Tue Mar 28 22:28:16 2006
+++ xoops2jp/html/class/XCube_ActionForm.class.php	Thu Apr  6 15:49:35 2006
@@ -312,6 +312,8 @@
 	
 	function fetch($key = null)
 	{
+		unset($this->mProperties);
+		$this->mProperties = array();
 		if (isset($_REQUEST[$this->mName]) && is_array($_REQUEST[$this->mName])) {
 			foreach ($_REQUEST[$this->mName] as $_key => $_val) {
 				$this->mProperties[$_key] =& new $this->mPropertyClassName($this->mName);

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:51:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:51:41 +0900
Subject: [xoops-cvslog 2664] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060406075141.EC9622AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml:1.1.2.1
--- /dev/null	Thu Apr  6 16:51:41 2006
+++ xoops2jp/html/modules/base/admin/.xml/customblock_edit.xml	Thu Apr  6 16:51:41 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="CustomBlockEditForm" type="Legacy_BlockEditForm">
+		<form-property name="content" type="Text" />
+		<form-property name="ctype" type="String" />
+	</form-bean>
+	<form-validation>
+		<field property="content" depends="required">
+			<arg0 key="const._AD_BASE_LANG_CONTENT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+		</field>
+		<field property="ctype" depends="required,maxlength">
+			<arg0 key="const._AD_BASE_LANG_BLOCK_TYPE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="1" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:51:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:51:50 +0900
Subject: [xoops-cvslog 2665] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060406075150.D77372AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/block_edit.xml
diff -u xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.1 xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.2
--- xoops2jp/html/modules/base/admin/.xml/block_edit.xml:1.1.2.1	Wed Apr  5 19:57:26 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_edit.xml	Thu Apr  6 16:51:50 2006
@@ -3,7 +3,6 @@
 	<form-bean name="BlockEditForm" type="XCube_ActionForm">
 		<form-property name="bid" type="Int" />
 		<form-property name="options" type="String[]" />
-		<form-property name="name" type="String" />
 		<form-property name="title" type="String" />
 		<form-property name="side" type="Int" />
 		<form-property name="weight" type="Int" />
@@ -16,13 +15,6 @@
 			<arg0 key="const._AD_BASE_LANG_BID" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
 		</field>
-		<field property="name" depends="required,maxlength">
-			<arg0 key="const._AD_BASE_LANG_NAME" />
-			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
-			<arg1 name="maxlength" key="${var:maxlength}" />
-			<msg name="maxlength" key="const._AD_BASE_ERROR_MAXLENGTH" />
-			<var name="maxlength" value="150" />
-		</field>
 		<field property="title" depends="required,maxlength">
 			<arg0 key="const._AD_BASE_LANG_TITLE" />
 			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:53:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:53:20 +0900
Subject: [xoops-cvslog 2666] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060406075320.C455D2AC01F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php:1.1.2.1
--- /dev/null	Thu Apr  6 16:53:20 2006
+++ xoops2jp/html/modules/base/admin/forms/CustomBlockEditForm.class.php	Thu Apr  6 16:53:20 2006
@@ -0,0 +1,74 @@
+<?php
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_ActionForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/class/Legacy_Validator.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/BlockEditForm.class.php";
+
+class Legacy_CustomBlockEditForm extends Legacy_BlockEditForm
+{
+	function getTokenName()
+	{
+		return "module.base.CustomBlockEditForm.TOKEN" . $this->get('bid');
+	}
+
+	function prepare()
+	{
+		parent::prepare();
+		
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['content'] =& new XCube_TextProperty('content');
+		$this->mFormProperties['c_type'] =& new XCube_StringProperty('c_type');
+	
+		//
+		// Set field properties
+		//
+		$this->mFieldProperties['content'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['content']->setDependsByArray(array('required'));
+		$this->mFieldProperties['content']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_CONTENT);
+	
+		$this->mFieldProperties['c_type'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['c_type']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['c_type']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_C_TYPE, '1');
+		$this->mFieldProperties['c_type']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_C_TYPE, '1');
+		$this->mFieldProperties['c_type']->addVar('maxlength', '1');
+	}
+	
+	function load(&$obj)
+	{
+		parent::load($obj);
+		$this->set('content', $obj->get('content'));
+		$this->set('c_type', $obj->get('c_type'));
+	}
+
+	function update(&$obj)
+	{
+		parent::update($obj);
+		$obj->set('content', $this->get('content'));
+		$obj->set('block_type', 'C');
+		$obj->set('c_type', $this->get('c_type'));
+		$obj->set('visible', 1);
+		$obj->set('isactive', 1);
+		
+		switch ($this->get('c_type')) {
+			case 'H':
+				$obj->set('name', _AD_BASE_LANG_CUSTOM_HTML);
+				break;
+			
+			case 'P':
+				$obj->set('name', _AD_BASE_LANG_CUSTOM_PHP);
+				break;
+				
+			case 'S':
+				$obj->set('name', _AD_BASE_LANG_CUSTOM_WITH_SMILIES);
+				break;
+				
+			case 'T':
+				$obj->set('name', _AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES);
+				break;
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:53:52 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:53:52 +0900
Subject: [xoops-cvslog 2667] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060406075352.BA56B2AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.2	Thu Apr  6 15:01:28 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php	Thu Apr  6 16:53:52 2006
@@ -19,7 +19,6 @@
 		//
 		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
 		$this->mFormProperties['options'] =& new XCube_StringArrayProperty('options');
-		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
 		$this->mFormProperties['title'] =& new XCube_StringProperty('title');
 		$this->mFormProperties['side'] =& new XCube_IntProperty('side');
 		$this->mFormProperties['weight'] =& new XCube_IntProperty('weight');
@@ -35,12 +34,6 @@
 		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
 	
-		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['name']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_NAME, '150');
-		$this->mFieldProperties['name']->addMessage('maxlength', _AD_BASE_ERROR_MAXLENGTH, _AD_BASE_LANG_NAME, '150');
-		$this->mFieldProperties['name']->addVar('maxlength', '150');
-	
 		$this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
 		$this->mFieldProperties['title']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_TITLE, '255');
@@ -63,7 +56,6 @@
 	function load(&$obj)
 	{
 		$this->set('bid', $obj->get('bid'));
-		$this->set('name', $obj->get('name'));
 		$this->set('title', $obj->get('title'));
 		$this->set('side', $obj->get('side'));
 		$this->set('weight', $obj->get('weight'));
@@ -84,7 +76,6 @@
 	{
 		$obj->set('bid', $this->get('bid'));
 		$obj->set('options', implode('|', $this->get('options')));
-		$obj->set('name', $this->get('name'));
 		$obj->set('title', $this->get('title'));
 		$obj->set('side', $this->get('side'));
 		$obj->set('weight', $this->get('weight'));

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:54:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:54:08 +0900
Subject: [xoops-cvslog 2668] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060406075408.7D6772AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.1
--- /dev/null	Thu Apr  6 16:54:08 2006
+++ xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php	Thu Apr  6 16:54:08 2006
@@ -0,0 +1,73 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/actions/BlockEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/CustomBlockEditForm.class.php";
+
+class Legacy_CustomBlockEditAction extends Legacy_BlockEditAction
+{
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_CustomBlockEditForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("customblock_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		
+		//
+		// lazy loading
+		//
+		$this->mObject->loadModule();
+		
+		$render->setAttribute('object', $this->mObject);
+		
+		//
+		// Build active modules list and set.
+		//
+		$handler =& xoops_gethandler('module');
+		$moduleArr[0] =& $handler->create();
+		$moduleArr[0]->set('mid', -1);
+		$moduleArr[0]->set('name', _AD_BASE_LANG_ALL_MODULES);
+		
+		$moduleArr[1] =& $handler->create();
+		$moduleArr[1]->set('mid', 0);
+		$moduleArr[1]->set('name', _AD_BASE_LANG_TOPPAGE);
+
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('hasmain', 1));
+		$criteria->add(new Criteria('isactive', 1));
+		
+		$t_Arr =& $handler->getObjects($criteria);
+		$moduleArr = array_merge($moduleArr, $t_Arr);
+		$render->setAttribute('moduleArr', $moduleArr);
+		
+		$handler =& xoops_getmodulehandler('columnside');
+		$columnSideArr =& $handler->getObjects();
+		$render->setAttribute('columnSideArr', $columnSideArr);
+
+		$handler =& xoops_gethandler('group');
+		$groupArr =& $handler->getObjects();
+		$render->setAttribute('groupArr', $groupArr);
+		
+		//
+		// Build cachetime list and set.
+		//
+		$handler =& xoops_gethandler('cachetime');
+		$cachetimeArr =& $handler->getObjects();
+		$render->setAttribute('cachetimeArr', $cachetimeArr);
+
+		//
+		// Build ctype list and set.
+		//
+		$handler =& xoops_getmodulehandler('blockctype');
+		$ctypeArr =& $handler->getObjects();
+		$render->setAttribute('ctypeArr', $ctypeArr);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:54:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:54:25 +0900
Subject: [xoops-cvslog 2669] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060406075425.22A382AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.1
--- /dev/null	Thu Apr  6 16:54:25 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html	Thu Apr  6 16:54:25 2006
@@ -0,0 +1,76 @@
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=CustomBlockEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name="side">
+          <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_dhtmltarea type=text name=content value=$actionForm->getVar('content')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_CTYPE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name='c_type'>
+          <{xoops_optionsArray from=$ctypeArr value=type label=label default=$actionForm->get('ctype')}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name='bcachetime'>
+          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='bmodule[]' multiple='multiple'>
+          <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select  size='5' name='groupid[]' multiple='multiple'>
+          <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
+        </select>
+      </td>
+    </tr>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+      </td>
+    </tr>
+  </table>
+</form>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:54:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:54:38 +0900
Subject: [xoops-cvslog 2670] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060406075438.31B8C2AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html
diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.2	Thu Apr  6 15:00:56 2006
+++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html	Thu Apr  6 16:54:38 2006
@@ -1,7 +1,11 @@
 <p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
 
 <div class="tips">
-  <{$smarty.const._AD_BASE_TIPS_BLOCK_UNINSTALL}>
+  <{if $object->get('block_type') == 'C'}>
+    <{$smarty.const._AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL}>
+  <{else}>
+    <{$smarty.const._AD_BASE_TIPS_BLOCK_UNINSTALL}>
+  <{/if}>
 </div>
 
 <table class="outer" cellspacing="1">
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html	Thu Apr  6 16:54:38 2006
@@ -10,12 +10,6 @@
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
-      </td>
-    </tr>
-    <tr>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
@@ -40,7 +34,9 @@
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=bcachetime value=$actionForm->getVar('bcachetime')}>
+        <select name='bcachetime'>
+          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+        </select>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.2	Thu Apr  6 15:01:02 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Thu Apr  6 16:54:38 2006
@@ -1,4 +1,11 @@
-<div style="text-align:right;">[ <a href="index.php?action=BlockInstallList"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></strong></a> ]</div>
+<div class="tips">
+  <{$smarty.const._AD_BASE_TIPS_ADD_CUSTOM_BLOCK}>
+</div>
+
+<div style="text-align:right;">
+  [ <a href="index.php?action=BlockInstallList"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></a> ]
+  [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
+</div>
 <br/>
 <table class="outer" cellspacing="1">
   <tr>
@@ -37,7 +44,13 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getVar('name')}>
+        <{else}>
+          &nbsp;
+        <{/if}>
+      </td>
       <td><{$obj->getVar('name')}></td>
       <td><{$obj->getVar('title')}></td>
       <td><{if $obj->mColumn}><{$obj->mColumn->getVar('name')}><{/if}></td>
@@ -47,7 +60,11 @@
       <td><{if $obj->mCachetime}><{$obj->mCachetime->getVar('label')}><{/if}></td>
       <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
       <td>
-        <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{if $obj->get('block_type') == 'C'}>
+          <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{else}>
+          <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{/if}>
         <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Thu Apr  6 16:54:38 2006
@@ -1,7 +1,10 @@
 <div class="tips">
   <{$smarty.const._AD_BASE_TIPS_INSTALL_BLOCK}>
 </div>
-
+<div style="text-align:right;">
+  [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
+</div>
+<br/>
 <table class="outer" cellspacing="1">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
@@ -30,7 +33,13 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getVar('name')}>
+        <{else}>
+          &nbsp;
+        <{/if}>
+      </td>
       <td><{$obj->getVar('name')}></td>
       <td><{$obj->getVar('title')}></td>
       <td><{$obj->getVar('block_type')}></td>
@@ -38,6 +47,9 @@
       <td><{$obj->getVar('template')}></td>
       <td>
         <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+        <{if $obj->get('block_type') == 'C'}>
+          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <{/if}>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.3	Thu Apr  6 15:01:02 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Thu Apr  6 16:54:38 2006
@@ -10,12 +10,6 @@
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
-      </td>
-    </tr>
-    <tr>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:55:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:55:08 +0900
Subject: [xoops-cvslog 2671] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060406075508.BD4272AC015@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/blockctype.php
diff -u /dev/null xoops2jp/html/modules/base/class/blockctype.php:1.1.2.1
--- /dev/null	Thu Apr  6 16:55:08 2006
+++ xoops2jp/html/modules/base/class/blockctype.php	Thu Apr  6 16:55:08 2006
@@ -0,0 +1,77 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class BaseBlockctypeObject extends XoopsSimpleObject
+{
+	function BaseBlockctypeObject()
+	{
+		$this->initVar('type', XOBJ_DTYPE_STRING, '', true);
+		$this->initVar('label', XOBJ_DTYPE_STRING, '', true, 255);
+	}
+}
+
+class BaseBlockctypeHandler extends XoopsObjectHandler
+{
+	var $_mResults = array();
+	
+	function BaseBlockctypeHandler(&$db)
+	{
+		$t_arr = array (
+				'H' => _AM_HTML,
+				'P' => _AM_PHP,
+				'S' => _AM_AFWSMILE,
+				'T' => _AM_AFNOSMILE
+			);
+			
+		foreach ($t_arr as $id => $name) {
+			$this->_mResults[$id] =& $this->create();
+			$this->_mResults[$id]->setVar('type', $id);
+			$this->_mResults[$id]->setVar('label', $name);
+		}
+	}
+	
+	function &create()
+	{
+		$ret =& new BaseBlockctypeObject();
+		return $ret;
+	}
+	
+	function get($id)
+	{
+		if (isset($this->_mResults[$id])) {
+			return $this->_mResults[$id];
+		}
+		
+		$ret = null;
+		return $ret;
+	}
+	
+	function &getObjects($criteria = null, $id_as_key = false)
+	{
+		if ($id_as_key) {
+			return $this->_mResults;
+		}
+		else {
+			$ret = array();
+		
+			foreach (array_keys($this->_mResults) as $key) {
+				$ret[] =& $this->_mResults[$key];
+			}
+			
+			return $ret;
+		}
+	}
+	
+	function insert(&$obj)
+	{
+		return false;
+	}
+
+	function delete(&$obj)
+	{
+		return false;
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:55:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:55:41 +0900
Subject: [xoops-cvslog 2672] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060406075541.031DA2AC015@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.24 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.25
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.24	Thu Apr  6 14:58:41 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Thu Apr  6 16:55:40 2006
@@ -8,6 +8,7 @@
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_BASE_ERROR_SMILE_URL_REQUIRED', "顔アイコンをアップロードして下さい");
+define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加");
 define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール");
 define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス");
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
@@ -41,6 +42,10 @@
 define('_AD_BASE_LANG_CONTENT', "content");
 define('_AD_BASE_LANG_CONTROL', "コントロール");
 define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
+define('_AD_BASE_LANG_CUSTOM_HTML', "カスタム(HTML)");
+define('_AD_BASE_LANG_CUSTOM_PHP', "カスタム(PHP)");
+define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "カスタム(顔アイコン有効)");
+define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "カスタム(顔アイコン無効)");
 define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "表示");
 define('_AD_BASE_LANG_DOBR', "改行を自動挿入する");
@@ -82,8 +87,10 @@
 define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
+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_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。");
+define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Ｑ：カスタムブロックをアンインストールすると？<br/>Ａ：<strong>削除されずに</strong>、すべての設定を記録したまま、未インストールブロックリストへ移動します。未インストールリストから削除できるほか、再インストール操作で簡単に復活させることができます。");
+define('_AD_BASE_TIPS_INSTALL_BLOCK', "ブロックをインストールしてサイトをカスタマイズしましょう。インストール時に表示オプションなどを調整できます。<br/>ウェルカムメッセージなど、文章を表示したい場合は、<a href=\"index.php?action=CustomBlockEdit\">カスタムブロックを追加</a>しましょう。");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "アクションサーチ");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "管理メニューやヘルプから入力されたキーワードを検索します。<br/>管理メニューの位置を忘れたときに使いましょう (例)利用許諾文");
 define('_MB_A_BASE_LANG_MENU', "メニュー");

From minahito ＠ users.sourceforge.jp  Thu Apr  6 16:55:41 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu,  6 Apr 2006 16:55:41 +0900
Subject: [xoops-cvslog 2673] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060406075541.284762AC01F@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.20 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.21
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.20	Thu Apr  6 14:58:31 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Thu Apr  6 16:55:41 2006
@@ -8,6 +8,7 @@
 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_LANG_ADD_CUSTOM_BLOCK', "Add custom block");
 define('_AD_BASE_LANG_ALL_MODULES', "All modules");
 define('_AD_BASE_LANG_ALL_STATUS', "All status");
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
@@ -41,6 +42,10 @@
 define('_AD_BASE_LANG_CONTENT', "content");
 define('_AD_BASE_LANG_CONTROL', "Control");
 define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
+define('_AD_BASE_LANG_CUSTOM_HTML', "Custom HTML");
+define('_AD_BASE_LANG_CUSTOM_PHP', "Custom PHP");
+define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "Custom with Smilies");
+define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "Custom without Smilies");
 define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
@@ -82,7 +87,9 @@
 define('_AD_BASE_LANG_WEIGHT', "weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Confirm to delete");
+define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Add custom block");
 define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "block uninstall");
+define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Custom block uninstall");
 define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block.");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search....");

From minahito ＠ users.sourceforge.jp  Fri Apr  7 13:47:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 13:47:10 +0900
Subject: [xoops-cvslog 2674] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060407044710.61B2A2AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.1
--- /dev/null	Fri Apr  7 13:47:10 2006
+++ xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php	Fri Apr  7 13:47:10 2006
@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/base/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/CustomBlockDeleteForm.class.php";
+
+class Legacy_CustomBlockDeleteAction extends Legacy_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('newblocks');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new Legacy_CustomBlockDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("customblock_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		
+		//
+		// lazy loading
+		//
+		$this->mObject->loadModule();
+		$this->mObject->loadColumn();
+		$this->mObject->loadCachetime();
+		
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BlockInstallList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BlockInstallList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 13:47:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 13:47:24 +0900
Subject: [xoops-cvslog 2675] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060407044724.AB2022AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/CustomBlockDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/CustomBlockDeleteForm.class.php:1.1.2.1
--- /dev/null	Fri Apr  7 13:47:24 2006
+++ xoops2jp/html/modules/base/admin/forms/CustomBlockDeleteForm.class.php	Fri Apr  7 13:47:24 2006
@@ -0,0 +1,41 @@
+<?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_CustomBlockDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.base.CustomBlockDeleteForm.TOKEN" . $this->get('bid');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
+		$this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+	}
+
+	function update(&$obj)
+	{
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 13:47:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 13:47:35 +0900
Subject: [xoops-cvslog 2676] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060407044735.890E32AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php:1.1.2.1	Wed Apr  5 19:58:07 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockUninstallForm.class.php	Fri Apr  7 13:47:35 2006
@@ -2,40 +2,18 @@
 
 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";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/CustomBlockDeleteForm.class.php";
 
-class Legacy_BlockUninstallForm extends XCube_ActionForm
+class Legacy_BlockUninstallForm extends Legacy_CustomBlockDeleteForm
 {
 	function getTokenName()
 	{
 		return "module.base.BlockUninstallForm.TOKEN" . $this->get('bid');
 	}
 
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
-	
-		//
-		// Set field properties
-		//
-	
-		$this->mFieldProperties['bid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['bid']->setDependsByArray(array('required'));
-		$this->mFieldProperties['bid']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BID);
-	}
-
-	function load(&$obj)
-	{
-		$this->set('bid', $obj->get('bid'));
-	}
-
 	function update(&$obj)
 	{
-		$obj->set('bid', $this->get('bid'));
+		parent::update($obj);
 		$obj->set('last_modified', time());
 		$obj->set('visible', false);
 	}

From minahito ＠ users.sourceforge.jp  Fri Apr  7 13:47:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 13:47:50 +0900
Subject: [xoops-cvslog 2677] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060407044750.305262AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_delete.html
diff -u /dev/null xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.1
--- /dev/null	Fri Apr  7 13:47:50 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_delete.html	Fri Apr  7 13:47:50 2006
@@ -0,0 +1,97 @@
+<p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_MID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
+      </td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_VISIBLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_C_TYPE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_DIRNAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
+      </td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|xoops_formattimestamp:l}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=CustomBlockDelete" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 17:44:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 17:44:28 +0900
Subject: [xoops-cvslog 2678] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060407084428.228FC2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.3	Thu Apr  6 15:12:29 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php	Fri Apr  7 17:44:27 2006
@@ -5,9 +5,18 @@
 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/admin/forms/BlockFilterForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/forms/BlockListForm.class.php";
 
 class Legacy_BlockListAction extends Legacy_AbstractListAction
 {
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm =& new Legacy_BlockListForm();
+		$this->mActionForm->prepare();
+	}
+	
 	function &_getHandler()
 	{
 		$handler =& xoops_getmodulehandler('newblocks');
@@ -25,6 +34,34 @@
 		return "./index.php?action=BlockList";
 	}
 
+	function execute(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return $this->getDefaultView($controller, $xoopsUser);
+		}
+		
+		$weightArr = $this->mActionForm->get('weight');
+		
+		$handler =& xoops_getmodulehandler('newblocks');
+		foreach (array_keys($weightArr) as $bid) {
+			$block =& $handler->get($bid);
+			if (is_object($block) && $block->get('isactive') == 1 && $block->get('visible') == 1) {
+				$block->set('weight', $this->mActionForm->get('weight', $bid));
+				$block->set('side', $this->mActionForm->get('side', $bid));
+				$block->set('bcachetime', $this->mActionForm->get('bcachetime', $bid));
+				
+				if (!$handler->insert($block)) {
+					return LEGACY_FRAME_VIEW_ERROR;
+				}
+			}
+		}
+		
+		return LEGACY_FRAME_VIEW_SUCCESS;
+	}
+
 	function executeViewIndex(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("block_list.html");
@@ -37,6 +74,15 @@
 		
 		$render->setAttribute("objects", $this->mObjects);
 		$render->setAttribute("pageNavi", $this->mNavi);
+		
+		//
+		// Load cache-time pattern objects and set.
+		//
+		$handler =& xoops_gethandler('cachetime');
+		$cachetimeArr =& $handler->getObjects();
+		$render->setAttribute('cachetimeArr', $cachetimeArr);
+		
+		$render->setAttribute('actionForm', $this->mActionForm);
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Apr  7 17:44:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 17:44:42 +0900
Subject: [xoops-cvslog 2679] CVS update: xoops2jp/html/modules/base/admin/.xml
Message-ID: <20060407084442.F237C2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/.xml/block_list.xml
diff -u /dev/null xoops2jp/html/modules/base/admin/.xml/block_list.xml:1.1.2.1
--- /dev/null	Fri Apr  7 17:44:42 2006
+++ xoops2jp/html/modules/base/admin/.xml/block_list.xml	Fri Apr  7 17:44:42 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BlockListForm" type="XCube_ActionForm">
+		<form-property name="weight" type="Int[]" />
+		<form-property name="side" type="Int[]" />
+		<form-property name="bcachetime" type="Int[]" />
+	</form-bean>
+	<form-validation>
+		<field property="weight" depends="required,intRange">
+			<arg0 key="const._AD_BASE_LANG_WEIGHT" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<msg name="intRange" key="const._AD_BASE_ERROR_INTRANGE" />
+			<var name="min" value="0" />
+			<var name="max" value="255" />
+		</field>
+		<field property="side" depends="required,objectExist">
+			<arg0 key="const._AD_BASE_LANG_SIDE" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
+			<var name="handler" value="columnside" />
+			<var name="module" value="base" />
+		</field>
+		<field property="bcachetime" depends="required,objectExist">
+			<arg0 key="const._AD_BASE_LANG_BCACHETIME" />
+			<msg name="required" key="const._AD_BASE_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_BASE_ERROR_OBJECTEXIST" />
+			<var name="handler" value="cachetime" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 17:44:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 17:44:55 +0900
Subject: [xoops-cvslog 2680] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060407084455.ECAFD2AC093@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php
diff -u /dev/null xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php:1.1.2.1
--- /dev/null	Fri Apr  7 17:44:55 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockListForm.class.php	Fri Apr  7 17:44:55 2006
@@ -0,0 +1,50 @@
+<?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_BlockListForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.base.BlockListForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['weight'] =& new XCube_IntArrayProperty('weight');
+		$this->mFormProperties['side'] =& new XCube_IntArrayProperty('side');
+		$this->mFormProperties['bcachetime'] =& new XCube_IntArrayProperty('bcachetime');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['weight'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['weight']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['weight']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_WEIGHT);
+		$this->mFieldProperties['weight']->addMessage('intRange', _AD_BASE_ERROR_INTRANGE, _AD_BASE_LANG_WEIGHT);
+		$this->mFieldProperties['weight']->addVar('min', '0');
+		$this->mFieldProperties['weight']->addVar('max', '255');
+	
+		$this->mFieldProperties['side'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['side']->setDependsByArray(array('required','objectExist'));
+		$this->mFieldProperties['side']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_SIDE);
+		$this->mFieldProperties['side']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_SIDE);
+		$this->mFieldProperties['side']->addVar('handler', 'columnside');
+		$this->mFieldProperties['side']->addVar('module', 'base');
+	
+		$this->mFieldProperties['bcachetime'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['bcachetime']->setDependsByArray(array('required','objectExist'));
+		$this->mFieldProperties['bcachetime']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BCACHETIME);
+		$this->mFieldProperties['bcachetime']->addMessage('objectExist', _AD_BASE_ERROR_OBJECTEXIST, _AD_BASE_LANG_BCACHETIME);
+		$this->mFieldProperties['bcachetime']->addVar('handler', 'cachetime');
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 17:45:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 17:45:46 +0900
Subject: [xoops-cvslog 2681] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060407084546.DE96F2AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.3	Thu Apr  6 16:54:38 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Fri Apr  7 17:45:46 2006
@@ -7,68 +7,95 @@
   [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
 </div>
 <br/>
-<table class="outer" cellspacing="1">
-  <tr>
-    <th><{$smarty.const._AD_BASE_LANG_BID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_MID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_SIDE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
-  </tr>
-  <{foreach item=obj from=$objects}>
-    <tr class="<{cycle values='odd,even'}>">
-      <td><{$obj->getVar('bid')}></td>
-      <td>
-        <{if $obj->mModule}>
-          <{$obj->mModule->getVar('name')}>
-        <{else}>
-          &nbsp;
-        <{/if}>
-      </td>
-      <td><{$obj->getVar('name')}></td>
-      <td><{$obj->getVar('title')}></td>
-      <td><{if $obj->mColumn}><{$obj->mColumn->getVar('name')}><{/if}></td>
-      <td><{$obj->getVar('weight')}></td>
-      <td><{$obj->getVar('block_type')}></td>
-      <td><{$obj->getVar('c_type')}></td>
-      <td><{if $obj->mCachetime}><{$obj->mCachetime->getVar('label')}><{/if}></td>
-      <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form method="POST" action="./index.php?action=BlockList">
+  <{xoops_token form=$actionForm}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_BASE_LANG_BID}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_MID}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_SIDE}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
+    </tr>
+    <{foreach item=obj from=$objects}>
+      <tr class="<{cycle values='odd,even'}>">
+        <td><{$obj->getVar('bid')}></td>
+        <td>
+          <{if $obj->mModule}>
+            <{$obj->mModule->getVar('name')}>
+          <{else}>
+            &nbsp;
+          <{/if}>
+        </td>
+        <td><{$obj->getVar('name')}></td>
+        <td><{$obj->getVar('title')}></td>
+        <td>
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
+        </td>
+        <td>
+          <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}>
+        </td>
+        <td><{$obj->getVar('block_type')}></td>
+        <td><{$obj->getVar('c_type')}></td>
+        <td>
+          <select name="bcachetime[<{$obj->getVar('bid')}>]">
+            <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}>
+          </select>
+        </td>
+        <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
+        <td>
+          <{if $obj->get('block_type') == 'C'}>
+            <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+          <{else}>
+            <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+          <{/if}>
+          <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        </td>
+      </tr>
+    <{/foreach}>
+    <tr class="foot">
       <td>
-        <{if $obj->get('block_type') == 'C'}>
-          <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
-        <{else}>
-          <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
-        <{/if}>
-        <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <input type="submit" />
       </td>
     </tr>
-  <{/foreach}>
-</table>
+  </table>
+</form>
 <br />
 <div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 18:02:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 18:02:36 +0900
Subject: [xoops-cvslog 2682] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060407090236.761462AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.3	Thu Apr  6 15:01:47 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Fri Apr  7 18:02:36 2006
@@ -36,6 +36,64 @@
 		$this->mActionForm->prepare();
 	}
 	
+	function execute(&$controller, &$xoopsUser)
+	{
+		$ret = parent::execute($controller, $xoopsUser);
+		
+		if ($ret == LEGACY_FRAME_VIEW_SUCCESS) {
+			//
+			// Reset block_module_link.
+			//
+			$handler =& xoops_getmodulehandler('block_module_link', 'base');
+			$handler->deleteAll(new Criteria('block_id', $this->mObject->get('bid')));
+			foreach ($this->mObject->mBmodule as $bmodule) {
+				$handler->insert($bmodule);
+			}
+
+			//
+			// Insert group permissions.
+			//
+			$currentGroupid = array();
+			foreach ($this->mObject->mGroup as $group) {
+				$currentGroupid[] = $group->get('groupid');
+			}
+			
+			$permHandler =& xoops_gethandler('groupperm');
+			$criteria =& new CriteriaCompo();
+			$criteria->add(new Criteria('gperm_modid', 1));
+			$criteria->add(new Criteria('gperm_itemid', $this->mObject->get('bid')));
+			$criteria->add(new Criteria('gperm_name', 'block_read'));
+			
+			$gpermArr =&  $permHandler->getObjects($criteria);
+			foreach ($gpermArr as $gperm) {
+				if (!in_array($gperm->get('gperm_groupid', $currentGroupid))) {
+					$permHandler->delete($gperm, $force);
+				}
+			}
+			
+			foreach ($this->mObject->mGroup as $group) {
+				$insertFlag = true;
+				foreach ($gpermArr as $gperm) {
+					if ($gperm->get('gperm_groupid') == $group->get('group_id')) {
+						$insertFlag = false;
+					}
+				}
+				
+				if ($insertFlag) {
+					$gperm =& $permHandler->create();
+					$gperm->set('gperm_modid', 1);
+					$gperm->set('gperm_groupid', $group->get('groupid'));
+					$gperm->set('gperm_itemid', $this->mObject->get('bid'));
+					$gperm->set('gperm_name', 'block_read');
+					
+					$permHandler->insert($gperm, $force);
+				}
+			}
+		}
+		
+		return $ret;
+	}
+	
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("block_edit.html");

From minahito ＠ users.sourceforge.jp  Fri Apr  7 18:03:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 18:03:01 +0900
Subject: [xoops-cvslog 2683] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060407090301.75EA02AC012@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u xoops2jp/html/modules/base/class/newblocks.php:1.1.2.3 xoops2jp/html/modules/base/class/newblocks.php:1.1.2.4
--- xoops2jp/html/modules/base/class/newblocks.php:1.1.2.3	Thu Apr  6 15:00:25 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Fri Apr  7 18:03:01 2006
@@ -95,61 +95,6 @@
 	var $mTable = "newblocks";
 	var $mPrimary = "bid";
 	var $mClass = "BaseNewblocksObject";
-	
-	function insert(&$obj, $force=false)
-	{
-		if (parent::insert($obj, $force)) {
-			$handler =& xoops_getmodulehandler('block_module_link', 'base');
-			$handler->deleteAll(new Criteria('block_id', $obj->get('bid')));
-			foreach ($obj->mBmodule as $bmodule) {
-				$handler->insert($bmodule);
-			}
-
-			//
-			// Insert group permissions.
-			//
-			$currentGroupid = array();
-			foreach ($obj->mGroup as $group) {
-				$currentGroupid[] = $group->get('groupid');
-			}
-			
-			$permHandler =& xoops_gethandler('groupperm');
-			$criteria =& new CriteriaCompo();
-			$criteria->add(new Criteria('gperm_modid', 1));
-			$criteria->add(new Criteria('gperm_itemid', $obj->get('bid')));
-			$criteria->add(new Criteria('gperm_name', 'block_read'));
-			
-			$gpermArr =&  $permHandler->getObjects($criteria);
-			foreach ($gpermArr as $gperm) {
-				if (!in_array($gperm->get('gperm_groupid', $currentGroupid))) {
-					$permHandler->delete($gperm, $force);
-				}
-			}
-			
-			foreach ($obj->mGroup as $group) {
-				$insertFlag = true;
-				foreach ($gpermArr as $gperm) {
-					if ($gperm->get('gperm_groupid') == $group->get('group_id')) {
-						$insertFlag = false;
-					}
-				}
-				
-				if ($insertFlag) {
-					$gperm =& $permHandler->create();
-					$gperm->set('gperm_modid', 1);
-					$gperm->set('gperm_groupid', $group->get('groupid'));
-					$gperm->set('gperm_itemid', $obj->get('bid'));
-					$gperm->set('gperm_name', 'block_read');
-					
-					$permHandler->insert($gperm, $force);
-				}
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Fri Apr  7 18:03:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 18:03:23 +0900
Subject: [xoops-cvslog 2684] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060407090323.91B552AC012@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.21 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.22
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.21	Thu Apr  6 16:55:41 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Fri Apr  7 18:03:23 2006
@@ -4,6 +4,7 @@
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
 define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
 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.");

From minahito ＠ users.sourceforge.jp  Fri Apr  7 18:03:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri,  7 Apr 2006 18:03:29 +0900
Subject: [xoops-cvslog 2685] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060407090329.51EEA2AC012@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.25 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.26
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.25	Thu Apr  6 16:55:40 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Fri Apr  7 18:03:29 2006
@@ -4,6 +4,7 @@
 define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
 define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
 define('_AD_BASE_ERROR_OPTIONS', "オプションの値が不正です");
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");

From onokazu ＠ users.sourceforge.jp  Sat Apr  8 14:10:37 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat,  8 Apr 2006 14:10:37 +0900
Subject: [xoops-cvslog 2686] CVS update: xoops2jp/html/include
Message-ID: <20060408051037.C5F5A2AC02C@users.sourceforge.jp>

Index: xoops2jp/html/include/checklogin.php
diff -u xoops2jp/html/include/checklogin.php:1.4 xoops2jp/html/include/checklogin.php:1.4.6.1
--- xoops2jp/html/include/checklogin.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/include/checklogin.php	Sat Apr  8 14:10:37 2006
@@ -1,99 +1,99 @@
-<?php
-// $Id: checklogin.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 //
-//  ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu)                                          //
-// URL: http://www.xoops.org/ http://jp.xoops.org/  http://www.myweb.ne.jp/  //
-// Project: The XOOPS Project (http://www.xoops.org/)                        //
-// ------------------------------------------------------------------------- //
-
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
-include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php';
-$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
-$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
-if ($uname == '' || $pass == '') {
-    redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN);
-    exit();
-}
-$member_handler =& xoops_gethandler('member');
-$myts =& MyTextsanitizer::getInstance();
-$user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($uname)), addslashes($myts->stripSlashesGPC($pass)));
-if (false != $user) {
-    if (0 == $user->getVar('level')) {
-        redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
-        exit();
-    }
-    if ($xoopsConfig['closesite'] == 1) {
-        $allowed = false;
-        foreach ($user->getGroups() as $group) {
-            if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
-                $allowed = true;
-                break;
-            }
-        }
-        if (!$allowed) {
-            redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
-            exit();
-        }
-    }
-    $user->setVar('last_login', time());
-    if (!$member_handler->insertUser($user)) {
-    }
-    $_SESSION = array();
-    $_SESSION['xoopsUserId'] = $user->getVar('uid');
-    $_SESSION['xoopsUserGroups'] = $user->getGroups();
-    if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
-        setcookie($xoopsConfig['session_name'], session_id(), time()+(60 * $xoopsConfig['session_expire']), '/',  '', 0);
-    }
-    $user_theme = $user->getVar('theme');
-    if (in_array($user_theme, $xoopsConfig['theme_set_allowed'])) {
-        $_SESSION['xoopsUserTheme'] = $user_theme;
-    }
-    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';
-    }
-
-    // RMV-NOTIFY
-    // Perform some maintenance of notification records
-    $notification_handler =& xoops_gethandler('notification');
-    $notification_handler->doLoginMaintenance($user->getVar('uid'));
-
-    redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')));
-} else {
-
-    redirect_header(XOOPS_URL.'/user.php',1,_US_INCORRECTLOGIN);
-}
-exit();
-?>
+<?php
+// $Id: checklogin.php,v 1.4.6.1 2006/04/08 05:10:37 onokazu Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  This program is free software; you can redistribute it and/or modify     //
+//  it under the terms of the GNU General Public License as published by     //
+//  the Free Software Foundation; either version 2 of the License, or        //
+//  (at your option) any later version.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  You should have received a copy of the GNU General Public License        //
+//  along with this program; if not, write to the Free Software              //
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu)                                          //
+// URL: http://www.xoops.org/ http://jp.xoops.org/  http://www.myweb.ne.jp/  //
+// Project: The XOOPS Project (http://www.xoops.org/)                        //
+// ------------------------------------------------------------------------- //
+
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit();
+}
+include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php';
+$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
+$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
+if ($uname == '' || $pass == '') {
+    redirect_header(XOOPS_URL.'/user.php', 1, _US_INCORRECTLOGIN);
+    exit();
+}
+$member_handler =& xoops_gethandler('member');
+$myts =& MyTextsanitizer::getInstance();
+$user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($uname)), $myts->stripSlashesGPC($pass));
+if (false != $user) {
+    if (0 == $user->getVar('level')) {
+        redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
+        exit();
+    }
+    if ($xoopsConfig['closesite'] == 1) {
+        $allowed = false;
+        foreach ($user->getGroups() as $group) {
+            if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
+                $allowed = true;
+                break;
+            }
+        }
+        if (!$allowed) {
+            redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
+            exit();
+        }
+    }
+    $user->setVar('last_login', time());
+    if (!$member_handler->insertUser($user)) {
+    }
+    $_SESSION = array();
+    $_SESSION['xoopsUserId'] = $user->getVar('uid');
+    $_SESSION['xoopsUserGroups'] = $user->getGroups();
+    if ($xoopsConfig['use_mysession'] && $xoopsConfig['session_name'] != '') {
+        setcookie($xoopsConfig['session_name'], session_id(), time()+(60 * $xoopsConfig['session_expire']), '/',  '', 0);
+    }
+    $user_theme = $user->getVar('theme');
+    if (in_array($user_theme, $xoopsConfig['theme_set_allowed'])) {
+        $_SESSION['xoopsUserTheme'] = $user_theme;
+    }
+    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';
+    }
+
+    // RMV-NOTIFY
+    // Perform some maintenance of notification records
+    $notification_handler =& xoops_gethandler('notification');
+    $notification_handler->doLoginMaintenance($user->getVar('uid'));
+
+    redirect_header($url, 1, sprintf(_US_LOGGINGU, $user->getVar('uname')));
+} else {
+
+    redirect_header(XOOPS_URL.'/user.php',1,_US_INCORRECTLOGIN);
+}
+exit();
+?>

From onokazu ＠ users.sourceforge.jp  Sat Apr  8 14:10:38 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat,  8 Apr 2006 14:10:38 +0900
Subject: [xoops-cvslog 2687] CVS update: xoops2jp/html/kernel
Message-ID: <20060408051038.1A72F2AC039@users.sourceforge.jp>

Index: xoops2jp/html/kernel/member.php
diff -u xoops2jp/html/kernel/member.php:1.4.6.1 xoops2jp/html/kernel/member.php:1.4.6.2
--- xoops2jp/html/kernel/member.php:1.4.6.1	Sun Feb  5 14:19:52 2006
+++ xoops2jp/html/kernel/member.php	Sat Apr  8 14:10:37 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: member.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
+// $Id: member.php,v 1.4.6.2 2006/04/08 05:10:37 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -322,26 +322,20 @@
      *
      * @param string $uname username as entered in the login form
      * @param string $pwd password entered in the login form
-     * @return object XoopsUser reference to the logged in user. FALSE if failed to log in
+     * @return mixed XoopsUser reference to the logged in user. FALSE if failed to log in
      */
     function &loginUser($uname, $pwd)
     {
-        $criteria = new CriteriaCompo(new Criteria('uname', $uname));
-        $criteria->add(new Criteria('pass', md5($pwd)));
-        $user =& $this->_uHandler->getObjects($criteria, false);
-        if (!$user || count($user) != 1) {
-            $ret = false;
-            return $ret;
-        }
-        return $user[0];
+        $user =& $this->loginUserMd5($uname, md5($pwd));
+        return $user;
     }
 
     /**
-     * logs in a user with an nd5 encrypted password
+     * logs in a user with an md5 encrypted password
      *
      * @param string $uname username
      * @param string $md5pwd password encrypted with md5
-     * @return object XoopsUser reference to the logged in user. FALSE if failed to log in
+     * @return mixed XoopsUser reference to the logged in user. FALSE if failed to log in
      */
     function &loginUserMd5($uname, $md5pwd)
     {

From onokazu ＠ users.sourceforge.jp  Sun Apr  9 03:32:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  9 Apr 2006 03:32:51 +0900
Subject: [xoops-cvslog 2688] CVS update: xoops2jp/extras
Message-ID: <20060408183251.3D6792AC090@users.sourceforge.jp>

Index: xoops2jp/extras/login.php
diff -u xoops2jp/extras/login.php:1.3 xoops2jp/extras/login.php:1.3.6.1
--- xoops2jp/extras/login.php:1.3	Sat Jun 11 11:32:37 2005
+++ xoops2jp/extras/login.php	Sun Apr  9 03:32:51 2006
@@ -40,7 +40,7 @@
 if ($op == 'dologin') {
     $member_handler =& xoops_gethandler('member');
     $myts =& MyTextsanitizer::getInstance();
-    $user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
+    $user =& $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), $myts->stripSlashesGPC($password));
     if (is_object($user)) {
         if (0 == $user->getVar('level')) {
             redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);

From onokazu ＠ users.sourceforge.jp  Sun Apr  9 03:32:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  9 Apr 2006 03:32:51 +0900
Subject: [xoops-cvslog 2689] CVS update: xoops2jp/html/class/xml/rpc
Message-ID: <20060408183251.6228C2AC094@users.sourceforge.jp>

Index: xoops2jp/html/class/xml/rpc/xmlrpcapi.php
diff -u xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.5 xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.5.6.1
--- xoops2jp/html/class/xml/rpc/xmlrpcapi.php:1.5	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/xml/rpc/xmlrpcapi.php	Sun Apr  9 03:32:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xmlrpcapi.php,v 1.5 2005/08/03 12:39:11 onokazu Exp $
+// $Id: xmlrpcapi.php,v 1.5.6.1 2006/04/08 18:32:51 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -73,7 +73,7 @@
             return true;
         }
         $member_handler =& xoops_gethandler('member');
-        $this->user =& $member_handler->loginUser(addslashes($username), addslashes($password));
+        $this->user =& $member_handler->loginUser(addslashes($username), trim($password));
         if (!is_object($this->user)) {
             unset($this->user);
             return false;

From onokazu ＠ users.sourceforge.jp  Sun Apr  9 03:32:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sun,  9 Apr 2006 03:32:51 +0900
Subject: [xoops-cvslog 2690] CVS update:
	xoops2jp/html/modules/system/admin/users
Message-ID: <20060408183251.8F9D12AC090@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/users/main.php
diff -u xoops2jp/html/modules/system/admin/users/main.php:1.6 xoops2jp/html/modules/system/admin/users/main.php:1.6.4.1
--- xoops2jp/html/modules/system/admin/users/main.php:1.6	Mon Sep  5 05:46:11 2005
+++ xoops2jp/html/modules/system/admin/users/main.php	Sun Apr  9 03:32:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: main.php,v 1.6 2005/09/04 20:46:11 onokazu Exp $
+// $Id: main.php,v 1.6.4.1 2006/04/08 18:32:51 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -99,7 +99,7 @@
                     xoops_cp_footer();
                     exit();
                 }
-                $edituser->setVar("pass", md5($_POST['pass']));
+                $edituser->setVar("pass", md5($myts->stripSlashesGPC(trim($_POST['pass']))));
             }
             if (!$member_handler->insertUser($edituser)) {
                 xoops_cp_header();
@@ -264,7 +264,7 @@
                     xoops_cp_footer();
                     exit();
                 }
-                $newuser->setVar("pass", md5($_POST['pass']));
+                $newuser->setVar("pass", md5($myts->stripSlashesGPC(trim($_POST['pass']))));
             }
             $newuser->setVar("timezone_offset", $_POST['timezone_offset']);
             $newuser->setVar("uorder", $_POST['uorder']);

From nobunobu ＠ users.sourceforge.jp  Sun Apr  9 10:24:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  9 Apr 2006 10:24:04 +0900
Subject: [xoops-cvslog 2691] CVS update: xoops2jp/html/settings
Message-ID: <20060409012404.24A172AC03D@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.8 xoops2jp/html/settings/site_default.ini.php:1.1.2.9
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.8	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/settings/site_default.ini.php	Sun Apr  9 10:24:04 2006
@@ -30,6 +30,8 @@
 [Legacy_RenderSystem]
 path=/modules/legacyRender/kernel
 class=Legacy_RenderSystem
+SystemTemplate=system_comment.html, system_comments_flat.html, system_comments_thread.html, system_comments_nest.html, system_notification_select.html
+SystemTemplatePrefix=legacy
 
 [Legacy_AdminRenderSystem]
 path=/modules/base/kernel

From nobunobu ＠ users.sourceforge.jp  Sun Apr  9 10:24:03 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  9 Apr 2006 10:24:03 +0900
Subject: [xoops-cvslog 2692] CVS update: xoops2jp/html/class/smarty/plugins
Message-ID: <20060409012403.F316C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/plugins/resource.db.php
diff -u xoops2jp/html/class/smarty/plugins/resource.db.php:1.1 xoops2jp/html/class/smarty/plugins/resource.db.php:1.1.8.1
--- xoops2jp/html/class/smarty/plugins/resource.db.php:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/html/class/smarty/plugins/resource.db.php	Sun Apr  9 10:24:03 2006
@@ -8,8 +8,28 @@
  * Purpose:  Fetches templates from a database
  * -------------------------------------------------------------
  */
+
+function smarty_resource_db_systemTpl($tpl_name)
+{
+    // Replace Legacy System Template name to Legacy Module Template name
+    static $patterns = null;
+    static $replacements = null;
+    if (!$patterns) {
+        $root=&XCube_Root::getSingleton();
+        $systemTemplates = explode(',',$root->getSiteConfig('Legacy_RenderSystem','SystemTemplate',''));
+        $prefix = $root->getSiteConfig('Legacy_RenderSystem','SystemTemplatePrefix','legacy');
+        $patterns = preg_replace('/^\s*([^\s]*)\s*$/e', '"/".preg_quote("\1","/")."/"', $systemTemplates);
+        $replacements = preg_replace('/^\s*system_([^\s]*)\s*/', $prefix.'_\1', $systemTemplates);
+    }
+    if ($patterns) {
+        $tpl_name = preg_replace($patterns, $replacements,$tpl_name);
+    }
+    return $tpl_name;
+}
+
 function smarty_resource_db_source($tpl_name, &$tpl_source, &$smarty)
 {
+    $tpl_name = smarty_resource_db_systemTpl($tpl_name);
     $tplfile_handler =& xoops_gethandler('tplfile');
 	$tplobj =& $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], null, null, null, $tpl_name, true);
 	if (count($tplobj) > 0) {
@@ -65,6 +85,7 @@
 
 function smarty_resource_db_timestamp($tpl_name, &$tpl_timestamp, &$smarty)
 {
+    $tpl_name = smarty_resource_db_systemTpl($tpl_name);
     $tplfile_handler =& xoops_gethandler('tplfile');
     $tplobj =& $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], null, null, null, $tpl_name, false);
 	if (count($tplobj) > 0) {

From nobunobu ＠ users.sourceforge.jp  Sun Apr  9 10:24:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  9 Apr 2006 10:24:04 +0900
Subject: [xoops-cvslog 2693] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060409012404.503E12AC0D7@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_comment.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.1
--- /dev/null	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment.html	Sun Apr  9 10:24:04 2006
@@ -0,0 +1,50 @@
+<!-- start comment post -->
+        <tr>
+          <td class="head"><a id="comment<{$comment.id}>"></a> <{$comment.poster.uname}></td>
+          <td class="head"><div class="comDate"><span class="comDateCaption"><{$lang_posted}>:</span> <{$comment.date_posted}>&nbsp;&nbsp;<span class="comDateCaption"><{$lang_updated}>:</span> <{$comment.date_modified}></div></td>
+        </tr>
+        <tr>
+
+          <{if $comment.poster.id != 0}>
+
+          <td class="odd"><div class="comUserRank"><div class="comUserRankText"><{$comment.poster.rank_title}></div><img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" /></div><img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" /><div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div><div class="comUserStat"><span class="comUserStatCaption"><{$lang_from}>:</span> <{$comment.poster.from}></div><div class="comUserStat"><span class="comUserStatCaption"><{$lang_posts}>:</span> <{$comment.poster.postnum}></div><div class="comUserStatus"><{$comment.poster.status}></div></td>
+
+          <{else}>
+
+          <td class="odd"> </td>
+
+          <{/if}>
+
+          <td class="odd">
+            <div class="comTitle"><{$comment.image}><{$comment.title}></div><div class="comText"><{$comment.text}></div>
+          </td>
+        </tr>
+        <tr>
+          <td class="even"></td>
+
+          <{if $xoops_iscommentadmin == true}>
+
+          <td class="even" align="right">
+            <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a><a href="<{$deletecomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" /></a><a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+          </td>
+
+          <{elseif $xoops_isuser == true && $xoops_userid == $comment.poster.id}>
+
+          <td class="even" align="right">
+            <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a><a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+          </td>
+
+          <{elseif $xoops_isuser == true || $anon_canpost == true}>
+
+          <td class="even" align="right">
+            <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+          </td>
+
+          <{else}>
+
+          <td class="even"> </td>
+
+          <{/if}>
+
+        </tr>
+<!-- end comment post -->
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_comments_flat.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_comments_flat.html:1.1.2.1
--- /dev/null	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_comments_flat.html	Sun Apr  9 10:24:04 2006
@@ -0,0 +1,9 @@
+<table class="outer" cellpadding="5" cellspacing="1">
+  <tr>
+    <th width="20%"><{$lang_poster}></th>
+    <th><{$lang_thread}></th>
+  </tr>
+  <{foreach item=comment from=$comments}>
+    <{include file="db:legacy_comment.html" comment=$comment}>
+  <{/foreach}>
+</table>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_comments_nest.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_comments_nest.html:1.1.2.1
--- /dev/null	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_comments_nest.html	Sun Apr  9 10:24:04 2006
@@ -0,0 +1,30 @@
+<{section name=i loop=$comments}>
+<br />
+<table cellspacing="1" class="outer">
+  <tr>
+    <th width="20%"><{$lang_poster}></th>
+    <th><{$lang_thread}></th>
+  </tr>
+  <{include file="db:legacy_comment.html" comment=$comments[i]}>
+</table>
+
+<!-- start comment replies -->
+<{foreach item=reply from=$comments[i].replies}>
+<br />
+<table cellspacing="0" border="0">
+  <tr>
+    <td width="<{$reply.prefix}>"></td>
+    <td>
+      <table class="outer" cellspacing="1">
+        <tr>
+          <th width="20%"><{$lang_poster}></th>
+          <th><{$lang_thread}></th>
+        </tr>
+        <{include file="db:system_comment.html" comment=$reply}>
+      </table>
+    </td>
+  </tr>
+</table>
+<{/foreach}>
+<!-- end comment tree -->
+<{/section}>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_comments_thread.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_comments_thread.html:1.1.2.1
--- /dev/null	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_comments_thread.html	Sun Apr  9 10:24:04 2006
@@ -0,0 +1,37 @@
+<{section name=i loop=$comments}>
+<br />
+<table cellspacing="1" class="outer">
+  <tr>
+    <th width="20%"><{$lang_poster}></th>
+    <th><{$lang_thread}></th>
+  </tr>
+  <{include file="db:legacy_comment.html" comment=$comments[i]}>
+</table>
+
+<{if $show_threadnav == true}>
+<div style="text-align:left; margin:3px; padding: 5px;">
+<a href="<{$comment_url}>"><{$lang_top}></a> | <a href="<{$comment_url}>&amp;com_id=<{$comments[i].pid}>&amp;com_rootid=<{$comments[i].rootid}>#newscomment<{$comments[i].pid}>"><{$lang_parent}></a>
+</div>
+<{/if}>
+
+<{if $comments[i].show_replies == true}>
+<!-- start comment tree -->
+<br />
+<table cellspacing="1" class="outer">
+  <tr>
+    <th width="50%"><{$lang_subject}></th>
+    <th width="20%" align="center"><{$lang_poster}></th>
+    <th align="right"><{$lang_posted}></th>
+  </tr>
+  <{foreach item=reply from=$comments[i].replies}>
+  <tr>
+    <td class="even"><{$reply.prefix}> <a href="<{$comment_url}>&amp;com_id=<{$reply.id}>&amp;com_rootid=<{$reply.root_id}>"><{$reply.title}></a></td>
+    <td class="odd" align="center"><{$reply.poster.uname}></td>
+    <td class="even" align="right"><{$reply.date_posted}></td>
+  </tr>
+  <{/foreach}>
+</table>
+<!-- end comment tree -->
+<{/if}>
+
+<{/section}>
\ No newline at end of file
Index: xoops2jp/html/modules/base/templates/legacy_notification_select.html
diff -u /dev/null xoops2jp/html/modules/base/templates/legacy_notification_select.html:1.1.2.1
--- /dev/null	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_notification_select.html	Sun Apr  9 10:24:04 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;"><{$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 nobunobu ＠ users.sourceforge.jp  Sun Apr  9 10:26:43 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun,  9 Apr 2006 10:26:43 +0900
Subject: [xoops-cvslog 2694] CVS update: xoops2jp/html/modules/base
Message-ID: <20060409012643.92D382AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/xoops_version.php
diff -u xoops2jp/html/modules/base/xoops_version.php:1.1.2.18 xoops2jp/html/modules/base/xoops_version.php:1.1.2.19
--- xoops2jp/html/modules/base/xoops_version.php:1.1.2.18	Wed Mar 29 22:52:01 2006
+++ xoops2jp/html/modules/base/xoops_version.php	Sun Apr  9 10:26:43 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.18 2006/03/29 13:52:01 nobunobu Exp $
+// $Id: xoops_version.php,v 1.1.2.19 2006/04/09 01:26:43 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //              XOOPSCube - PHP Content Management System                    //
 //                  Copyright (c) 2005 XOOPSCube.org                         //
@@ -68,6 +68,16 @@
 $modversion['templates'][9]['description'] = '';
 $modversion['templates'][10]['file'] = 'legacy_comment_navi.html';
 $modversion['templates'][10]['description'] = '';
+$modversion['templates'][11]['file'] = 'legacy_comment.html';
+$modversion['templates'][11]['description'] = '';
+$modversion['templates'][12]['file'] = 'legacy_comments_flat.html';
+$modversion['templates'][12]['description'] = '';
+$modversion['templates'][13]['file'] = 'legacy_comments_nest.html';
+$modversion['templates'][13]['description'] = '';
+$modversion['templates'][14]['file'] = 'legacy_comments_thread.html';
+$modversion['templates'][14]['description'] = '';
+$modversion['templates'][15]['file'] = 'legacy_notification_select.html';
+$modversion['templates'][15]['description'] = '';
 
 // Menu
 $modversion['hasMain'] = 0;

From tom_g3x ＠ users.sourceforge.jp  Sun Apr  9 23:47:16 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun,  9 Apr 2006 23:47:16 +0900
Subject: [xoops-cvslog 2695] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060409144716.CA39C2AC043@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.26 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.27
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.26	Fri Apr  7 18:03:29 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Sun Apr  9 23:47:16 2006
@@ -12,11 +12,13 @@
 define('_AD_BASE_LANG_ADD_CUSTOM_BLOCK', "カスタムブロック追加");
 define('_AD_BASE_LANG_ALL_MODULES', "すべてのモジュール");
 define('_AD_BASE_LANG_ALL_STATUS', "すべてのステータス");
-define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
-define('_AD_BASE_LANG_BID', "bid");
+define('_AD_BASE_LANG_BCACHETIME', "キャッシュ");
+define('_AD_BASE_LANG_BID', "BID");
+define('_AD_BASE_LANG_BLOCK_EDIT', "ブロック編集");
 define('_AD_BASE_LANG_BLOCK_INSTALL', "ブロックのインストール");
 define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
-define('_AD_BASE_LANG_C_TYPE', "c type");
+define('_AD_BASE_LANG_BLOCK_UNINSTALL', "ブロックのアンインストール");
+define('_AD_BASE_LANG_C_TYPE', "タイプ");
 define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
 define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
 define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block right");
@@ -40,13 +42,15 @@
 define('_AD_BASE_LANG_COMMENT_EDIT', "コメント編集");
 define('_AD_BASE_LANG_COMMENT_NEW', "コメント新規追加");
 define('_AD_BASE_LANG_COMMENT_VIEW', "コメント閲覧");
-define('_AD_BASE_LANG_CONTENT', "content");
-define('_AD_BASE_LANG_CONTROL', "コントロール");
+define('_AD_BASE_LANG_CONTENT', "コンテンツ");
+define('_AD_BASE_LANG_CONTROL', "操作");
 define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
 define('_AD_BASE_LANG_CUSTOM_HTML', "カスタム(HTML)");
 define('_AD_BASE_LANG_CUSTOM_PHP', "カスタム(PHP)");
 define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "カスタム(顔アイコン有効)");
 define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "カスタム(顔アイコン無効)");
+define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "カスタムブロック削除");
+define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "カスタムブロック編集");
 define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "表示");
 define('_AD_BASE_LANG_DOBR', "改行を自動挿入する");
@@ -60,8 +64,9 @@
 define('_AD_BASE_LANG_FUNC_NUM', "func num");
 define('_AD_BASE_LANG_ID', "ID");
 define('_AD_BASE_LANG_ISACTIVE', "isactive");
-define('_AD_BASE_LANG_LAST_MODIFIED', "last modified");
-define('_AD_BASE_LANG_MID', "mid");
+define('_AD_BASE_LANG_LAST_MODIFIED', "最終更新日時");
+define('_AD_BASE_LANG_LCR', "右-中央-左");
+define('_AD_BASE_LANG_MID', "モジュール");
 define('_AD_BASE_LANG_NAME', "name");
 define('_AD_BASE_LANG_ONLINE_IP', "online ip");
 define('_AD_BASE_LANG_ONLINE_MODULE', "online module");
@@ -71,7 +76,7 @@
 define('_AD_BASE_LANG_OPTIONS', "options");
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス");
 define('_AD_BASE_LANG_SHOW_FUNC', "show func");
-define('_AD_BASE_LANG_SIDE', "side");
+define('_AD_BASE_LANG_SIDE', "表示サイド");
 define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block left");
 define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block right");
 define('_AD_BASE_LANG_SMILE_URL', "画像");
@@ -81,11 +86,11 @@
 define('_AD_BASE_LANG_SUBMIT', "送信");
 define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
 define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
-define('_AD_BASE_LANG_TEMPLATE', "template");
-define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_TEMPLATE', "テンプレート");
+define('_AD_BASE_LANG_TITLE', "タイトル");
 define('_AD_BASE_LANG_TOPPAGE', "トップページ");
 define('_AD_BASE_LANG_VISIBLE', "visible");
-define('_AD_BASE_LANG_WEIGHT', "weight");
+define('_AD_BASE_LANG_WEIGHT', "並び順");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");
 define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "<a href=\"index.php?action=BlockInstallList\">新しいブロックをインストール</a>して、サイトをカスタマイズしましょう。<br/>モジュール付属のブロック以外にも、<a href=\"index.php?action=CustomBlockEdit\">カスタムブロックを追加</a>して、自由なメッセージをブロックカラムに追加できます。");

From tom_g3x ＠ users.sourceforge.jp  Sun Apr  9 23:47:29 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun,  9 Apr 2006 23:47:29 +0900
Subject: [xoops-cvslog 2696] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060409144729.4A2302AC043@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.22 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.23
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.22	Fri Apr  7 18:03:23 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sun Apr  9 23:47:29 2006
@@ -15,7 +15,9 @@
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
 define('_AD_BASE_LANG_BID', "bid");
 define('_AD_BASE_LANG_BLOCK_INSTALL', "block install");
+define('_AD_BASE_LANG_BLOCK_EDIT', "block edit");
 define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
+define('_AD_BASE_LANG_BLOCK_UNINSTALL', "block uninstall");
 define('_AD_BASE_LANG_C_TYPE', "c type");
 define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
 define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
@@ -47,6 +49,8 @@
 define('_AD_BASE_LANG_CUSTOM_PHP', "Custom PHP");
 define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "Custom with Smilies");
 define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "Custom without Smilies");
+define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "custom block delete");
+define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "custom block edit");
 define('_AD_BASE_LANG_DIRNAME', "dirname");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
@@ -61,6 +65,7 @@
 define('_AD_BASE_LANG_ID', "ID");
 define('_AD_BASE_LANG_ISACTIVE', "isactive");
 define('_AD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_AD_BASE_LANG_LCR', "L-CTR-R");
 define('_AD_BASE_LANG_MID', "mid");
 define('_AD_BASE_LANG_NAME', "name");
 define('_AD_BASE_LANG_ONLINE_IP', "online ip");

From tom_g3x ＠ users.sourceforge.jp  Sun Apr  9 23:48:01 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sun,  9 Apr 2006 23:48:01 +0900
Subject: [xoops-cvslog 2697] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060409144801.6DDB12AC043@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.1	Fri Apr  7 13:47:50 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_delete.html	Sun Apr  9 23:48:01 2006
@@ -1,97 +1,111 @@
-<p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_DELETE}>
+</div>
 
-<table class="outer" cellspacing="1">
+<h3><{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_DELETE}></h3>
+
+<ul>
+  <li><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></li>
+</ul>
+
+<form action="./index.php?action=CustomBlockDelete" method="POST">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th colspan="2"><{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_DELETE}></th>
+    </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BID}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BID}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_MID}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_MID}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_OPTIONS}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_NAME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_NAME}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_CONTENT}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
       </td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_VISIBLE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_VISIBLE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_C_TYPE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_C_TYPE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_DIRNAME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_DIRNAME}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></td>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
       </td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|xoops_formattimestamp:l}></td>
     </tr>
     <tr>
-      <td class="foot" colspan="2" style="text-align:center;"><br />
-        <form action="./index.php?action=CustomBlockDelete" method="POST">
-          <{xoops_token form=$actionForm}>
-          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
-          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        </form>
+      <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" />
       </td>
     </tr>
-</table>
+  </table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html
diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.3	Thu Apr  6 16:54:38 2006
+++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html	Sun Apr  9 23:48:01 2006
@@ -1,4 +1,14 @@
-<p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_UNINSTALL}>
+</div>
+
+<h3><{$smarty.const._AD_BASE_LANG_BLOCK_UNINSTALL}></h3>
+
+<ul>
+  <li><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></li>
+</ul>
 
 <div class="tips">
   <{if $object->get('block_type') == 'C'}>
@@ -8,98 +18,102 @@
   <{/if}>
 </div>
 
-<table class="outer" cellspacing="1">
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_MID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_NAME}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TITLE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SIDE}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
-      </td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_VISIBLE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_C_TYPE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_DIRNAME}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
-      </td>
-    </tr>
-    <tr>
-      <th style="width:30%;"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|xoops_formattimestamp:l}></td>
-    </tr>
-    <tr>
-      <td class="foot" colspan="2" style="text-align:center;"><br />
-        <form action="./index.php?action=BlockUninstall" method="POST">
-          <{xoops_token form=$actionForm}>
-          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
-          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
-        </form>
-      </td>
-    </tr>
+<form action="./index.php?action=BlockUninstall" method="POST">
+<{xoops_token form=$actionForm}>
+<{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+<table class="outer">
+  <tr>
+    <th colspan="2"><{$smarty.const._AD_BASE_LANG_BLOCK_UNINSTALL}></th>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_BID}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+  </tr>
+  <tr>
+  <td class="head"><{$smarty.const._AD_BASE_LANG_MID}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_OPTIONS}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_NAME}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_CONTENT}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_VISIBLE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_C_TYPE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_DIRNAME}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></td>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+    <td class="<{cycle values="odd,even"}>">
+      <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
+    <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|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" />
+    </td>
+  </tr>
 </table>
+</form>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.4	Fri Apr  7 17:45:46 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Sun Apr  9 23:48:01 2006
@@ -1,3 +1,10 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+</div>
+
+<h3><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></h3>
+
 <div class="tips">
   <{$smarty.const._AD_BASE_TIPS_ADD_CUSTOM_BLOCK}>
 </div>
@@ -16,7 +23,7 @@
 <{/if}>
 <form method="POST" action="./index.php?action=BlockList">
   <{xoops_token form=$actionForm}>
-  <table class="outer" cellspacing="1">
+  <table class="outer">
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_BID}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
@@ -24,21 +31,21 @@
       <th><{$smarty.const._AD_BASE_LANG_MID}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+<{*
       <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+*}>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-      <th><{$smarty.const._AD_BASE_LANG_SIDE}><br />
+      <th><{$smarty.const._AD_BASE_LANG_SIDE}>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a><br />
+        <{$smarty.const._AD_BASE_LANG_LCR}></th>
       <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-      <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -51,35 +58,32 @@
       <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
     </tr>
     <{foreach item=obj from=$objects}>
-      <tr class="<{cycle values='odd,even'}>">
+      <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
         <td><{$obj->getVar('bid')}></td>
-        <td>
+        <td style="text-align:left;">
           <{if $obj->mModule}>
             <{$obj->mModule->getVar('name')}>
           <{else}>
             &nbsp;
           <{/if}>
         </td>
+<{*
         <td><{$obj->getVar('name')}></td>
-        <td><{$obj->getVar('title')}></td>
-        <td>
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
+*}>
+        <td style="text-align:left;"><{$obj->getVar('title')}></td>
+        <td nowrap>
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
         </td>
         <td>
           <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}>
         </td>
-        <td><{$obj->getVar('block_type')}></td>
         <td><{$obj->getVar('c_type')}></td>
         <td>
           <select name="bcachetime[<{$obj->getVar('bid')}>]">
             <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}>
           </select>
         </td>
-        <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
+        <td style="text-align:left;"><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
         <td>
           <{if $obj->get('block_type') == 'C'}>
             <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
@@ -91,11 +95,11 @@
       </tr>
     <{/foreach}>
     <tr class="foot">
-      <td>
-        <input type="submit" />
+      <td colspan="10" class="foot">
+        <input type="submit" value="<{$smarty.const._SUBMIT}>"/>
       </td>
     </tr>
   </table>
 </form>
-<br />
+
 <div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.4	Thu Apr  6 16:54:38 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Sun Apr  9 23:48:01 2006
@@ -1,3 +1,11 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_EDIT}>
+</div>
+
+<h3><{$smarty.const._AD_BASE_LANG_BLOCK_EDIT}></h3>
+
 <{if $actionForm->hasError()}>
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
@@ -10,13 +18,16 @@
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <th colspan="2"><{$smarty.const._AD_BASE_LANG_BLOCK_EDIT}></th>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
           <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
@@ -24,13 +35,13 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
           <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
@@ -38,7 +49,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
           <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
@@ -46,7 +57,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
           <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
@@ -64,6 +75,7 @@
     <tr class="foot">
       <td colspan="2" style="text-align:center;">
         <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/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.2	Thu Apr  6 16:54:38 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Sun Apr  9 23:48:01 2006
@@ -1,3 +1,11 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  &raquo;&raquo; <{$smarty.const._MI_BASE_MENU_BLOCKINSTALL}>
+</div>
+
+<h3><{$smarty.const._MI_BASE_MENU_BLOCKINSTALL}></h3>
+
 <div class="tips">
   <{$smarty.const._AD_BASE_TIPS_INSTALL_BLOCK}>
 </div>
@@ -5,7 +13,7 @@
   [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
 </div>
 <br/>
-<table class="outer" cellspacing="1">
+<table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
@@ -13,15 +21,14 @@
     <th><{$smarty.const._AD_BASE_LANG_MID}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+<{*
     <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+*}>
     <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BLOCK_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -40,9 +47,10 @@
           &nbsp;
         <{/if}>
       </td>
+<{*
       <td><{$obj->getVar('name')}></td>
+*}>
       <td><{$obj->getVar('title')}></td>
-      <td><{$obj->getVar('block_type')}></td>
       <td><{$obj->getVar('c_type')}></td>
       <td><{$obj->getVar('template')}></td>
       <td>
@@ -54,5 +62,5 @@
     </tr>
   <{/foreach}>
 </table>
-<br />
+
 <div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.2	Thu Apr  6 16:54:38 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html	Sun Apr  9 23:48:01 2006
@@ -1,3 +1,11 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
+</div>
+
+<h3><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></h3>
+
 <{if $actionForm->hasError()}>
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
@@ -5,18 +13,22 @@
     <{/foreach}>
   </ul>
 <{/if}>
+
 <form action="index.php?action=BlockInstallEdit" method="post">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
-  <table class="outer" cellspacing="1">
+  <table class="outer">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <th colspan="2"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></th>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
           <{foreach item=side from=$columnSideArr}>
@@ -26,13 +38,13 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
           <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
@@ -40,7 +52,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
           <{foreach item=module from=$moduleArr}>
@@ -50,7 +62,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
           <{foreach item=group from=$groupArr}>
@@ -61,15 +73,16 @@
     </tr>
     <{if $optionForm != null}>
       <tr>
-        <th><{$smarty.const._AD_BASE_LANG_OPTIONS}></th>
+        <td class="head"><{$smarty.const._AD_BASE_LANG_OPTIONS}></td>
         <td class="<{cycle values="odd,even"}>">
           <{$optionForm}>
         </td>
       </tr>
     <{/if}>
     <tr class="foot">
-      <td colspan="2" style="text-align:center;">
-        <input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
+      <td colspan="2">
+        <input class="formButton" type="submit" value="<{$smarty.const._INSTALL}>" />
+        <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
       </td>
     </tr>
   </table>
Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.1	Thu Apr  6 16:54:25 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html	Sun Apr  9 23:48:01 2006
@@ -1,3 +1,21 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
+  <{if $actionForm->getVar('content')}>
+    &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+  <{else}>
+    &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
+  <{/if}>
+</div>
+
+<h3>
+  <{if $actionForm->getVar('content')}>
+    <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+  <{else}>
+    <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
+  <{/if}>
+</h3>
+
 <{if $actionForm->hasError()}>
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
@@ -5,18 +23,28 @@
     <{/foreach}>
   </ul>
 <{/if}>
+
 <form action="index.php?action=CustomBlockEdit" method="post">
   <{xoops_token form=$actionForm}>
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
-  <table class="outer" cellspacing="1">
+  <table class="outer">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
+      <th colspan="2">
+        <{if $actionForm->getVar('content')}>
+          <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+        <{else}>
+          <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
+        <{/if}>
+      </th>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
+        <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_SIDE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name="side">
           <{xoops_optionsArray from=$columnSideArr label=name value=id default=$actionForm->get('side')}>
@@ -24,19 +52,19 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_WEIGHT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=weight value=$actionForm->getVar('weight')}>
+        <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_CONTENT}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_CONTENT}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=content value=$actionForm->getVar('content')}>
+        <{xoops_dhtmltarea type=text name=content value=$actionForm->getVar('content') rows=20 cols=60}>
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_CTYPE}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_C_TYPE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='c_type'>
           <{xoops_optionsArray from=$ctypeArr value=type label=label default=$actionForm->get('ctype')}>
@@ -44,7 +72,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='bcachetime'>
           <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
@@ -52,7 +80,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='bmodule[]' multiple='multiple'>
           <{xoops_optionsArray from=$moduleArr value=mid label=name default=$actionForm->get('bmodule')}>
@@ -60,7 +88,7 @@
       </td>
     </tr>
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></th>
+      <td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></td>
       <td class="<{cycle values="odd,even"}>">
         <select  size='5' name='groupid[]' multiple='multiple'>
           <{xoops_optionsArray from=$groupArr value=groupid label=name default=$actionForm->get('groupid')}>
@@ -68,8 +96,9 @@
       </td>
     </tr>
     <tr class="foot">
-      <td colspan="2" style="text-align:center;">
+      <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" />
       </td>
     </tr>
   </table>

From onokazu ＠ users.sourceforge.jp  Mon Apr 10 12:05:04 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Mon, 10 Apr 2006 12:05:04 +0900
Subject: [xoops-cvslog 2698] CVS update: xoops2jp/html/install
Message-ID: <20060410030504.5F7DC2AC082@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.4 xoops2jp/html/install/index.php:1.4.2.1
--- xoops2jp/html/install/index.php:1.4	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/install/index.php	Mon Apr 10 12:05:03 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.4 2005/10/24 11:44:16 onokazu Exp $
+// $Id: index.php,v 1.4.2.1 2006/04/10 03:05:03 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -1173,7 +1173,8 @@
 
 case "insertData":
     $adminname = $myts->stripSlashesGPC(trim($_POST['adminname']));
-    $adminpass = $myts->stripSlashesGPC($_POST['adminpass']);
+    $adminpass = $myts->stripSlashesGPC(trim($_POST['adminpass']));
+    $adminpass2 = $myts->stripSlashesGPC(trim($_POST['adminpass2']));
     $adminmail = $myts->stripSlashesGPC(trim($_POST['adminmail']));
 
     if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$adminmail)) {

From minahito ＠ users.sourceforge.jp  Mon Apr 10 19:10:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 19:10:56 +0900
Subject: [xoops-cvslog 2699] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060410101056.0FBF62AC033@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/Legacy_Validator.class.php
diff -u xoops2jp/html/modules/base/class/Legacy_Validator.class.php:1.1.2.2 xoops2jp/html/modules/base/class/Legacy_Validator.class.php:1.1.2.3
--- xoops2jp/html/modules/base/class/Legacy_Validator.class.php:1.1.2.2	Thu Mar 30 17:27:02 2006
+++ xoops2jp/html/modules/base/class/Legacy_Validator.class.php	Mon Apr 10 19:10:55 2006
@@ -15,7 +15,12 @@
 			$handleName = $vars['handler'];
 			$moduleName = isset($vars['module']) ? $vars['module'] : null;
 			
-			$handler =& xoops_getmodulehandler($handleName);
+			if ($moduleName == null) {
+				$handler =& xoops_gethandler($handleName);
+			}
+			else {
+				$handler =& xoops_getmodulehandler($handleName, $moduleName);
+			}
 			$obj =& $handler->get($form->getValue());
 			
 			return is_object($obj);

From minahito ＠ users.sourceforge.jp  Mon Apr 10 20:40:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 20:40:58 +0900
Subject: [xoops-cvslog 2700] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060410114058.57D952AC033@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.11 xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.12
--- xoops2jp/html/modules/base/language/japanese/main.php:1.1.2.11	Thu Apr  6 15:24:11 2006
+++ xoops2jp/html/modules/base/language/japanese/main.php	Mon Apr 10 20:40:58 2006
@@ -1,95 +1,97 @@
-<?php
-
-define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
-define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
-define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
-define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
-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_CODE', "code");
-define('_MD_BASE_LANG_COM_CREATED', "作成日時");
-define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
-define('_MD_BASE_LANG_COM_ICON', "アイコン");
-define('_MD_BASE_LANG_COM_ID', "ID");
-define('_MD_BASE_LANG_COM_IP', "IP");
-define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
-define('_MD_BASE_LANG_COM_MODID', "モジュールID");
-define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
-define('_MD_BASE_LANG_COM_PID', "PID");
-define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
-define('_MD_BASE_LANG_COM_SIG', "署名");
-define('_MD_BASE_LANG_COM_STATUS', "ステータス");
-define('_MD_BASE_LANG_COM_TEXT', "コメント");
-define('_MD_BASE_LANG_COM_TITLE', "表題");
-define('_MD_BASE_LANG_COM_UID', "UID");
-define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
-define('_MD_BASE_LANG_CONTENT', "content");
-define('_MD_BASE_LANG_CONTROL', "control");
-define('_MD_BASE_LANG_CREATE_NEW', "create new");
-define('_MD_BASE_LANG_DIRNAME', "dirname");
-define('_MD_BASE_LANG_DISPLAY', "display");
-define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
-define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
-define('_MD_BASE_LANG_DOIMAGE', "doimage");
-define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
-define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
-define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
-define('_MD_BASE_LANG_EMOTION', "emotion");
-define('_MD_BASE_LANG_FUNC_FILE', "func file");
-define('_MD_BASE_LANG_FUNC_NUM', "func num");
-define('_MD_BASE_LANG_ID', "ID");
-define('_MD_BASE_LANG_IMAGE', "image");
-define('_MD_BASE_LANG_ISACTIVE', "isactive");
-define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
-define('_MD_BASE_LANG_MID', "mid");
-define('_MD_BASE_LANG_NAME', "name");
-define('_MD_BASE_LANG_OPTIONS', "options");
-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_SUBMIT', "送信");
-define('_MD_BASE_LANG_TEMPLATE', "template");
-define('_MD_BASE_LANG_TITLE', "title");
-define('_MD_BASE_LANG_VISIBLE', "visible");
-define('_MD_BASE_LANG_WEIGHT', "weight");
-define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
-define('_MSC_AVAVATARS', "アバター一覧");
-define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
-define('_MSC_CODE', "顔文字");
-define('_MSC_EMOTION', "意味");
-define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
-define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
-define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
-define('_MSC_FRIENDEMAILC', "友達のEmail： ");
-define('_MSC_FRIENDNAMEC', "友達の名前： ");
-define('_MSC_INTSITE', "お薦めサイト： %s");
-define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
-define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
-define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
-define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
-define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
-define('_MSC_SMILIES', "顔アイコン");
-define('_MSC_YOUREMAILC', "あなたのEmail： ");
-define('_MSC_YOURNAMEC', "あなたの名前： ");
-define('_SR_ALL', "すべて（AND検索）");
-define('_SR_ANY', "いずれか（OR検索）");
-define('_SR_EXACT', "フレーズ");
-define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
-define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
-define('_SR_KEYIGNORE', "文字数が ");
-define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
-define('_SR_KEYWORDS', "キーワード");
-define('_SR_NEXT', "次のページ >>");
-define('_SR_NOMATCH', "該当データなし。");
-define('_SR_PLZENTER', "必要なデータを全て入力してください。");
-define('_SR_PREVIOUS', "<< 前のページ");
-define('_SR_SEARCH', "検索");
-define('_SR_SEARCHIN', "検索対象のモジュール");
-define('_SR_SEARCHRESULTS', "検索結果");
-define('_SR_SEARCHRULE', "検索のルール");
-define('_SR_SHOWALLR', "すべて表示");
-define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
-define('_SR_TYPE', "検索の種類");
-
-?>
+<?php
+
+define('_MD_BASE_ERROR_DBUPDATE_FAILED', "dbupdate failed");
+define('_MD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
+define('_MD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
+define('_MD_BASE_LANG_BCACHETIME', "bcachetime");
+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_CODE', "code");
+define('_MD_BASE_LANG_COM_CREATED', "作成日時");
+define('_MD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_MD_BASE_LANG_COM_ICON', "アイコン");
+define('_MD_BASE_LANG_COM_ID', "ID");
+define('_MD_BASE_LANG_COM_IP', "IP");
+define('_MD_BASE_LANG_COM_ITEMID', "ItemID");
+define('_MD_BASE_LANG_COM_MODID', "モジュールID");
+define('_MD_BASE_LANG_COM_MODIFIED', "編集日時");
+define('_MD_BASE_LANG_COM_PID', "PID");
+define('_MD_BASE_LANG_COM_ROOTID', "Root ID");
+define('_MD_BASE_LANG_COM_SIG', "署名");
+define('_MD_BASE_LANG_COM_STATUS', "ステータス");
+define('_MD_BASE_LANG_COM_TEXT', "コメント");
+define('_MD_BASE_LANG_COM_TITLE', "表題");
+define('_MD_BASE_LANG_COM_UID', "UID");
+define('_MD_BASE_LANG_COMMENT_RULE', "コメント投稿に関するルール");
+define('_MD_BASE_LANG_CONTENT', "content");
+define('_MD_BASE_LANG_CONTROL', "control");
+define('_MD_BASE_LANG_CREATE_NEW', "create new");
+define('_MD_BASE_LANG_DIRNAME', "dirname");
+define('_MD_BASE_LANG_DISPLAY', "display");
+define('_MD_BASE_LANG_DOBR', "改行を自動挿入する");
+define('_MD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
+define('_MD_BASE_LANG_DOIMAGE', "doimage");
+define('_MD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
+define('_MD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする ");
+define('_MD_BASE_LANG_EDIT_FUNC', "edit func");
+define('_MD_BASE_LANG_EMOTION', "emotion");
+define('_MD_BASE_LANG_FUNC_FILE', "func file");
+define('_MD_BASE_LANG_FUNC_NUM', "func num");
+define('_MD_BASE_LANG_ID', "ID");
+define('_MD_BASE_LANG_IMAGE', "image");
+define('_MD_BASE_LANG_ISACTIVE', "isactive");
+define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_MD_BASE_LANG_MID', "mid");
+define('_MD_BASE_LANG_NAME', "name");
+define('_MD_BASE_LANG_OPTION', "オプション");
+define('_MD_BASE_LANG_OPTIONS', "options");
+define('_MD_BASE_LANG_POST', "投稿する");
+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_SUBMIT', "送信");
+define('_MD_BASE_LANG_TEMPLATE', "template");
+define('_MD_BASE_LANG_TITLE', "title");
+define('_MD_BASE_LANG_VISIBLE', "visible");
+define('_MD_BASE_LANG_WEIGHT', "weight");
+define('_MD_BASE_MESSAGE_CONFIRM_DELETE', "confirm delete");
+define('_MSC_AVAVATARS', "アバター一覧");
+define('_MSC_CLICKASMILIE', "画像をクリックすると顔アイコン(スマイリー)を本文に追加することができます。");
+define('_MSC_CODE', "顔文字");
+define('_MSC_EMOTION', "意味");
+define('_MSC_ENTERFMAIL', "お友達のメールアドレスを入力してください。");
+define('_MSC_ENTERFNAME', "お友達の名前を入力してください。");
+define('_MSC_ENTERYNAME', "あなたの名前を入力してください。");
+define('_MSC_FRIENDEMAILC', "友達のEmail： ");
+define('_MSC_FRIENDNAMEC', "友達の名前： ");
+define('_MSC_INTSITE', "お薦めサイト： %s");
+define('_MSC_INVALIDEMAIL1', "不正なメールアドレスです。");
+define('_MSC_INVALIDEMAIL2', "メールアドレスが正しいかどうか確認してください。");
+define('_MSC_NEEDINFO', "必要なデータがすべて入力されていません。");
+define('_MSC_RECOMMENDSITE', "当サイトを友達に薦める");
+define('_MSC_REFERENCESENT', "当サイトを紹介するメールをあなたのお友達に送信しました。");
+define('_MSC_SMILIES', "顔アイコン");
+define('_MSC_YOUREMAILC', "あなたのEmail： ");
+define('_MSC_YOURNAMEC', "あなたの名前： ");
+define('_SR_ALL', "すべて（AND検索）");
+define('_SR_ANY', "いずれか（OR検索）");
+define('_SR_EXACT', "フレーズ");
+define('_SR_FOUND', "<b>%s</b>件のデータが見つかりました。");
+define('_SR_IGNOREDWORDS', "次の語句は短すぎる（%u 文字以下）ため検索に使用されていません。");
+define('_SR_KEYIGNORE', "文字数が ");
+define('_SR_KEYTOOSHORT', "キーワードは %s 文字以上で指定してください。");
+define('_SR_KEYWORDS', "キーワード");
+define('_SR_NEXT', "次のページ >>");
+define('_SR_NOMATCH', "該当データなし。");
+define('_SR_PLZENTER', "必要なデータを全て入力してください。");
+define('_SR_PREVIOUS', "<< 前のページ");
+define('_SR_SEARCH', "検索");
+define('_SR_SEARCHIN', "検索対象のモジュール");
+define('_SR_SEARCHRESULTS', "検索結果");
+define('_SR_SEARCHRULE', "検索のルール");
+define('_SR_SHOWALLR', "すべて表示");
+define('_SR_SHOWING', "（%d 〜 %d 件目を表示）");
+define('_SR_TYPE', "検索の種類");
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Apr 10 20:40:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 20:40:58 +0900
Subject: [xoops-cvslog 2701] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060410114058.7C8892AC088@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.11 xoops2jp/html/modules/base/language/english/main.php:1.1.2.12
--- xoops2jp/html/modules/base/language/english/main.php:1.1.2.11	Wed Apr  5 19:59:49 2006
+++ xoops2jp/html/modules/base/language/english/main.php	Mon Apr 10 20:40:58 2006
@@ -44,7 +44,9 @@
 define('_MD_BASE_LANG_LAST_MODIFIED', "last modified");
 define('_MD_BASE_LANG_MID', "mid");
 define('_MD_BASE_LANG_NAME', "name");
+define('_MD_BASE_LANG_OPTION', "Option");
 define('_MD_BASE_LANG_OPTIONS', "options");
+define('_MD_BASE_LANG_POST', "Post");
 define('_MD_BASE_LANG_SHOW_FUNC', "show func");
 define('_MD_BASE_LANG_SIDE', "side");
 define('_MD_BASE_LANG_SMILE_URL', "Image");

From minahito ＠ users.sourceforge.jp  Mon Apr 10 20:41:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 20:41:34 +0900
Subject: [xoops-cvslog 2702] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060410114134.A370A2AC029@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_comment_edit.html
diff -u xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.4 xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.5
--- xoops2jp/html/modules/base/templates/legacy_comment_edit.html:1.1.2.4	Thu Mar 30 00:39:53 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment_edit.html	Mon Apr 10 20:41:34 2006
@@ -15,7 +15,7 @@
   <{xoops_input type=hidden name=com_exparams value=$actionForm->get('com_exparams')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th colspan="2">*投稿する*</th>
+      <th colspan="2"><{$smarty.const._MD_BASE_LANG_POST}></th>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._MD_BASE_LANG_COMMENT_RULE}></td>
@@ -50,7 +50,7 @@
       </td>
     </tr>
       <tr>
-        <td class="head">*OPTION*</td>
+        <td class="head"><{$smarty.const._MD_BASE_LANG_OPTION}></td>
         <td class="<{cycle values="odd,even"}>">
           <{if $xoops_isadmin}>
             <{xoops_input type=checkbox name=dohtml value=1 default=$actionForm->get('dohtml')}>

From minahito ＠ users.sourceforge.jp  Mon Apr 10 21:41:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 21:41:47 +0900
Subject: [xoops-cvslog 2703] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060410124147.19EC22AC029@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.27 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.28
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.27	Sun Apr  9 23:47:16 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Mon Apr 10 21:41:46 2006
@@ -1,7 +1,9 @@
 <?php
 
+define('_AD_BASE_ERROR_BMODULE', "表示先のモジュールを１つ以上指定してください");
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_AD_BASE_ERROR_EXTENSION', "許可されたファイル形式ではありません");
+define('_AD_BASE_ERROR_GROUPID', "最低１グループ以上にアクセス権限を与えてください");
 define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
 define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
@@ -45,6 +47,10 @@
 define('_AD_BASE_LANG_CONTENT', "コンテンツ");
 define('_AD_BASE_LANG_CONTROL', "操作");
 define('_AD_BASE_LANG_CREATE_NEW', "新規作成");
+define('_AD_BASE_LANG_CTYPE_HTML', "HTMLタグ");
+define('_AD_BASE_LANG_CTYPE_PHP', "PHPスクリプト");
+define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "自動フォーマット（顔アイコン有効）");
+define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "自動フォーマット（顔アイコン無効）");
 define('_AD_BASE_LANG_CUSTOM_HTML', "カスタム(HTML)");
 define('_AD_BASE_LANG_CUSTOM_PHP', "カスタム(PHP)");
 define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "カスタム(顔アイコン有効)");
@@ -84,8 +90,8 @@
 define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");
 define('_AD_BASE_LANG_SMILES_NEW', "顔アイコン新規追加");
 define('_AD_BASE_LANG_SUBMIT', "送信");
-define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
-define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
+define('_AD_BASE_LANG_TARGET_GROUPS', "アクセス権のあるグループ");
+define('_AD_BASE_LANG_TARGET_MODULES', "表示先のモジュール");
 define('_AD_BASE_LANG_TEMPLATE', "テンプレート");
 define('_AD_BASE_LANG_TITLE', "タイトル");
 define('_AD_BASE_LANG_TOPPAGE', "トップページ");

From minahito ＠ users.sourceforge.jp  Mon Apr 10 21:41:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 21:41:47 +0900
Subject: [xoops-cvslog 2704] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060410124147.3F44E2AC05B@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.23 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.24
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.23	Sun Apr  9 23:47:29 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Mon Apr 10 21:41:47 2006
@@ -1,7 +1,9 @@
 <?php
 
+define('_AD_BASE_ERROR_BMODULE', "bmodule");
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed.");
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
+define('_AD_BASE_ERROR_GROUPID', "groupid");
 define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
 define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
@@ -14,8 +16,8 @@
 define('_AD_BASE_LANG_ALL_STATUS', "All status");
 define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
 define('_AD_BASE_LANG_BID', "bid");
-define('_AD_BASE_LANG_BLOCK_INSTALL', "block install");
 define('_AD_BASE_LANG_BLOCK_EDIT', "block edit");
+define('_AD_BASE_LANG_BLOCK_INSTALL', "block install");
 define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
 define('_AD_BASE_LANG_BLOCK_UNINSTALL', "block uninstall");
 define('_AD_BASE_LANG_C_TYPE', "c type");
@@ -45,6 +47,10 @@
 define('_AD_BASE_LANG_CONTENT', "content");
 define('_AD_BASE_LANG_CONTROL', "Control");
 define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
+define('_AD_BASE_LANG_CTYPE_HTML', "CTYPE HTML");
+define('_AD_BASE_LANG_CTYPE_PHP', "CTYPE PHP");
+define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "CTYPE WITH SMILIES");
+define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "CTYPE WITHOUT SMILIES");
 define('_AD_BASE_LANG_CUSTOM_HTML', "Custom HTML");
 define('_AD_BASE_LANG_CUSTOM_PHP', "Custom PHP");
 define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "Custom with Smilies");

From minahito ＠ users.sourceforge.jp  Mon Apr 10 21:42:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 21:42:15 +0900
Subject: [xoops-cvslog 2705] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060410124215.0DD7A2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/blockctype.php
diff -u xoops2jp/html/modules/base/class/blockctype.php:1.1.2.1 xoops2jp/html/modules/base/class/blockctype.php:1.1.2.2
--- xoops2jp/html/modules/base/class/blockctype.php:1.1.2.1	Thu Apr  6 16:55:08 2006
+++ xoops2jp/html/modules/base/class/blockctype.php	Mon Apr 10 21:42:14 2006
@@ -18,10 +18,10 @@
 	function BaseBlockctypeHandler(&$db)
 	{
 		$t_arr = array (
-				'H' => _AM_HTML,
-				'P' => _AM_PHP,
-				'S' => _AM_AFWSMILE,
-				'T' => _AM_AFNOSMILE
+				'H' => _AD_BASE_LANG_CTYPE_HTML,
+				'P' => _AD_BASE_LANG_CTYPE_PHP,
+				'S' => _AD_BASE_LANG_CTYPE_WITH_SMILIES,
+				'T' => _AD_BASE_LANG_CTYPE_WITHOUT_SMILIES
 			);
 			
 		foreach ($t_arr as $id => $name) {

From minahito ＠ users.sourceforge.jp  Mon Apr 10 21:42:32 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 10 Apr 2006 21:42:32 +0900
Subject: [xoops-cvslog 2706] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060410124232.585BD2AC05B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php:1.1.2.3	Thu Apr  6 16:53:52 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockEditForm.class.php	Mon Apr 10 21:42:32 2006
@@ -53,6 +53,22 @@
 		$this->mFieldProperties['bcachetime']->addMessage('required', _AD_BASE_ERROR_REQUIRED, _AD_BASE_LANG_BCACHETIME);
 	}
 
+	function validateBmodule()
+	{
+		$bmodule = $this->get('bmodule');
+		if (!(count($bmodule))) {
+			$this->addErrorMessage(_AD_BASE_ERROR_BMODULE);
+		}
+	}
+	
+	function validateGroupid()
+	{
+		$groupid = $this->get('groupid');
+		if (!(count($groupid))) {
+			$this->addErrorMessage(_AD_BASE_ERROR_GROUPID);
+		}
+	}
+	
 	function load(&$obj)
 	{
 		$this->set('bid', $obj->get('bid'));

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 00:10:23 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 00:10:23 +0900
Subject: [xoops-cvslog 2707] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060410151023.C3E9D2AC023@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.13 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.14
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.13	Sun Apr  2 23:42:44 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Tue Apr 11 00:10:23 2006
@@ -302,7 +302,7 @@
         			}
 				} else {
 				    $root = $root=&XCube_Root::getSingleton();
-                    $groups = $root->mController->mXoopsUser->getGroups();var_dump($groups);
+                    $groups = $root->mController->mXoopsUser->getGroups();
                     foreach ($groups as $mygroup) {
         				$bperm->setVar('gperm_groupid', $mygroup);
         				$bperm->setNew();

From minahito ＠ users.sourceforge.jp  Tue Apr 11 10:49:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 10:49:57 +0900
Subject: [xoops-cvslog 2708] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411014957.685A62AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.4	Fri Apr  7 18:02:36 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Tue Apr 11 10:49:57 2006
@@ -16,7 +16,12 @@
 	{
 		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
 	}
-
+	
+	function isEnableCreate()
+	{
+		return false;
+	}
+	
 	function &_getHandler()
 	{
 		$handler =& xoops_getmodulehandler('newblocks');
@@ -36,8 +41,37 @@
 		$this->mActionForm->prepare();
 	}
 	
+	/**
+	 * Return true if the target object can be edited. This private method exists 
+	 * to control subclass actions.
+	 * 
+	 * @return bool
+	 */
+	function _isEditable()
+	{
+		if (is_object($this->mObject)) {
+			return ($this->mObject->get('visible') == 1);
+		}
+		else {
+			return false;
+		}
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if (!$this->_isEditable()) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+		
+		return parent::getDefaultView($controller, $xoopsUser);
+	}
+
 	function execute(&$controller, &$xoopsUser)
 	{
+		if (!$this->_isEditable()) {
+			LEGACY_FRAME_VIEW_ERROR;
+		}
+
 		$ret = parent::execute($controller, $xoopsUser);
 		
 		if ($ret == LEGACY_FRAME_VIEW_SUCCESS) {

From minahito ＠ users.sourceforge.jp  Tue Apr 11 10:50:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 10:50:59 +0900
Subject: [xoops-cvslog 2709] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411015059.1F56E2AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php:1.1.2.1	Thu Apr  6 16:54:08 2006
+++ xoops2jp/html/modules/base/admin/actions/CustomBlockEditAction.class.php	Tue Apr 11 10:50:59 2006
@@ -14,6 +14,16 @@
 		$this->mActionForm->prepare();
 	}
 	
+	function isEnableCreate()
+	{
+		return true;
+	}
+	
+	function _isEditable()
+	{
+		return true;
+	}
+
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		$render->setTemplateName("customblock_edit.html");

From minahito ＠ users.sourceforge.jp  Tue Apr 11 10:51:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 10:51:13 +0900
Subject: [xoops-cvslog 2710] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411015113.C1B372AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php:1.1.2.2	Thu Apr  6 15:01:39 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockUninstallAction.class.php	Tue Apr 11 10:51:13 2006
@@ -23,6 +23,16 @@
 		$this->mActionForm =& new Legacy_BlockUninstallForm();
 		$this->mActionForm->prepare();
 	}
+	
+	function _isEditable()
+	{
+		if (is_object($this->mObject)) {
+			return ($this->mObject->get('visible') == 1);
+		}
+		else {
+			return false;
+		}
+	}
 
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{

From minahito ＠ users.sourceforge.jp  Tue Apr 11 10:51:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 10:51:20 +0900
Subject: [xoops-cvslog 2711] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411015120.AF2D92AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php:1.1.2.1	Wed Apr  5 19:57:52 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockInstallEditAction.class.php	Tue Apr 11 10:51:20 2006
@@ -15,6 +15,16 @@
 		$this->mActionForm->prepare();
 	}
 	
+	function _isEditable()
+	{
+		if (is_object($this->mObject)) {
+			return ($this->mObject->get('visible') == 0);
+		}
+		else {
+			return false;
+		}
+	}
+
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{
 		parent::executeViewInput($controller, $xoopsUser, $render);

From minahito ＠ users.sourceforge.jp  Tue Apr 11 10:58:42 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 10:58:42 +0900
Subject: [xoops-cvslog 2712] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411015842.9DAEE2AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.1 xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.2
--- xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php:1.1.2.1	Fri Apr  7 13:47:10 2006
+++ xoops2jp/html/modules/base/admin/actions/CustomBlockDeleteAction.class.php	Tue Apr 11 10:58:42 2006
@@ -23,6 +23,34 @@
 		$this->mActionForm =& new Legacy_CustomBlockDeleteForm();
 		$this->mActionForm->prepare();
 	}
+	
+	function _isDeletable()
+	{
+		if (is_object($this->mObject)) {
+			return ($this->mObject->get('block_type') == 'C' && $this->mObject->get('visible') == 0);
+		}
+		else {
+			return false;
+		}
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if (!$this->_isDeletable()) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+		
+		return parent::getDefaultView($controller, $xoopsUser);
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		if (!$this->_isDeletable()) {
+			return LEGACY_FRAME_VIEW_ERROR;
+		}
+		
+		return parent::execute($controller, $xoopsUser);
+	}
 
 	function executeViewInput(&$controller, &$xoopsUser, &$render)
 	{

From minahito ＠ users.sourceforge.jp  Tue Apr 11 11:05:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 11:05:59 +0900
Subject: [xoops-cvslog 2713] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060411020559.8A8D42AC02D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/newblocks.php
diff -u xoops2jp/html/modules/base/class/newblocks.php:1.1.2.4 xoops2jp/html/modules/base/class/newblocks.php:1.1.2.5
--- xoops2jp/html/modules/base/class/newblocks.php:1.1.2.4	Fri Apr  7 18:03:01 2006
+++ xoops2jp/html/modules/base/class/newblocks.php	Tue Apr 11 11:05:59 2006
@@ -95,6 +95,34 @@
 	var $mTable = "newblocks";
 	var $mPrimary = "bid";
 	var $mClass = "BaseNewblocksObject";
+	
+	function delete(&$obj, $force = false)
+	{
+		if (parent::delete($obj, $force)) {
+			//
+			// Delete related data from block_module_link.
+			//
+			$handler =& xoops_getmodulehandler('block_module_link', 'base');
+			$handler->deleteAll(new Criteria('block_id'), $obj->get('bid'));
+			
+			//
+			// Delete related permissions from groupperm.
+			//
+			$handler =& xoops_gethandler('groupperm');
+
+			$criteria =& new CriteriaCompo();
+			$criteria->add(new Criteria('gperm_modid', 1));
+			$criteria->add(new Criteria('gperm_itemid', $obj->get('bid')));
+			$criteria->add(new Criteria('gperm_name', 'block_read'));
+			
+			$handler->deleteAll($criteria);
+			
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 11:09:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 11:09:09 +0900
Subject: [xoops-cvslog 2714] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060411020909.72C012AC02D@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.28 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.29
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.28	Mon Apr 10 21:41:46 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Tue Apr 11 11:09:09 2006
@@ -21,9 +21,9 @@
 define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
 define('_AD_BASE_LANG_BLOCK_UNINSTALL', "ブロックのアンインストール");
 define('_AD_BASE_LANG_C_TYPE', "タイプ");
-define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
-define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
-define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block right");
+define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "中央ブロック - 中央");
+define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "中央ブロック - 左");
+define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "中央ブロック - 右");
 define('_AD_BASE_LANG_CODE', "コード");
 define('_AD_BASE_LANG_COM_CREATED', "作成日時");
 define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
@@ -83,8 +83,8 @@
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス");
 define('_AD_BASE_LANG_SHOW_FUNC', "show func");
 define('_AD_BASE_LANG_SIDE', "表示サイド");
-define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block left");
-define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block right");
+define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "サイドブロック - 左");
+define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "サイドブロック - 右");
 define('_AD_BASE_LANG_SMILE_URL', "画像");
 define('_AD_BASE_LANG_SMILES_DELETE', "顔アイコン削除");
 define('_AD_BASE_LANG_SMILES_EDIT', "顔アイコン編集");
@@ -95,7 +95,7 @@
 define('_AD_BASE_LANG_TEMPLATE', "テンプレート");
 define('_AD_BASE_LANG_TITLE', "タイトル");
 define('_AD_BASE_LANG_TOPPAGE', "トップページ");
-define('_AD_BASE_LANG_VISIBLE', "visible");
+define('_AD_BASE_LANG_VISIBLE', "可視");
 define('_AD_BASE_LANG_WEIGHT', "並び順");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "一緒に削除されるデータ");
 define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "削除確認");

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:09:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:09:23 +0900
Subject: [xoops-cvslog 2715] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411030923.B4B042AC06B@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.5 xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php:1.1.2.5	Thu Mar 30 23:56:27 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php	Tue Apr 11 12:09:23 2006
@@ -4,9 +4,18 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractDeleteAction.class.php";
 require_once XOOPS_MODULE_PATH . "/base/admin/forms/CommentAdminDeleteForm.class.php";
+require_once XOOPS_MODULE_PATH . "/base/admin/actions/CommentEditAction.class.php";
 
 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;
@@ -62,6 +71,43 @@
 	{
 		redirect_header("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
 	}
+	
+	function doDelete(&$sender, &$eventArgs)
+	{
+		//
+		// Adjust user's post count.
+		//
+		if ($comment->get('com_status') != 1 && $comment->get('com_uid') > 0) {
+			$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'));
+			$count = $user->get('posts');
+			
+			if($count > 0) {
+				$handler->updateUserByField($user, 'posts', $count - 1);
+			}
+		}
+		
+		//
+		// callback
+		//
+		$comment =& $eventArgs['comment'];
+		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
+		
+		if ($comment_config == false) {
+			return;
+		}
+		
+		$function = $comment_config['callback']['update'];
+		
+		if (function_exists($function)) {
+			call_user_func($function, $comment);
+		}
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:09:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:09:29 +0900
Subject: [xoops-cvslog 2716] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411030929.725822AC06B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.6 xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.6	Thu Mar 30 23:56:54 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php	Tue Apr 11 12:09:29 2006
@@ -39,9 +39,15 @@
 	{
 		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"));
 		}
 		else {
 			$this->mActionForm =& new Legacy_ApprovalCommentAdminEditForm();
+		
+			$root =& XCube_Root::getSingleton();
+			$root->mEventManager->add("Module.Legacy.Comment.Update.Success", new XCube_InstanceDelegate($this, "doUpdate"));
 		}
 		$this->mActionForm->prepare();
 	}
@@ -83,6 +89,85 @@
 	{
 		redirect_header("./index.php?action=CommentList", 1, _AD_BASE_ERROR_DBUPDATE_FAILED);
 	}
+	
+	/**
+	 * @static
+	 * @return Return array as the informations of comments. If $comment has fatal status, return false.
+	 */
+	function loadCallbackFile(&$comment)
+	{
+		$handler =& xoops_gethandler('module');
+		$module =& $handler->get($comment->get('com_modid'));
+		
+		if (!is_object($module)) {
+			return false;
+		}
+		
+		$comment_config = $module->getInfo('comments');
+		
+		//
+		// Load call-back file
+		//
+		$file = XOOPS_MODULE_PATH . "/" . $module->get('dirname') . "/" . $comment_config['callbackFile'];
+		if (!file_exists($file)) {
+			return false;
+		}
+		
+		require_once $file;
+		
+		return $comment_config;
+	}
+	
+	function doApprove(&$sender, &$eventArgs)
+	{
+		$comment =& $eventArgs['comment'];
+		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
+		
+		if ($comment_config == false) {
+			return;
+		}
+		
+		$function = $comment_config['callback']['approve'];
+		
+		if (function_exists($function)) {
+			call_user_func($function, $comment);
+		}
+		
+		Legacy_CommentEditAction::addUserPost($comment);		
+	}
+	
+	function doUpdate(&$sender, &$eventArgs)
+	{
+		//
+		// Adjust user's post count.
+		//
+		if ($comment->get('com_uid') > 0) {
+			$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);
+		}
+		
+		//
+		// call back
+		//
+		$comment =& $eventArgs['comment'];
+		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
+		
+		if ($comment_config == false) {
+			return;
+		}
+		
+		$function = $comment_config['callback']['update'];
+		
+		if (function_exists($function)) {
+			call_user_func($function, $comment);
+		}
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:10:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:10:19 +0900
Subject: [xoops-cvslog 2717] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060411031019.8137F2AC06B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/comment.php
diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.6 xoops2jp/html/modules/base/class/comment.php:1.1.2.7
--- xoops2jp/html/modules/base/class/comment.php:1.1.2.6	Thu Mar 30 23:55:02 2006
+++ xoops2jp/html/modules/base/class/comment.php	Tue Apr 11 12:10:19 2006
@@ -63,15 +63,38 @@
 	var $mPrimary = "com_id";
 	var $mClass = "BaseCommentObject";
 	
+	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);
+			
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+	
 	/**
 	 * Delete $comment and childlen of $comment.
 	 */
-	function delete(&$comment)
+	function delete(&$comment, $force = false)
 	{
 		$criteria =& new Criteria('com_pid', $comment->get('com_id'));
 		$this->deleteAll($criteria);
 		
-		return parent::delete($comment);
+		if (parent::delete($comment, $force)) {
+			$root =& XCube_Root::getSingleton();
+			$eventArgs = array();
+			$eventArgs['comment'] =& $comment;
+			$root->mEventManager->raiseEvent('Module.Legacy.Comment.Delete.Success', $this, $eventArgs);
+		}
+		else{
+			return false;
+		}
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:19:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:19:29 +0900
Subject: [xoops-cvslog 2718] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411031929.914F52AC0C4@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php:1.1.2.5	Tue Apr 11 10:49:57 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockEditAction.class.php	Tue Apr 11 12:19:29 2006
@@ -146,11 +146,11 @@
 		$handler =& xoops_gethandler('module');
 		$moduleArr[0] =& $handler->create();
 		$moduleArr[0]->set('mid', -1);
-		$moduleArr[0]->set('name', _AD_BASE_LANG_ALL_MODULES);
+		$moduleArr[0]->set('name', _AD_BASE_LANG_TOPPAGE);
 		
 		$moduleArr[1] =& $handler->create();
 		$moduleArr[1]->set('mid', 0);
-		$moduleArr[1]->set('name', _AD_BASE_LANG_TOPPAGE);
+		$moduleArr[1]->set('name', _AD_BASE_LANG_ALL_MODULES);
 
 		$criteria =& new CriteriaCompo();
 		$criteria->add(new Criteria('hasmain', 1));

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:19:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:19:46 +0900
Subject: [xoops-cvslog 2719] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411031946.22BF82AC0C4@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php:1.1.2.4	Fri Apr  7 17:44:27 2006
+++ xoops2jp/html/modules/base/admin/actions/BlockListAction.class.php	Tue Apr 11 12:19:46 2006
@@ -84,6 +84,11 @@
 		
 		$render->setAttribute('actionForm', $this->mActionForm);
 	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward('./index.php?action=BlockList');
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:20:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:20:04 +0900
Subject: [xoops-cvslog 2720] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060411032006.C5C062AC0C4@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.5	Sun Apr  9 23:48:01 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Tue Apr 11 12:20:04 2006
@@ -72,7 +72,7 @@
 *}>
         <td style="text-align:left;"><{$obj->getVar('title')}></td>
         <td nowrap>
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
+          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
         </td>
         <td>
           <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:50:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:50:51 +0900
Subject: [xoops-cvslog 2721] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411035051.1076A2AC054@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.6 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.6	Tue Apr 11 12:09:23 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentDeleteAction.class.php	Tue Apr 11 12:50:50 2006
@@ -74,6 +74,8 @@
 	
 	function doDelete(&$sender, &$eventArgs)
 	{
+		$comment =& $eventArgs['comment'];
+		
 		//
 		// Adjust user's post count.
 		//
@@ -95,7 +97,6 @@
 		//
 		// callback
 		//
-		$comment =& $eventArgs['comment'];
 		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
 		
 		if ($comment_config == false) {

From minahito ＠ users.sourceforge.jp  Tue Apr 11 12:51:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 12:51:10 +0900
Subject: [xoops-cvslog 2722] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411035110.E37722AC054@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php:1.1.2.7 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.7	Tue Apr 11 12:09:29 2006
+++ xoops2jp/html/modules/base/admin/actions/CommentEditAction.class.php	Tue Apr 11 12:51:10 2006
@@ -138,6 +138,8 @@
 	
 	function doUpdate(&$sender, &$eventArgs)
 	{
+		$comment =& $eventArgs['comment'];
+		
 		//
 		// Adjust user's post count.
 		//
@@ -155,7 +157,6 @@
 		//
 		// call back
 		//
-		$comment =& $eventArgs['comment'];
 		$comment_config = Legacy_CommentEditAction::loadCallbackFile($comment);
 		
 		if ($comment_config == false) {

From minahito ＠ users.sourceforge.jp  Tue Apr 11 13:42:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 13:42:30 +0900
Subject: [xoops-cvslog 2723] CVS update: xoops2jp/html/kernel
Message-ID: <20060411044230.9B0832AC03F@users.sourceforge.jp>

Index: xoops2jp/html/kernel/cachetime.php
diff -u xoops2jp/html/kernel/cachetime.php:1.1.2.1 xoops2jp/html/kernel/cachetime.php:1.1.2.2
--- xoops2jp/html/kernel/cachetime.php:1.1.2.1	Thu Apr  6 15:48:39 2006
+++ xoops2jp/html/kernel/cachetime.php	Tue Apr 11 13:42:30 2006
@@ -1,5 +1,7 @@
 <?php
 
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
 class XoopsCachetime extends XoopsObject
 {
 	function XoopsCachetime()

From minahito ＠ users.sourceforge.jp  Tue Apr 11 14:28:48 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 14:28:48 +0900
Subject: [xoops-cvslog 2724] CVS update: xoops2jp/html/class
Message-ID: <20060411052848.608272AC023@users.sourceforge.jp>

Index: xoops2jp/html/class/criteria.php
diff -u xoops2jp/html/class/criteria.php:1.2.8.4 xoops2jp/html/class/criteria.php:1.2.8.5
--- xoops2jp/html/class/criteria.php:1.2.8.4	Wed Jan 11 19:17:29 2006
+++ xoops2jp/html/class/criteria.php	Tue Apr 11 14:28:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: criteria.php,v 1.2.8.4 2006/01/11 10:17:29 minahito Exp $
+// $Id: criteria.php,v 1.2.8.5 2006/04/11 05:28:48 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -103,11 +103,56 @@
 
     /**
      * Render the criteria element
+     * @deprecated
      */
     function render()
     {
 
     }
+    
+    /**
+     * Return true if this object has child elements.
+     */
+    function hasChildElements()
+    {
+		return false;
+	}
+    
+    function getCountChildElements()
+    {
+		return 0;
+	}
+    
+    /**
+     * Return child element.
+     */
+	function getChildElement($idx)
+	{
+		return null;
+	}
+	
+    /**
+     * Return condition string.
+     */
+	function getCondition($idx)
+	{
+		return null;
+	}
+
+	function getName()
+	{
+		return null;
+	}
+	
+	function getValue()
+	{
+		return null;
+	}
+	
+	function getOperator()
+	{
+		return null;
+	}
 
     /**#@+
      * Accessor
@@ -235,6 +280,26 @@
             $this->add($ele, $condition);
         }
     }
+    
+	function hasChildElements()
+	{
+		return count($this->criteriaElements) > 0;
+	}
+	
+    function getCountChildElements()
+    {
+		return count($this->criteriaElements);
+	}
+	
+	function getChildElement($idx)
+	{
+		return $this->criteriaElements[$idx];
+	}
+	
+	function getCondition($idx)
+	{
+		return $this->conditions[$idx];
+	}
 
     /**
      * Add an element
@@ -359,6 +424,21 @@
 			$this->value = $value;
 		}
     }
+    
+    function getName()
+    {
+		return $this->column;
+	}
+	
+	function getValue()
+	{
+		return $this->value;
+	}
+	
+	function getOperator()
+	{
+		return $this->operator;
+	}
 
     /**
      * Make a sql condition string

From minahito ＠ users.sourceforge.jp  Tue Apr 11 14:29:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 14:29:23 +0900
Subject: [xoops-cvslog 2725] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060411052923.3C7E52AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.11 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.12
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.11	Tue Mar 28 22:30:15 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Tue Apr 11 14:29:23 2006
@@ -57,7 +57,7 @@
 		$sql = "SELECT * FROM " . $this->mTable;
 
 		if($criteria !== null && is_a($criteria, 'CriteriaElement')) {
-			$where = $criteria->render();
+			$where = $this->_makeCriteria4sql($criteria);
 			
 			if (trim($where)) {
 				$sql .= " WHERE ".$where;
@@ -119,7 +119,7 @@
 		$sql="SELECT COUNT(*) c FROM " . $this->mTable;
 
 		if($criteria !== null && is_a($criteria, 'CriteriaElement')) {
-			$where = $criteria->render();
+			$where = $this->_makeCriteria4sql($criteria);
 			
 			if ($where) {
 				$sql .= " WHERE " . $where;
@@ -221,7 +221,8 @@
 	 * @param $obj xoopsObject
 	 * @return Array
 	*/
-	function _makeVars4sql(&$obj) {
+	function _makeVars4sql(&$obj)
+	{
 		$ret = array();
 		foreach ($obj->gets() as $key => $value) {
 			switch ($obj->mVars[$key]['data_type']) {
@@ -237,6 +238,54 @@
 		
 		return $ret;
 	}
+	
+	function _makeCriteria4sql($criteria)
+	{
+		$dmmyObj =& $this->create();
+
+		return $this->_makeCriteriaElement4sql($criteria, $dmmyObj);
+	}
+
+	/**
+	 * @param $criteria CriteriaElement
+	 * @param $obj XoopsSimpleObject
+	 */	
+	function _makeCriteriaElement4sql($criteria, &$obj)
+	{
+		if (is_a($criteria, "CriteriaElement")) {
+			if ($criteria->hasChildElements()) {
+				$queryString = "";
+				$maxCount = $criteria->getCountChildElements();
+				for ($i = 0; $i < $maxCount ; $i++) {
+					$queryString .= " " . $this->_makeCriteria4sql($criteria->getChildElement($i));
+					if (($i + 1) != $maxCount) {
+						$queryString .= " " . $criteria->getCondition($i);
+					}
+				}
+				
+				return "(" . $queryString . ")";
+			}
+			else {
+				//
+				// Render
+				//
+				$name = $criteria->getName();
+				$value = null;
+				switch ($obj->mVars[$name]['data_type']) {
+					case XOBJ_DTYPE_STRING:
+					case XOBJ_DTYPE_TEXT:
+						$value = $this->db->quoteString($criteria->getValue());
+						break;
+						
+					default:
+						$value = $criteria->getValue();
+				}
+				
+				$string = $name . " " . $criteria->getOperator() . " " . $value;
+				return $string;
+			}
+		}
+	}
 
 	/**
 	 * @return bool

From minahito ＠ users.sourceforge.jp  Tue Apr 11 14:41:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 14:41:58 +0900
Subject: [xoops-cvslog 2726] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060411054158.3CF0F2AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.2	Thu Apr  6 15:11:37 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Tue Apr 11 14:41:58 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
 define('NEWBLOCKS_SORT_KEY_BID', 1);
 define('NEWBLOCKS_SORT_KEY_MID', 2);
 define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
@@ -27,6 +26,8 @@
 define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
 define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
 
+define('NEWBLOCKS_SORT_KEY_DEFAULT', NEWBLOCKS_SORT_KEY_MID);
+
 class Legacy_BlockInstallFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
@@ -57,7 +58,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
 			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.2	Thu Apr  6 15:11:32 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Tue Apr 11 14:41:58 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('NEWBLOCKS_SORT_KEY_DEFAULT', 0);
 define('NEWBLOCKS_SORT_KEY_BID', 1);
 define('NEWBLOCKS_SORT_KEY_MID', 2);
 define('NEWBLOCKS_SORT_KEY_FUNC_NUM', 3);
@@ -27,11 +26,12 @@
 define('NEWBLOCKS_SORT_KEY_LAST_MODIFIED', 20);
 define('NEWBLOCKS_SORT_KEY_MAXVALUE', 20);
 
+define('NEWBLOCKS_SORT_KEY_DEFAULT', NEWBLOCKS_SORT_KEY_SIDE);
+
 class Legacy_BlockFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',
 		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
@@ -57,7 +57,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : NEWBLOCKS_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > NEWBLOCKS_SORT_KEY_MAXVALUE) {
 			$this->mSort = NEWBLOCKS_SORT_KEY_DEFAULT;

From minahito ＠ users.sourceforge.jp  Tue Apr 11 15:12:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 15:12:15 +0900
Subject: [xoops-cvslog 2727] CVS update: xoops2jp/html/class
Message-ID: <20060411061215.2ADFC2AC0CF@users.sourceforge.jp>

Index: xoops2jp/html/class/criteria.php
diff -u xoops2jp/html/class/criteria.php:1.2.8.5 xoops2jp/html/class/criteria.php:1.2.8.6
--- xoops2jp/html/class/criteria.php:1.2.8.5	Tue Apr 11 14:28:48 2006
+++ xoops2jp/html/class/criteria.php	Tue Apr 11 15:12:15 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: criteria.php,v 1.2.8.5 2006/04/11 05:28:48 minahito Exp $
+// $Id: criteria.php,v 1.2.8.6 2006/04/11 06:12:15 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -69,12 +69,12 @@
      * Sort order
      * @var string
      */
-    var $order = 'ASC';
+    var $order = array();
 
     /**
      * @var string
      */
-    var $sort = '';
+    var $sort = array();
 
     /**
      * Number of records to retrieve
@@ -159,30 +159,83 @@
      */
     /**
      * @param   string  $sort
+     * @param   string  $order
      */
-    function setSort($sort)
+    function setSort($sort, $order = null)
     {
-        $this->sort = $sort;
+        $this->sort[0] = $sort;
+		$this->order[0] = 'ASC';
+		if ($order != null) {
+			if (strtoupper($order) == 'ASC') {
+				$this->order[0] = 'ASC';
+			}
+			elseif (strtoupper($order) == 'DESC') {
+				$this->order[0] = 'DESC';
+			}
+		}
     }
+	
+	/**
+	 * Add sort and order condition to this object.
+	 */
+	function addSort($sort, $order = 'ASC')
+	{
+        $this->sort[] = $sort;
+		if (strtoupper($order) == 'ASC') {
+			$this->order[] = 'ASC';
+		}
+		elseif (strtoupper($order) == 'DESC') {
+			$this->order[] = 'DESC';
+		}
+	}
 
     /**
      * @return  string
      */
     function getSort()
     {
-        return $this->sort;
+		if (isset($this->sort[0])) {
+			return $this->sort[0];
+		}
+		else {
+			return '';
+		}
     }
 
+	/**
+	 * Return sort and order condition as hashmap array.
+	 * 
+	 * @return hashmap 'sort' ... sort string/key'order' order string.
+	 */
+	function getSorts()
+	{
+		$ret = array();
+		$max = count($this->sort);
+		
+		for ($i = 0; $i < $max; $i++) {
+			$ret[$i]['sort'] = $this->sort[$i];
+			if (isset($this->order[$i])) {
+				$ret[$i]['order'] = $this->order[$i];
+			}
+			else {
+				$ret[$i]['order'] = 'ASC';
+			}
+		}
+		
+		return $ret;
+	}
+
     /**
      * @param   string  $order
+     * @deprecated
      */
     function setOrder($order)
     {
         if (strtoupper($order) == 'ASC') {
-            $this->order = 'ASC';
+            $this->order[0] = 'ASC';
         }
         elseif (strtoupper($order) == 'DESC') {
-            $this->order = 'DESC';
+            $this->order[0] = 'DESC';
         }
     }
 
@@ -191,7 +244,12 @@
      */
     function getOrder()
     {
-        return $this->order;
+		if (isset($this->order[0])) {
+			return $this->order[0];
+		}
+		else {
+			return 'ASC';
+		}
     }
 
     /**

From minahito ＠ users.sourceforge.jp  Tue Apr 11 15:12:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 15:12:45 +0900
Subject: [xoops-cvslog 2728] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060411061245.6CE302AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php:1.1.2.2	Tue Mar 28 22:29:05 2006
+++ xoops2jp/html/modules/base/admin/forms/SmilesFilterForm.class.php	Tue Apr 11 15:12:45 2006
@@ -52,6 +52,8 @@
 		if (isset($_REQUEST['display'])) {
 			$this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display'))));
 		}
+
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.3	Tue Apr 11 14:41:58 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Tue Apr 11 15:12:45 2006
@@ -32,7 +32,6 @@
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		NEWBLOCKS_SORT_KEY_DEFAULT => 'bid',
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',
 		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
@@ -86,6 +85,8 @@
 
 		$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 0)));
 		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.4	Wed Mar 29 00:14:05 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php	Tue Apr 11 15:12:45 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('COMMENT_SORT_KEY_DEFAULT', 0);
 define('COMMENT_SORT_KEY_COM_ID', 1);
 define('COMMENT_SORT_KEY_COM_PID', 2);
 define('COMMENT_SORT_KEY_COM_ROOTID', 3);
@@ -27,11 +26,12 @@
 define('COMMENT_SORT_KEY_DOBR', 20);
 define('COMMENT_SORT_KEY_MAXVALUE', 20);
 
+define('COMMENT_SORT_KEY_DEFAULT', COMMENT_SORT_KEY_COM_ID);
+
 class Legacy_CommentFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		COMMENT_SORT_KEY_DEFAULT => 'com_id',
 		COMMENT_SORT_KEY_COM_ID => 'com_id',
 		COMMENT_SORT_KEY_COM_PID => 'com_pid',
 		COMMENT_SORT_KEY_COM_ROOTID => 'com_rootid',
@@ -96,6 +96,8 @@
 			$this->_mNavi->addExtra('com_status', xoops_getrequest('com_status'));
 			$this->_mCriteria->add(new Criteria('com_status', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_status'))));
 		}
+
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.3	Tue Apr 11 14:41:58 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Tue Apr 11 15:12:45 2006
@@ -110,6 +110,9 @@
 	
 		$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1)));
 		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
+		$this->_mCriteria->addSort('weight', $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Apr 11 15:12:54 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 15:12:54 +0900
Subject: [xoops-cvslog 2729] CVS update: xoops2jp/html/modules/base/forms
Message-ID: <20060411061254.7AB4A2AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php:1.1.2.2	Tue Mar 28 22:30:03 2006
+++ xoops2jp/html/modules/base/forms/SmilesFilterForm.class.php	Tue Apr 11 15:12:54 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('SMILES_SORT_KEY_DEFAULT', 0);
 define('SMILES_SORT_KEY_ID', 1);
 define('SMILES_SORT_KEY_CODE', 2);
 define('SMILES_SORT_KEY_SMILE_URL', 3);
@@ -12,11 +11,12 @@
 define('SMILES_SORT_KEY_DISPLAY', 5);
 define('SMILES_SORT_KEY_MAXVALUE', 5);
 
+define('SMILES_SORT_KEY_DEFAULT', SMILES_SORT_KEY_ID);
+
 class Legacy_SmilesFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $mSortKeys = array(
-		SMILES_SORT_KEY_DEFAULT => 'id',
 		SMILES_SORT_KEY_ID => 'id',
 		SMILES_SORT_KEY_CODE => 'code',
 		SMILES_SORT_KEY_SMILE_URL => 'smile_url',
@@ -52,6 +52,8 @@
 		if (isset($_REQUEST['display'])) {
 			$this->_mCriteria->add(new Criteria('display', array(XOBJ_DTYPE_BOOL, xoops_getrequest('display'))));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php
diff -u xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.2 xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php:1.1.2.2	Tue Mar 28 22:30:03 2006
+++ xoops2jp/html/modules/base/forms/OnlineFilterForm.class.php	Tue Apr 11 15:12:54 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/base/class/AbstractFilterForm.class.php";
 
-define('ONLINE_SORT_KEY_DEFAULT', 1);
 define('ONLINE_SORT_KEY_ONLINE_UID', 1);
 define('ONLINE_SORT_KEY_ONLINE_UNAME', 2);
 define('ONLINE_SORT_KEY_ONLINE_UPDATED', 3);
@@ -12,6 +11,8 @@
 define('ONLINE_SORT_KEY_ONLINE_IP', 5);
 define('ONLINE_SORT_KEY_MAXVALUE', 5);
 
+define('ONLINE_SORT_KEY_DEFAULT', ONLINE_SORT_KEY_ONLINE_UID);
+
 class Legacy_OnlineFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
@@ -51,6 +52,8 @@
 		if (isset($_REQUEST['online_ip'])) {
 			$this->_mCriteria->add(new Criteria('online_ip', array(XOBJ_DTYPE_STRING, xoops_getrequest('online_ip'))));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Apr 11 15:13:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 15:13:20 +0900
Subject: [xoops-cvslog 2730] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060411061320.4DF9C2AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/AbstractFilterForm.class.php
diff -u xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/base/class/AbstractFilterForm.class.php:1.1.2.4	Thu Mar 30 17:35:50 2006
+++ xoops2jp/html/modules/base/class/AbstractFilterForm.class.php	Tue Apr 11 15:13:20 2006
@@ -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  Tue Apr 11 15:26:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 15:26:19 +0900
Subject: [xoops-cvslog 2731] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060411062619.5C2972AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.4	Tue Apr 11 15:12:45 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Tue Apr 11 15:26:19 2006
@@ -35,20 +35,13 @@
 		NEWBLOCKS_SORT_KEY_BID => 'bid',
 		NEWBLOCKS_SORT_KEY_MID => 'mid',
 		NEWBLOCKS_SORT_KEY_FUNC_NUM => 'func_num',
-		NEWBLOCKS_SORT_KEY_OPTIONS => 'options',
 		NEWBLOCKS_SORT_KEY_NAME => 'name',
 		NEWBLOCKS_SORT_KEY_TITLE => 'title',
-		NEWBLOCKS_SORT_KEY_CONTENT => 'content',
 		NEWBLOCKS_SORT_KEY_SIDE => 'side',
 		NEWBLOCKS_SORT_KEY_WEIGHT => 'weight',
-		NEWBLOCKS_SORT_KEY_VISIBLE => 'visible',
 		NEWBLOCKS_SORT_KEY_BLOCK_TYPE => 'block_type',
 		NEWBLOCKS_SORT_KEY_C_TYPE => 'c_type',
-		NEWBLOCKS_SORT_KEY_ISACTIVE => 'isactive',
 		NEWBLOCKS_SORT_KEY_DIRNAME => 'dirname',
-		NEWBLOCKS_SORT_KEY_FUNC_FILE => 'func_file',
-		NEWBLOCKS_SORT_KEY_SHOW_FUNC => 'show_func',
-		NEWBLOCKS_SORT_KEY_EDIT_FUNC => 'edit_func',
 		NEWBLOCKS_SORT_KEY_TEMPLATE => 'template',
 		NEWBLOCKS_SORT_KEY_BCACHETIME => 'bcachetime',
 		NEWBLOCKS_SORT_KEY_LAST_MODIFIED => 'last_modified'
@@ -111,8 +104,16 @@
 		$this->_mCriteria->add(new Criteria('visible', array(XOBJ_DTYPE_BOOL, 1)));
 		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
 		
+		//
+		// Set sort conditions.
+		//
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
-		$this->_mCriteria->addSort('weight', $this->getOrder());
+		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_SIDE) {
+			$this->_mCriteria->addSort('side', $this->getOrder());
+		}
+		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_WEIGHT) {
+			$this->_mCriteria->addSort('weight', $this->getOrder());
+		}
 	}
 }
 

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:06 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:06 +0900
Subject: [xoops-cvslog 2732] CVS update: xoops2jp/html/class
Message-ID: <20060411083906.A31142AC018@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_Utils.class.php
diff -u xoops2jp/html/class/XCube_Utils.class.php:1.1.2.3 xoops2jp/html/class/XCube_Utils.class.php:1.1.2.4
--- xoops2jp/html/class/XCube_Utils.class.php:1.1.2.3	Sun Apr  2 22:07:47 2006
+++ xoops2jp/html/class/XCube_Utils.class.php	Tue Apr 11 17:39:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: XCube_Utils.class.php,v 1.1.2.3 2006/04/02 13:07:47 nobunobu Exp $
+// $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                         //
@@ -129,7 +129,8 @@
 
     function checkSystemModules() {
         $root=&XCube_Root::getSingleton();
-        $systemModules = explode(',',$root->getSiteConfig('Cube','SystemModules'));
+        $systemModules = array_map('trim', explode(',',$root->getSiteConfig('Cube','SystemModules')));
+        $recommendedModules = array_map('trim', explode(',',$root->getSiteConfig('Cube','RecommendedModules')));
         $moduleHandler =& xoops_gethandler('module');
         $uninstalledModules = array();
         $disabledModules = array();
@@ -145,7 +146,7 @@
         if ((count($uninstalledModules)==0)&&(count($disabledModules)==0)) {
             return true;
         } else {
-            return array('uninstalled' =>$uninstalledModules, 'disabled'=>$disabledModules);
+            return array('uninstalled' =>$uninstalledModules, 'disabled'=>$disabledModules, 'recommended'=>$recommendedModules);
         }
 	}
 }

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:06 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:06 +0900
Subject: [xoops-cvslog 2733] CVS update: xoops2jp/html/install/include
Message-ID: <20060411083906.C7F8F2AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/install/include/makedata.php
diff -u xoops2jp/html/install/include/makedata.php:1.1.2.1 xoops2jp/html/install/include/makedata.php:1.1.2.2
--- xoops2jp/html/install/include/makedata.php:1.1.2.1	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/include/makedata.php	Tue Apr 11 17:39:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.1.2.1 2006/03/07 13:11:39 nobunobu Exp $
+// $Id: makedata.php,v 1.1.2.2 2006/04/11 08:39:06 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -46,38 +46,9 @@
 function make_data(&$dbm, &$cm, $adminname, $adminpass, $adminmail, $language, $gruops){
 
     $myts =& textSanitizer::getInstance();
-    //$xoopsDB =& Database::getInstance();
-    //$dbm = new db_manager;
 
     $tables = array();
 
-    // data for table 'groups_users_link'
-
-    $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 1)");
-    $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", 1)");
-
-    // data for table 'group_permission'
-
-    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
-    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
-    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_USERS'].",1,1,'module_read')");
-    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
-
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
-    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
 
     // data for table 'banner'
 
@@ -168,9 +139,41 @@
     $dbm->insert('config', " VALUES (72, 0, 1, 'theme_set_allowed', '_MD_AM_THEMEOK', '".serialize(array('default'))."', '_MD_AM_THEMEOKDSC', 'theme_multi', 'array', 13)");
     // RMV-NOTIFY... Need to specify which user is sender of notification PM
     $dbm->insert('config', " VALUES (73,0,6,'fromuid','_MD_AM_MAILFROMUID','1','_MD_AM_MAILFROMUIDDESC','user','int',3)");
+    // data for table 'users'
+
+    $temp = md5($adminpass);
+    $regdate = time();
+    $dbm->insert('users', " VALUES (1,'','".addslashes($adminname)."','".addslashes($adminmail)."','".XOOPS_URL."/','blank.gif','".$regdate."','','','',1,'','','','','".$temp."',0,0,7,5,'default','".$time_diff."',".time().",'thread',0,1,0,'','','',0)");
+
+    // data for table 'groups_users_link'
 
+    $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 1)");
+    $dbm->insert('groups_users_link', " VALUES (0, ".$gruops['XOOPS_GROUP_USERS'].", 1)");
+
+/*
     // install modules
     installModule($dbm, 1, "system", _MI_SYSTEM_NAME, $language, $gruops);
+    // data for table 'group_permission'
+    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'module_admin')");
+    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1, 'module_read')");
+    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_USERS'].",1,1,'module_read')");
+    $dbm->insert("group_permission", " VALUES (0,".$gruops['XOOPS_GROUP_ANONYMOUS'].",1,1,'module_read')");
+
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",1,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",2,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",3,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",4,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",5,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",6,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",7,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",8,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",9,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",10,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",11,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",12,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",13,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",14,1,'system_admin')");
+    $dbm->insert("group_permission", " VALUES(0,".$gruops['XOOPS_GROUP_ADMIN'].",15,1,'system_admin')");
 
     installModule($dbm, 2, "base", _MI_BASE_NAME, $language, $gruops, true);
     $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 2, 1, 'module_admin')");
@@ -192,15 +195,6 @@
     installModule($dbm, 6, "stdCache", _MI_STDCACHE_NAME, $language, $gruops, true);
     $dbm->insert("group_permission", " VALUES (0, ".$gruops['XOOPS_GROUP_ADMIN'].", 6, 1, 'module_admin')");
 
-    // data for table 'users'
-
-    $temp = md5($adminpass);
-    $regdate = time();
-    //$dbadminname= addslashes($adminname);
-    // RMV-NOTIFY (updated for extra columns in user table)
-    $dbm->insert('users', " VALUES (1,'','".addslashes($adminname)."','".addslashes($adminmail)."','".XOOPS_URL."/','blank.gif','".$regdate."','','','',1,'','','','','".$temp."',0,0,7,5,'default','".$time_diff."',".time().",'thread',0,1,0,'','','',0)");
-
-
     // data for table 'block_module_link'
 
     $sql = 'SELECT bid, side FROM '.$dbm->prefix('newblocks');
@@ -213,10 +207,10 @@
             $dbm->insert("block_module_link", " VALUES (".$myrow['bid'].", -1)");
         }
     }
-
+*/
     return $gruops;
 }
-
+// ToDo : remove following lines
 /**
  * 
  * Install module by module's name, language and specified mid.

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:06 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:06 +0900
Subject: [xoops-cvslog 2734] CVS update: xoops2jp/html/install
Message-ID: <20060411083906.F1F792AC018@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.2.8.4 xoops2jp/html/install/index.php:1.2.8.5
--- xoops2jp/html/install/index.php:1.2.8.4	Sat Apr  1 10:32:57 2006
+++ xoops2jp/html/install/index.php	Tue Apr 11 17:39:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.2.8.4 2006/04/01 01:32:57 nobunobu Exp $
+// $Id: index.php,v 1.2.8.5 2006/04/11 08:39:06 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -83,7 +83,7 @@
 $wizardSeq->add('createTables',_INSTALL_L40,  'siteInit',   _INSTALL_L112);
 $wizardSeq->add('siteInit',    _INSTALL_L112, 'insertData', _INSTALL_L116);
 $wizardSeq->add('insertData',  _INSTALL_L116, 'finish',     _INSTALL_L117);
-$wizardSeq->add('finish',      _INSTALL_L32);
+$wizardSeq->add('finish',      _INSTALL_L32,  'nextStep',   _INSTALL_L210);
 
 if (file_exists('./custom/custom.inc.php')) {
     include './custom/custom.inc.php';

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:07 +0900
Subject: [xoops-cvslog 2735] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060411083907.2846D2AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/finish.php
diff -u xoops2jp/html/install/language/english/finish.php:1.2.8.1 xoops2jp/html/install/language/english/finish.php:1.2.8.2
--- xoops2jp/html/install/language/english/finish.php:1.2.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/english/finish.php	Tue Apr 11 17:39:07 2006
@@ -1,10 +1,15 @@
 <?php
-// $Id: finish.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x Exp $
+// $Id: finish.php,v 1.2.8.2 2006/04/11 08:39:07 nobunobu Exp $
 $content .=
-"<u><b>Your site</b></u>
-<p>Click <a href='../index.php'>HERE</a> to see the home page of your site.</p>
+"<h3><u>About the 2nd Stage Installation</u></h3>
+<p>The 1st stage installation of XOOPS Cube complete. You should execute the 2nd stage installation for setup system modules</p>
+<p>Click a [Next] button, and you'll see login screen. Please login with administrator's user account, that you create at the 1st stage.</p>
+<p>After login, XOOPS Cube Module list will be displayed. Then, please click a 'Install' button.</p>
+<p>Specified Modules are automatically installed, and then you can see XOOPS Cube Top Page</p>
+
 <u><b>Way to use</b></u>
 <p>[not yet]</p>
+
 <u><b>Support</b></u>
 <p>Visit <a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a></p>
 ";
Index: xoops2jp/html/install/language/english/install.php
diff -u xoops2jp/html/install/language/english/install.php:1.2.8.1 xoops2jp/html/install/language/english/install.php:1.2.8.2
--- xoops2jp/html/install/language/english/install.php:1.2.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/english/install.php	Tue Apr 11 17:39:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x Exp $
+// $Id: install.php,v 1.2.8.2 2006/04/11 08:39:07 nobunobu Exp $
 define("_INSTALL_L0","Welcome to the Install Wizard for XOOPS Cube 2.1");
 define("_INSTALL_L70","Please change the file permission for mainfile.php so that it is writeable by the server (i.e. chmod 777 mainfile.php on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server ). Reload this page once you have changed the permission setting.");
 //define("_INSTALL_L71","Click on the button below to begin the installation.");
@@ -49,7 +49,7 @@
 define("_INSTALL_L58","Virtual path to your main XOOPS Cube directory WITHOUT trailing slash");
 
 define("_INSTALL_L31","Could not create database. Contact the server administrator for details.");
-define("_INSTALL_L32","Installation Complete");
+define("_INSTALL_L32","The 1st Stage Installation Complete");
 define("_INSTALL_L33","Click <a href='../index.php'>HERE</a> to see the home page of your site.");
 define("_INSTALL_L35","If you had any errors, please contact the dev team at <a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a>");
 define("_INSTALL_L36","Please choose your site admin's name and password.");
@@ -175,6 +175,7 @@
 
 define('_INSTALL_L128', 'Choose language to be used for the installation process');
 define('_INSTALL_L200', 'Reload');
+define("_INSTALL_L210","The 2nd Stage Installation");
 
 
 define('_INSTALL_CHARSET','ISO-8859-1');

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:07 +0900
Subject: [xoops-cvslog 2736] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060411083907.4BF582AC018@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/finish.php
diff -u xoops2jp/html/install/language/japanese/finish.php:1.1.8.3 xoops2jp/html/install/language/japanese/finish.php:1.1.8.4
--- xoops2jp/html/install/language/japanese/finish.php:1.1.8.3	Sat Feb  4 03:30:23 2006
+++ xoops2jp/html/install/language/japanese/finish.php	Tue Apr 11 17:39:07 2006
@@ -1,7 +1,13 @@
 <?php
 $content .=
-"<u><b>サイト</b></u>
-<p>インストールされたサイトを見るには、<a href='../index.php'>ここ</a>をクリックしてください。</p>
+"<h3><u>インストールの第２ステップについて</u></h3>
+<p>XOOPS Cubeのインストールの第１ステップが完了しました。
+XOOPS Cubeの必須モジュールの導入を完了するためには、第２ステップを実行する必要があります。</p>
+<p></p>
+<p>「次へ」をクリックして、表示されるログオン画面に第１ステップで設定した管理者のユーザＩＤでログインして下さい。</p>
+<p>ログインに成功すると、導入可能なモジュールの一覧が表示されます。一覧を確認し、選択導入可能なモジュールが存在する場合には、インストールするモジュールにチェックを行った後に「インストール」ボタンをクリックして下さい。</p>
+<p>選択されたモジュールが自動的に導入された後に、XOOPS Cubeのサイトに管理者権限でログインした状態のトップ画面が表示されます</p>
+
 <u><b>XOOPS Cubeの使い方について</b></u>
 <p>[未記述]</p>
 <u><b>サポート</b></u>
Index: xoops2jp/html/install/language/japanese/install.php
diff -u xoops2jp/html/install/language/japanese/install.php:1.2.8.1 xoops2jp/html/install/language/japanese/install.php:1.2.8.2
--- xoops2jp/html/install/language/japanese/install.php:1.2.8.1	Sat Feb  4 02:16:36 2006
+++ xoops2jp/html/install/language/japanese/install.php	Tue Apr 11 17:39:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.2.8.1 2006/02/03 17:16:36 tom_g3x Exp $
+// $Id: install.php,v 1.2.8.2 2006/04/11 08:39:07 nobunobu Exp $
 define("_INSTALL_L0","XOOPS Cube 2.1 インストールウィザードへようこそ");
 define("_INSTALL_L70","サーバ上のmainfile.php への書き込み権限を与えてください。<br />（例：UNIX/LINUXサーバの場合はchmod 777 mainfile.php、Windowsサーバの場合は読み取り専用プロパティがセットされていないかチェックする。）<br />権限の設定完了後、ブラウザの「更新」ボタンを押してこのページを再度読み込んでください。");
 //define("_INSTALL_L71","下記のボタンをクリックするとインストールを開始します。");
@@ -49,7 +49,7 @@
 define("_INSTALL_L58","　XOOPS CubeにアクセスするURLを入力してください。<br />　末尾には「/」を付加しないでください。");
 
 define("_INSTALL_L31","データベースの作成に失敗しました。<br /><br />設定されたユーザアカウントの権限ではデータベースの作成ができない場合は、別途作成し、インストールを続けてください。<br />または、はじめからやり直してください。<br />よくわからない場合は、サーバ管理者にお問い合わせください。");
-define("_INSTALL_L32","インストール完了");
+define("_INSTALL_L32","インストール第１ステップ完了");
 define("_INSTALL_L33","インストールされたホームページを見るには<a href='../index.php'> ここ </a>をクリックしてください。");
 define("_INSTALL_L35","インストール中にエラーが発生した場合は<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>のサポートフォーラムをご利用ください。");
 define("_INSTALL_L36","サイト管理者のユーザ名、ユーザパスワード、およびメールアドレスを入力してください。");
@@ -176,6 +176,7 @@
 
 define('_INSTALL_L128', 'インストール作業に使用する言語を選択してください');
 define('_INSTALL_L200', '再読込');
+define('_INSTALL_L210', 'インストール第２ステップ');
 
 
 define('_INSTALL_CHARSET','EUC-JP');

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:07 +0900
Subject: [xoops-cvslog 2737] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060411083907.745D12AC0CC@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.10 xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.11
--- xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php:1.1.2.10	Sun Apr  2 23:42:44 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleInstaller.class.php	Tue Apr 11 17:39:07 2006
@@ -10,162 +10,182 @@
  */
 class Legacy_ModuleInstaller extends Legacy_AbstractModuleInstaller
 {
-	var $mAgree = false;
+    var $mAgree = false;
 
-	/**
-	 * Load xoops module object that isn't installed and return it.
-	 * @static
-	 * @access public
-	 * @param $dirname string
-	 * @return XoopsModule
-	 */
-	function &loadModuleObject($dirname)
-	{
-		$ret = null;
-
-		$moduleHandler =& xoops_gethandler('module');
-		$module =& $moduleHandler->getByDirname($dirname);
-
-		if (is_object($module))
-			return $ret;
-
-		$module =& $moduleHandler->create();
-		$module->setVar('weight', 1);
-		$module->loadInfoAsVar($this->mDirname);
-		
-		if ($module->get('dirname') == null) {
-			return $ret;
-		}
-		
-		if (isset($module->modinfo['installer']) && isset($module->modinfo['installer']['licence']) ) {
-			$this->mAgree = true;
-		}
-		
-		return $module;
-	}
-	
-	function _installModule()
-	{
-		if (parent::_installModule()) {
-			$gpermHandler =& xoops_gethandler('groupperm');
-
-			//
-			// Add a permission which administrators can manage.
-			//
-			$adminPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
-			$adminPerm->setVar('gperm_name', 'module_admin');
-
-			if (!$gpermHandler->insert($adminPerm)) {
-				$log->addError("Could not set admin permission " . $this->mModule->getVar('mid'));
-			}
-    		$read_any = $this->mModule->getInfo('read_any');
-    		if ($read_any) {
-				$memberHandler =& xoops_gethandler('member');
-				$groupObjects =& $memberHandler->getGroups();
-    			//
-    			// Add a permission all group members and guest can read.
-    			//
-				foreach($groupObjects as $group) {
-        			$readPerm =& $this->_createPermission($group->getVar('groupid'));
-        			$readPerm->setVar('gperm_name', 'module_read');
-
-        			if (!$gpermHandler->insert($readPerm)) {
-        				$log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
-        			}
-    			}
-    		} else {
-    			//
-    			// Add a permission which administrators can read.
-    			//
-			    $root = $root=&XCube_Root::getSingleton();
-                $groups = $root->mController->mXoopsUser->getGroups();
-				foreach($groups as $mygroup) {
-        			$readPerm =& $this->_createPermission($mygroup);
-    			    $readPerm->setVar('gperm_name', 'module_read');
-
-       			    if (!$gpermHandler->insert($readPerm)) {
-    			    	$log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
-    				}
-				}
-    		}
-		}
-	}
-
-	/**
-	 * Create a permission object which has been initialized for admin.
-	 * For flexibility, creation only and not save it.
-	 * @access private
-	 * @param $group
-	 */
-	function &_createPermission($group)
-	{
-		$gpermHandler =& xoops_gethandler('groupperm');
-
-		$perm =& $gpermHandler->create();
-
-		$perm->setVar('gperm_groupid', $group);
-		$perm->setVar('gperm_itemid', $this->mModule->getVar('mid'));
-		$perm->setVar('gperm_modid', 1);
-		
-		return $perm;
-	}
-
-	function _installTable()
-	{
-		Legacy_ModuleUtils::installTable($this->mModule, $this->mLog);
-	}
-
-	function _installTemplate()
-	{
-		$templates = $this->mModule->getInfo('templates');
-		if ($templates != false) {
-			foreach ($templates as $template) {
-				Legacy_ModuleUtils::installTemplate($this->mModule, $template, $this->mLog);
-			}
-		}
-	}
-
-	function _installBlock()
-	{
-		$definedBlocks = $this->mModule->getInfo('blocks');
-		if($definedBlocks == false)
-			return true;
-
-		$blockHandler =& xoops_gethandler('block');
-
-		$func_num=0;
-		foreach ($definedBlocks as $block) {
-			$func_num++;
-			$newBlock =& Legacy_ModuleUtils::createBlockByInfo($this->mModule, $block);
-			$newBlock->setVar('func_num', $func_num);
-
-			Legacy_ModuleUtils::installBlock($this->mModule, $newBlock, $block, $this->mLog);
-		}
-	}
-
-	function _installPreference()
-	{
-		Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
-	}
-	
-	function _processScript()
-	{
-		$installScript = trim($this->mModule->getInfo('onInstall'));
-		if ($installScript != false) {
-			require_once XOOPS_MODULE_PATH . "/" . $this->mModule->getVar('dirname') . "/" . $installScript;
-			$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);
-				}
-			}
-		}
-	}
-
-	function hasAgree()
-	{
-		return $this->mAgree;
-	}
+    /**
+     * Load xoops module object that isn't installed and return it.
+     * @static
+     * @access public
+     * @param $dirname string
+     * @return XoopsModule
+     */
+    function &loadModuleObject($dirname)
+    {
+        $ret = null;
+
+        $moduleHandler =& xoops_gethandler('module');
+        $module =& $moduleHandler->getByDirname($dirname);
+
+        if (is_object($module))
+            return $ret;
+
+        $module =& $moduleHandler->create();
+        $module->setVar('weight', 1);
+        $module->loadInfoAsVar($this->mDirname);
+        
+        if ($module->get('dirname') == null) {
+            return $ret;
+        }
+        
+        if (isset($module->modinfo['installer']) && isset($module->modinfo['installer']['licence']) ) {
+            $this->mAgree = true;
+        }
+        
+        return $module;
+    }
+    
+    function _installModule()
+    {
+        if (parent::_installModule()) {
+            $gpermHandler =& xoops_gethandler('groupperm');
+
+            //
+            // Add a permission which administrators can manage.
+            //
+            if ($this->mModule->getInfo('hasAdmin')) {
+                $adminPerm =& $this->_createPermission(XOOPS_GROUP_ADMIN);
+                $adminPerm->setVar('gperm_name', 'module_admin');
+
+                if (!$gpermHandler->insert($adminPerm)) {
+                    $log->addError("Could not set admin permission " . $this->mModule->getVar('mid'));
+                }
+            }
+
+            //
+            // Add a permission which administrators can manage. (Special for Legacy System Module)
+            //
+            if ($this->mModule->getVar('dirname') == 'system') {
+                for ($i=1; $i<16; $i++) {
+                    $sysAdminPerm  =& $this->_createPermission(XOOPS_GROUP_ADMIN);
+                    $adminPerm->setVar('gperm_itemid', $i);
+                    $adminPerm->setVar('gperm_name', 'system_admin');
+                    if (!$gpermHandler->insert($adminPerm)) {
+                        $log->addError("Could not set system admin permission " . $this->mModule->getVar('mid'));
+                    }
+                    unset($sysAdminPerm);
+                }
+            }
+            
+            if ($this->mModule->getInfo('hasMain')) {
+                $read_any = $this->mModule->getInfo('read_any');
+                if ($read_any) {
+                    $memberHandler =& xoops_gethandler('member');
+                    $groupObjects =& $memberHandler->getGroups();
+                    //
+                    // Add a permission all group members and guest can read.
+                    //
+                    foreach($groupObjects as $group) {
+                        $readPerm =& $this->_createPermission($group->getVar('groupid'));
+                        $readPerm->setVar('gperm_name', 'module_read');
+
+                        if (!$gpermHandler->insert($readPerm)) {
+                            $log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
+                        }
+                    }
+                } else {
+                    //
+                    // Add a permission which administrators can read.
+                    //
+                    $root = $root=&XCube_Root::getSingleton();
+                    $groups = $root->mController->mXoopsUser->getGroups();
+                    foreach($groups as $mygroup) {
+                        $readPerm =& $this->_createPermission($mygroup);
+                        $readPerm->setVar('gperm_name', 'module_read');
+
+                        if (!$gpermHandler->insert($readPerm)) {
+                            $log->addError("Could not set read permission " . $this->mModule->getVar('mid'));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Create a permission object which has been initialized for admin.
+     * For flexibility, creation only and not save it.
+     * @access private
+     * @param $group
+     */
+    function &_createPermission($group)
+    {
+        $gpermHandler =& xoops_gethandler('groupperm');
+
+        $perm =& $gpermHandler->create();
+
+        $perm->setVar('gperm_groupid', $group);
+        $perm->setVar('gperm_itemid', $this->mModule->getVar('mid'));
+        $perm->setVar('gperm_modid', 1);
+        
+        return $perm;
+    }
+
+    function _installTable()
+    {
+        Legacy_ModuleUtils::installTable($this->mModule, $this->mLog);
+    }
+
+    function _installTemplate()
+    {
+        $templates = $this->mModule->getInfo('templates');
+        if ($templates != false) {
+            foreach ($templates as $template) {
+                Legacy_ModuleUtils::installTemplate($this->mModule, $template, $this->mLog);
+            }
+        }
+    }
+
+    function _installBlock()
+    {
+        $definedBlocks = $this->mModule->getInfo('blocks');
+        if($definedBlocks == false)
+            return true;
+
+        $blockHandler =& xoops_gethandler('block');
+
+        $func_num=0;
+        foreach ($definedBlocks as $block) {
+            $func_num++;
+            $newBlock =& Legacy_ModuleUtils::createBlockByInfo($this->mModule, $block);
+            $newBlock->setVar('func_num', $func_num);
+
+            Legacy_ModuleUtils::installBlock($this->mModule, $newBlock, $block, $this->mLog);
+        }
+    }
+
+    function _installPreference()
+    {
+        Legacy_ModuleUtils::insertAllConfigs($this->mModule, $this->mLog);
+    }
+    
+    function _processScript()
+    {
+        $installScript = trim($this->mModule->getInfo('onInstall'));
+        if ($installScript != false) {
+            require_once XOOPS_MODULE_PATH . "/" . $this->mModule->getVar('dirname') . "/" . $installScript;
+            $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);
+                }
+            }
+        }
+    }
+
+    function hasAgree()
+    {
+        return $this->mAgree;
+    }
 }
 
 ?>
\ No newline at end of file
Index: xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php
diff -u xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.14 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.15
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.14	Tue Apr 11 00:10:23 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Tue Apr 11 17:39:07 2006
@@ -401,7 +401,9 @@
 				$config->setVar('conf_catid', 0);
 				$config->setVar('conf_name', $configInfo['name']);
 				$config->setVar('conf_title', $configInfo['title'], true);
-				$config->setVar('conf_desc', $configInfo['description'], true);
+				if (isset($configInfo['description'])) {
+					$config->setVar('conf_desc', $configInfo['description'], true);
+				}
 				$config->setVar('conf_formtype', $configInfo['formtype'], true);
 				$config->setVar('conf_valuetype', $configInfo['valuetype'], true);
 				$config->setConfValueForInput($configInfo['default'], true);

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:07 +0900
Subject: [xoops-cvslog 2738] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060411083907.984102AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/global.php
diff -u xoops2jp/html/modules/base/language/english/global.php:1.1.2.4 xoops2jp/html/modules/base/language/english/global.php:1.1.2.5
--- xoops2jp/html/modules/base/language/english/global.php:1.1.2.4	Sun Apr  2 22:07:47 2006
+++ xoops2jp/html/modules/base/language/english/global.php	Tue Apr 11 17:39:07 2006
@@ -1,13 +1,14 @@
 <?php
-// $Id: global.php,v 1.1.2.4 2006/04/02 13:07:47 nobunobu Exp $
+// $Id: global.php,v 1.1.2.5 2006/04/11 08:39:07 nobunobu Exp $
 
 define('_TOKEN_ERROR', 'CSRF was detected. Confirm carefully, then operate once again');
-define('_SYSTEM_MODULE_ERROR', 'Following System Modules are not installed.');
+define('_SYSTEM_MODULE_ERROR', 'Following Modules are not installed.');
 define('_INSTALL','Install');
 define('_UNINSTALL','Uninstall');
-define('_SYS_MODULE_UNINSTALLED','Not Installed');
-define('_SYS_MODULE_DISABLED','Disabled');
-define('_SYS_OPTION_MODULES','Optional Modules');
+define('_SYS_MODULE_UNINSTALLED','Required(Not Installed)');
+define('_SYS_MODULE_DISABLED','Required(Disabled)');
+define('_SYS_RECOMMENDED_MODULES','Recommended Module');
+define('_SYS_OPTION_MODULES','Optional Module');
 define('_UNINSTALL_CONFIRM','Are you sure to uninstall system module?');
 
 //%%%%%%	File Name mainfile.php 	%%%%%

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:07 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:07 +0900
Subject: [xoops-cvslog 2739] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060411083907.BB8512AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/global.php
diff -u xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.4 xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.5
--- xoops2jp/html/modules/base/language/japanese/global.php:1.1.2.4	Sun Apr  2 22:07:47 2006
+++ xoops2jp/html/modules/base/language/japanese/global.php	Tue Apr 11 17:39:07 2006
@@ -1,11 +1,12 @@
 <?php
 
 define('_TOKEN_ERROR', 'CSRFを検出しました。表示を確認し、もう一度操作を行って下さい');
-define('_SYSTEM_MODULE_ERROR', '以下の必須モジュールが導入されていません');
+define('_SYSTEM_MODULE_ERROR', '以下のモジュールが導入されていません');
 define('_INSTALL','インストール');
 define('_UNINSTALL','削除');
-define('_SYS_MODULE_UNINSTALLED','未導入');
-define('_SYS_MODULE_DISABLED','無効');
+define('_SYS_MODULE_UNINSTALLED','必須(未導入)');
+define('_SYS_MODULE_DISABLED','必須(無効)');
+define('_SYS_RECOMMENDED_MODULES','導入推奨');
 define('_SYS_OPTION_MODULES','選択導入可能');
 define('_UNINSTALL_CONFIRM','必須モジュールのアンインストールを行いますか？');
 

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:08 +0900
Subject: [xoops-cvslog 2740] CVS update:
	xoops2jp/html/modules/base/preload/SiteClose
Message-ID: <20060411083908.0540E2AC018@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.6 xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.7
--- xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.6	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php	Tue Apr 11 17:39:07 2006
@@ -14,12 +14,15 @@
 
 	function callbackSiteLogin()
 	{
+        $retArray = XCube_Utils::checkSystemModules();
 	    $accessAllowFlag = false;
 		if(!empty($_POST['xoops_login'])) {
-			// Check!
+            if (is_array($retArray)) {
+    			define('XOOPS_CPFUNC_LOADED',1);
+    		}
 	        require_once XOOPS_ROOT_PATH.'/include/checklogin.php';
 			return;
-	    }elseif(is_object($this->mController->mXoopsUser)) {
+	    } elseif(is_object($this->mController->mXoopsUser)) {
 			foreach ($this->mController->mXoopsUser->getGroups() as $group) {
 				if (in_array($group, $this->mController->mConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
 					$accessAllowFlag = true;
@@ -29,7 +32,6 @@
 		}
         // @todo Devide following lines to another preload file
         if ($accessAllowFlag) {
-            $retArray = XCube_Utils::checkSystemModules();
             if (is_array($retArray)) {
                if (in_array(XOOPS_GROUP_ADMIN, $this->mController->mXoopsUser->getGroups())) {
                     $GLOBALS['xoopsUser'] = $this->mController->mXoopsUser;
@@ -84,6 +86,7 @@
                                        'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
                                        ));
                         ///< @todo filebase template with absolute file path
+                        $xoopsTpl->compile_check = true;
                         $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_uninstall_modules.html');
                         exit();
                     } else if (!empty($_POST['cube_module_uninstallok'])) { //@todo use Ticket
@@ -99,8 +102,17 @@
                         $objects = $handler->getObjects();
                         $optionModules = array();
                         foreach($objects as $module) {
-                            if (!in_array($module->getVar('dirname'), $retArray['uninstalled'])) {
-                                $optionModules[] = $module->getVar('dirname');
+                            $dirname = $module->getVar('dirname');
+                            if (!in_array($dirname, $retArray['uninstalled'])) {
+                                $optionModule['dirname']  = $dirname;
+                                if (in_array($dirname, $retArray['recommended'])) {
+                                    $optionModule['checked']  = 'checked="checked"';
+                                    $optionModule['desc']  = _SYS_RECOMMENDED_MODULES;
+                                } else {
+                                    $optionModule['checked']  = '';
+                                    $optionModule['desc']  = _SYS_OPTION_MODULES;
+                                }
+                                $optionModules[] = $optionModule;
                             }
                         }
                         require_once XOOPS_ROOT_PATH.'/class/template.php';
@@ -114,6 +126,7 @@
                                        'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
                                        ));
                         ///< @todo filebase template with absolute file path
+                        $xoopsTpl->compile_check = true;
                         $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_install_modules.html');
                         exit();
                     }
@@ -133,7 +146,7 @@
 	                                   'lang_username' => _USERNAME,
 	                                   'lang_password' => _PASSWORD,
 	                                   'lang_siteclosemsg' => $this->mController->mConfig['closesite_text']));
-	        $xoopsTpl->xoops_setCaching(1);
+            $xoopsTpl->compile_check = true;
             // @todo filebase template with absolute file path
             $xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_site_closed.html');
 	        exit();

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:08 +0900
Subject: [xoops-cvslog 2741] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060411083908.298082AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_install_modules.html
diff -u xoops2jp/html/modules/base/templates/legacy_install_modules.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_install_modules.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_install_modules.html:1.1.2.1	Sun Apr  2 22:07:48 2006
+++ xoops2jp/html/modules/base/templates/legacy_install_modules.html	Tue Apr 11 17:39:08 2006
@@ -48,9 +48,9 @@
 <{/foreach}>
 <{foreach item=module from=$option}>
         <tr>
-          <td style="border: 1px solid silver;width:30px; padding: 2px;"><input type="checkbox" name="option_modules[]" value="<{$module}>"/></td>
-          <td style="border: 1px solid silver;width:150px; padding: 2px;"><{$module}></td>
-          <td colspan="2" style="border: 1px solid silver;width:200px; padding: 2px;"><{$smarty.const._SYS_OPTION_MODULES}></td>
+          <td style="border: 1px solid silver;width:30px; padding: 2px;"><input type="checkbox" name="option_modules[]" value="<{$module.dirname}>" <{$module.checked}> /></td>
+          <td style="border: 1px solid silver;width:150px; padding: 2px;"><{$module.dirname}></td>
+          <td colspan="2" style="border: 1px solid silver;width:200px; padding: 2px;"><{$module.desc}></td>
         </tr>
 <{/foreach}>
         <tr><td colspan="4" style="text-align:center;padding: 2px;">

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:08 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:08 +0900
Subject: [xoops-cvslog 2742] CVS update: xoops2jp/html/settings
Message-ID: <20060411083908.4E3972AC018@users.sourceforge.jp>

Index: xoops2jp/html/settings/site_default.ini.php
diff -u xoops2jp/html/settings/site_default.ini.php:1.1.2.9 xoops2jp/html/settings/site_default.ini.php:1.1.2.10
--- xoops2jp/html/settings/site_default.ini.php:1.1.2.9	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/settings/site_default.ini.php	Tue Apr 11 17:39:08 2006
@@ -3,7 +3,8 @@
 
 [Cube]
 Controller=Legacy_Controller
-SystemModules=base, user,legacyRender
+SystemModules=system,base,user,legacyRender
+RecommendedModules=stdCache,pm
 CacheSystem.path=/modules/stdCache/kernel
 CacheSystem.class=StdRenderCache
 

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:39:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:39:16 +0900
Subject: [xoops-cvslog 2743] CVS update: xoops2jp/html/install/wizards
Message-ID: <20060411083916.455692AC018@users.sourceforge.jp>

Index: xoops2jp/html/install/wizards/install_nextStep.inc.php
diff -u /dev/null xoops2jp/html/install/wizards/install_nextStep.inc.php:1.1.2.1
--- /dev/null	Tue Apr 11 17:39:16 2006
+++ xoops2jp/html/install/wizards/install_nextStep.inc.php	Tue Apr 11 17:39:16 2006
@@ -0,0 +1,4 @@
+<?php
+    include_once '../mainfile.php';
+    header('Location: '.XOOPS_URL);
+?>

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:41:12 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:41:12 +0900
Subject: [xoops-cvslog 2744] CVS update: xoops2jp/html/kernel
Message-ID: <20060411084112.400E02AC018@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.6 xoops2jp/html/kernel/module.php:1.2.8.7
--- xoops2jp/html/kernel/module.php:1.2.8.6	Fri Jan 27 13:24:28 2006
+++ xoops2jp/html/kernel/module.php	Tue Apr 11 17:41:12 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.6 2006/01/27 04:24:28 minahito Exp $
+// $Id: module.php,v 1.2.8.7 2006/04/11 08:41:12 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -389,10 +389,13 @@
     {
         static $_cachedModule_mid;
         static $_cachedModule_dirname;
+
+        $dirname =  trim($dirname);
+        
         if (!empty($_cachedModule_dirname[$dirname])) {
             return $_cachedModule_dirname[$dirname];
         } else {
-            $sql = "SELECT * FROM ".$this->db->prefix('modules')." WHERE dirname = '".trim($dirname)."'";
+            $sql = "SELECT * FROM ".$this->db->prefix('modules')." WHERE dirname = ".$this->db->quoteString($dirname);
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
Index: xoops2jp/html/kernel/online.php
diff -u xoops2jp/html/kernel/online.php:1.2 xoops2jp/html/kernel/online.php:1.2.8.1
--- xoops2jp/html/kernel/online.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/online.php	Tue Apr 11 17:41:12 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: online.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: online.php,v 1.2.8.1 2006/04/11 08:41:12 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -78,19 +78,20 @@
     function write($uid, $uname, $time, $module, $ip)
 	{
 		$uid = intval($uid);
+		$ip = $this->db->quoteString($ip);
 		if ($uid > 0) {
 			$sql = "SELECT COUNT(*) FROM ".$this->db->prefix('online')." WHERE online_uid=".$uid;
 		} else {
-			$sql = "SELECT COUNT(*) FROM ".$this->db->prefix('online')." WHERE online_uid=".$uid." AND online_ip='".$ip."'";
+			$sql = "SELECT COUNT(*) FROM ".$this->db->prefix('online')." WHERE online_uid=".$uid." AND online_ip=".$ip;
 		}
 		list($count) = $this->db->fetchRow($this->db->queryF($sql));
         if ( $count > 0 ) {
             $sql = "UPDATE ".$this->db->prefix('online')." SET online_updated=".$time.", online_module = ".$module." WHERE online_uid = ".$uid;
             if ($uid == 0) {
-                $sql .= " AND online_ip='".$ip."'";
+                $sql .= " AND online_ip=".$ip;
             }
         } else {
-			$sql = sprintf("INSERT INTO %s (online_uid, online_uname, online_updated, online_ip, online_module) VALUES (%u, %s, %u, %s, %u)", $this->db->prefix('online'), $uid, $this->db->quoteString($uname), $time, $this->db->quoteString($ip), $module);
+			$sql = sprintf("INSERT INTO %s (online_uid, online_uname, online_updated, online_ip, online_module) VALUES (%u, %s, %u, %s, %u)", $this->db->prefix('online'), $uid, $this->db->quoteString($uname), $time, $ip, $module);
         }
 		if (!$this->db->queryF($sql)) {
             return false;
Index: xoops2jp/html/kernel/tplfile.php
diff -u xoops2jp/html/kernel/tplfile.php:1.2.8.2 xoops2jp/html/kernel/tplfile.php:1.2.8.3
--- xoops2jp/html/kernel/tplfile.php:1.2.8.2	Fri Dec 16 18:05:43 2005
+++ xoops2jp/html/kernel/tplfile.php	Tue Apr 11 17:41:12 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: tplfile.php,v 1.2.8.2 2005/12/16 09:05:43 minahito Exp $
+// $Id: tplfile.php,v 1.2.8.3 2006/04/11 08:41:12 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -306,17 +306,17 @@
             $criteria->add(new Criteria('tpl_refid', $refid));
         }
         if (isset($file)) {
-            $criteria->add(new Criteria('tpl_file', $file));
+            $criteria->add(new Criteria('tpl_file', addslashes(trim($file))));
         }
         if (isset($type)) {
             if (is_array($type)) {
                 $criteria2 = new CriteriaCompo();
                 foreach ($type as $t) {
-                    $criteria2->add(new Criteria('tpl_type', $t), 'OR');
+                    $criteria2->add(new Criteria('tpl_type', addslashes(trim($t))), 'OR');
                 }
                 $criteria->add($criteria2);
             } else {
-                $criteria->add(new Criteria('tpl_type', $type));
+                $criteria->add(new Criteria('tpl_type', addslashes(trim($type))));
             }
         }
         return $this->getObjects($criteria, $getsource, false);
@@ -324,7 +324,7 @@
 
     function templateExists($tplname, $tplset_name)
     {
-        $criteria = new CriteriaCompo(new Criteria('tpl_file', trim($tplname)));
+        $criteria = new CriteriaCompo(new Criteria('tpl_file', addslashes(trim($tplname))));
         $criteria->add(new Criteria('tpl_tplset', addslashes(trim($tplset_name))));
         if ($this->getCount($criteria) > 0) {
             return true;

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:42:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:42:17 +0900
Subject: [xoops-cvslog 2745] CVS update: xoops2jp/html/class
Message-ID: <20060411084217.7A95E2AC0CC@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsblock.php
diff -u xoops2jp/html/class/xoopsblock.php:1.2.8.6 xoops2jp/html/class/xoopsblock.php:1.2.8.7
--- xoops2jp/html/class/xoopsblock.php:1.2.8.6	Tue Feb 28 23:36:04 2006
+++ xoops2jp/html/class/xoopsblock.php	Tue Apr 11 17:42:17 2006
@@ -1,626 +1,8 @@
 <?php
-// $Id: xoopsblock.php,v 1.2.8.6 2006/02/28 14:36:04 nobunobu Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu)                                          //
-// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
-
+// $Id: xoopsblock.php,v 1.2.8.7 2006/04/11 08:42:17 nobunobu Exp $
+// this file is for backward compatibility only
 if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
-
-require_once XOOPS_ROOT_PATH."/kernel/object.php";
-
-define ("SHOW_SIDEBLOCK_LEFT",     1);
-define ("SHOW_SIDEBLOCK_RIGHT",    2);
-define ("SHOW_CENTERBLOCK_LEFT",   4);
-define ("SHOW_CENTERBLOCK_RIGHT",  8);
-define ("SHOW_CENTERBLOCK_CENTER", 16);
-define ("SHOW_BLOCK_ALL",          31);
-
-class XoopsBlock extends XoopsObject
-{
-    var $db;
-	
-	var $mBlockFlagMapping = array();
-
-    function XoopsBlock($id = null)
-    {
-        $this->db =& Database::getInstance();
-        $this->initVar('bid', XOBJ_DTYPE_INT, null, false);
-        $this->initVar('mid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('func_num', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('options', XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 150);
-        //$this->initVar('position', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 150);
-        $this->initVar('content', XOBJ_DTYPE_TXTAREA, null, false);
-        $this->initVar('side', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('weight', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('visible', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('block_type', XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('c_type', XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('isactive', XOBJ_DTYPE_INT, null, false);
-
-        $this->initVar('dirname', XOBJ_DTYPE_TXTBOX, null, false, 50);
-        $this->initVar('func_file', XOBJ_DTYPE_TXTBOX, null, false, 50);
-        $this->initVar('show_func', XOBJ_DTYPE_TXTBOX, null, false, 50);
-        $this->initVar('edit_func', XOBJ_DTYPE_TXTBOX, null, false, 50);
-
-        $this->initVar('template', XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('bcachetime', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('last_modified', XOBJ_DTYPE_INT, 0, false);
-
-        if ( !empty($id) ) {
-            if ( is_array($id) ) {
-                $this->assignVars($id);
-            } else {
-                $this->load(intval($id));
-            }
-        }
-
-		
-		$this->mBlockFlagMapping = array(
-			0 => false,
-			SHOW_SIDEBLOCK_LEFT => 0,
-			SHOW_SIDEBLOCK_RIGHT => 1,
-			SHOW_CENTERBLOCK_LEFT => 3,
-			SHOW_CENTERBLOCK_RIGHT => 4,
-			SHOW_CENTERBLOCK_CENTER => 5
-		);
-    }
-
-    function load($id)
-    {
-        $sql = 'SELECT * FROM '.$this->db->prefix('newblocks').' WHERE bid = '.$id;
-        $arr = $this->db->fetchArray($this->db->query($sql));
-        $this->assignVars($arr);
-    }
-
-    function store()
-    {
-        if ( !$this->cleanVars() ) {
-            return false;
-        }
-        foreach ( $this->cleanVars as $k=>$v ) {
-            ${$k} = $v;
-        }
-        if ( empty($bid) ) {
-            $bid = $this->db->genId($this->db->prefix("newblocks")."_bid_seq");
-            $sql = sprintf("INSERT INTO %s (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES (%u, %u, %u, %s, %s, %s, %s, %u, %u, %u, %s, %s, %u, %s, %s, %s, %s, %s, %u, %u)", $this->db->prefix('newblocks'), $bid, $mid, $func_num, $this->db->quoteString($options), $this->db->quoteString($name), $this->db->quoteString($title), $this->db->quoteString($content), $side, $weight, $visible, $this->db->quoteString($block_type), $this->db->quoteString($c_type), 1, $this->db->quoteString($dirname), $this->db->quoteString($func_file), $this->db->quoteString($show_func), $this->db->quoteString($edit_func), $this->db->quoteString($template), $bcachetime, time());
-        } else {
-            $sql = "UPDATE ".$this->db->prefix("newblocks")." SET options=".$this->db->quoteString($options);
-            // a custom block needs its own name
-            if ( $block_type == "C" ) {
-                $sql .= ", name=".$this->db->quoteString($name);
-            }
-            $sql .= ", isactive=".$isactive.", title=".$this->db->quoteString($title).", content=".$this->db->quoteString($content).", side=".$side.", weight=".$weight.", visible=".$visible.", c_type=".$this->db->quoteString($c_type).", template=".$this->db->quoteString($template).", bcachetime=".$bcachetime.", last_modified=".time()." WHERE bid=".$bid;
-        }
-        if ( !$this->db->query($sql) ) {
-            $this->setErrors("Could not save block data into database");
-            return false;
-        }
-        if ( empty($bid) ) {
-            $bid = $this->db->getInsertId();
-        }
-        return $bid;
-    }
-
-    function delete()
-    {
-        $sql = sprintf("DELETE FROM %s WHERE bid = %u", $this->db->prefix('newblocks'), $this->getVar('bid'));
-        if ( !$this->db->query($sql) ) {
-            return false;
-        }
-        $sql = sprintf("DELETE FROM %s WHERE gperm_name = 'block_read' AND gperm_itemid = %u AND gperm_modid = 1", $this->db->prefix('group_permission'), $this->getVar('bid'));
-        $this->db->query($sql);
-        $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $this->db->prefix('block_module_link'), $this->getVar('bid'));
-        $this->db->query($sql);
-        return true;
-    }
-
-    /**
-    * do stripslashes/htmlspecialchars according to the needed output
-    *
-    * @param $format      output use: S for Show and E for Edit
-    * @param $c_type    type of block content
-    * @returns string
-    */
-    function &getContent($format = 'S', $c_type = 'T')
-    {
-        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'));
-            } 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);
-            } elseif ( $c_type == 'S' ) {
-                $myts =& MyTextSanitizer::getInstance();
-                return 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));
-            }
-            break;
-        case 'E':
-            return $this->getVar('content', 'E');
-            break;
-        default:
-            return $this->getVar('content', 'N');
-            break;
-        }
-    }
-
-    function &buildBlock()
-    {
-        global $xoopsConfig, $xoopsOption;
-        $ret = false;
-
-        $block = array();
-        // M for module block, S for system block C for Custom
-        if ( $this->getVar("block_type") != "C" ) {
-            // get block display function
-            $show_func = $this->getVar('show_func');
-            if ( !$show_func ) {
-                return $ret;
-            }
-            // 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'));
-
-                require_once XOOPS_ROOT_PATH."/modules/".$this->getVar('dirname')."/blocks/".$this->getVar('func_file');
-                $options = explode("|", $this->getVar("options"));
-                if ( function_exists($show_func) ) {
-                    // execute the function
-                    $block = $show_func($options);
-                    if ( !$block ) {
-                        return $ret;
-                    }
-                } else {
-                    return $ret;
-                }
-            } else {
-                return $ret;
-            }
-        } else {
-            // it is a custom block, so just return the contents
-            $block['content'] = $this->getContent("S",$this->getVar("c_type"));
-            if (empty($block['content'])) {
-                return $ret;
-            }
-        }
-        return $block;
-    }
-
-    /*
-    * Aligns the content of a block
-    * If position is 0, content in DB is positioned
-    * before the original content
-    * If position is 1, content in DB is positioned
-    * after the original content
-    */
-    function &buildContent($position,$content="",$contentdb="")
-    {
-        if ( $position == 0 ) {
-            $ret = $contentdb.$content;
-        } elseif ( $position == 1 ) {
-            $ret = $content.$contentdb;
-        }
-        return $ret;
-    }
-
-    function &buildTitle($originaltitle, $newtitle="")
-    {
-        if ($newtitle != "") {
-            $ret = $newtitle;
-        } else {
-            $ret = $originaltitle;
-        }
-        return $ret;
-    }
-
-    function isCustom()
-    {
-        if ( $this->getVar("block_type") == "C" ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-    * gets html form for editting block options
-    *
-    */
-    function getOptions()
-    {
-        global $xoopsConfig;
-        if ( $this->getVar("block_type") != "C" ) {
-            $edit_func = $this->getVar('edit_func');
-            if ( !$edit_func ) {
-                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/".$xoopsConfig['language']."/blocks.php") ) {
-                    include_once XOOPS_ROOT_PATH."/modules/".$this->getVar('dirname')."/language/".$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";
-                }
-                include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
-                $options = explode("|", $this->getVar("options"));
-                $edit_form = $edit_func($options);
-                if ( !$edit_form ) {
-                    return false;
-                }
-                return $edit_form;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-    * get all the blocks that match the supplied parameters
-    * @param $side   0: sideblock - left
-    *        1: sideblock - right
-    *        2: sideblock - left and right
-    *        3: centerblock - left
-    *        4: centerblock - right
-    *        5: centerblock - center
-    *        6: centerblock - left, right, center
-    * @param $groupid   groupid (can be an array)
-    * @param $visible   0: not visible 1: visible
-    * @param $orderby   order of the blocks
-    * @returns array of block objects
-    */
-    function &getAllBlocksByGroup($groupid, $asobject=true, $side=null, $visible=null, $orderby="b.weight,b.bid", $isactive=1)
-    {
-        $db =& Database::getInstance();
-        $ret = array();
-        if ( !$asobject ) {
-            $sql = "SELECT b.bid ";
-        } else {
-            $sql = "SELECT b.* ";
-        }
-        $sql .= "FROM ".$db->prefix("newblocks")." b LEFT JOIN ".$db->prefix("group_permission")." l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
-        if ( is_array($groupid) ) {
-            $sql .= " AND (l.gperm_groupid=".$groupid[0]."";
-            $size = count($groupid);
-            if ( $size  > 1 ) {
-                for ( $i = 1; $i < $size; $i++ ) {
-                    $sql .= " OR l.gperm_groupid=".$groupid[$i]."";
-                }
-            }
-            $sql .= ")";
-        } else {
-            $sql .= " AND l.gperm_groupid=".$groupid."";
-        }
-        $sql .= " AND b.isactive=".$isactive;
-        if ( isset($side) ) {
-            // get both sides in sidebox? (some themes need this)
-            if ( $side == XOOPS_SIDEBLOCK_BOTH ) {
-                $side = "(b.side=0 OR b.side=1)";
-            } elseif ( $side == XOOPS_CENTERBLOCK_ALL ) {
-                $side = "(b.side=3 OR b.side=4 OR b.side=5)";
-            } else {
-                $side = "b.side=".$side;
-            }
-            $sql .= " AND ".$side;
-        }
-        if ( isset($visible) ) {
-            $sql .= " AND b.visible=$visible";
-        }
-        $sql .= " ORDER BY $orderby";
-        $result = $db->query($sql);
-        $added = array();
-        while ( $myrow = $db->fetchArray($result) ) {
-            if ( !in_array($myrow['bid'], $added) ) {
-                if (!$asobject) {
-                    $ret[] = $myrow['bid'];
-                } else {
-                    $ret[] =& new XoopsBlock($myrow);
-                }
-                array_push($added, $myrow['bid']);
-            }
-        }
-        //echo $sql;
-        return $ret;
-    }
-
-    function &getAllBlocks($rettype="object", $side=null, $visible=null, $orderby="side,weight,bid", $isactive=1)
-    {
-        $db =& Database::getInstance();
-        $ret = array();
-        $where_query = " WHERE isactive=".$isactive;
-        if ( isset($side) ) {
-            // get both sides in sidebox? (some themes need this)
-            if ( $side == 2 ) {
-                $side = "(side=0 OR side=1)";
-            } elseif ( $side == 6 ) {
-                $side = "(side=3 OR side=4 OR side=5)";
-            } else {
-                $side = "side=".$side;
-            }
-            $where_query .= " AND ".$side;
-        }
-        if ( isset($visible) ) {
-            $where_query .= " AND visible=$visible";
-        }
-        $where_query .= " ORDER BY $orderby";
-        switch ($rettype) {
-        case "object":
-            $sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $ret[] =& new XoopsBlock($myrow);
-            }
-            break;
-        case "list":
-            $sql = "SELECT * FROM ".$db->prefix("newblocks")."".$where_query;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $block =& new XoopsBlock($myrow);
-                $name = ($block->getVar("block_type") != "C") ? $block->getVar("name") : $block->getVar("title");
-                $ret[$block->getVar("bid")] = $name;
-                unset($block);
-            }
-            break;
-        case "id":
-            $sql = "SELECT bid FROM ".$db->prefix("newblocks")."".$where_query;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $ret[] = $myrow['bid'];
-            }
-            break;
-        }
-        //echo $sql;
-        return $ret;
-    }
-
-    function &getByModule($moduleid, $asobject=true)
-    {
-        $db =& Database::getInstance();
-        if ( $asobject == true ) {
-            $sql = $sql = "SELECT * FROM ".$db->prefix("newblocks")." WHERE mid=".$moduleid."";
-        } else {
-            $sql = "SELECT bid FROM ".$db->prefix("newblocks")." WHERE mid=".$moduleid."";
-        }
-        $result = $db->query($sql);
-        $ret = array();
-        while( $myrow = $db->fetchArray($result) ) {
-            if ( $asobject ) {
-                $ret[] =& new XoopsBlock($myrow);
-            } else {
-                $ret[] = $myrow['bid'];
-            }
-        }
-        return $ret;
-    }
-
-    function &getAllByGroupModule($groupid, $module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
-    {
-        $db =& Database::getInstance();
-        $ret = array();
-        $sql = "SELECT DISTINCT gperm_itemid FROM ".$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
-        if ( is_array($groupid) ) {
-            $sql .= ' AND gperm_groupid IN ('.implode(',', $groupid).')';
-        } else {
-            if (intval($groupid) > 0) {
-                $sql .= ' AND gperm_groupid='.$groupid;
-            }
-        }
-        $result = $db->query($sql);
-        $blockids = array();
-        while ( $myrow = $db->fetchArray($result) ) {
-            $blockids[] = $myrow['gperm_itemid'];
-        }
-        if (!empty($blockids)) {
-            $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
-            $sql .= ' AND b.isactive='.$isactive;
-            if (isset($visible)) {
-                $sql .= ' AND b.visible='.intval($visible);
-            }
-            if ($module_id !== false) {
-                $sql .= ' AND m.module_id IN (0,'.intval($module_id);
-                if ($toponlyblock) {
-                    $sql .= ',-1';
-                }
-                $sql .= ')';
-            } else {
-                if ($toponlyblock) {
-                    $sql .= ' AND m.module_id IN (0,-1)';
-                } else {
-                    $sql .= ' AND m.module_id=0';
-                }
-            }
-            $sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
-            $sql .= ' ORDER BY '.$orderby;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $block =& new XoopsBlock($myrow);
-                $ret[$myrow['bid']] =& $block;
-                unset($block);
-            }
-        }
-        return $ret;
-    }
-
-	/**
-	 * Return block instance array by $groupid, $mid and $blockFlag.
-	 * This function is new function of Cube and used from controller.
-	 * @author minahito
-	 */
-	function &getBlocks($groupid, $mid=false, $blockFlag=SHOW_BLOCK_ALL, $orderby='b.weight,b.bid')
-    {
-        $root =& XCube_Root::getSingleton();
-        $db =& $root->mController->getDB();
-
-        $ret = array();
-        $sql = "SELECT DISTINCT gperm_itemid FROM ".$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
-        if ( is_array($groupid) ) {
-            $sql .= ' AND gperm_groupid IN ('.implode(',', $groupid).')';
-        } else {
-            if (intval($groupid) > 0) {
-                $sql .= ' AND gperm_groupid='.$groupid;
-            }
-        }
-        $result = $db->query($sql);
-        $blockids = array();
-        while ( $myrow = $db->fetchArray($result) ) {
-            $blockids[] = $myrow['gperm_itemid'];
-        }
-        if (!empty($blockids)) {
-            $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
-            $sql .= ' AND b.isactive=1 AND b.visible=1 ';
-            if ($mid !== false && $mid !== 0) {
-                $sql .= ' AND m.module_id IN (0,'.intval($mid).')';
-            } else {
-                $sql .= ' AND m.module_id=0';
-            }
-
-            //
-            // SIDE
-            //
-            if ($blockFlag != SHOW_BLOCK_ALL) {
-				$arr = array();
-				if ($blockFlag & SHOW_SIDEBLOCK_LEFT) {
-					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_SIDEBLOCK_LEFT];
-				}
-				if ($blockFlag & SHOW_SIDEBLOCK_RIGHT) {
-					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_SIDEBLOCK_RIGHT];
-				}
-				if ($blockFlag & SHOW_CENTERBLOCK_LEFT) {
-					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_LEFT];
-				}
-				if ($blockFlag & SHOW_CENTERBLOCK_CENTER) {
-					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_CENTER];
-				}
-				if ($blockFlag & SHOW_CENTERBLOCK_RIGHT) {
-					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_RIGHT];
-				}
-				
-				$sql .= " AND (" . implode(" OR ", $arr) . ")";
-			}
-
-			$sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
-            $sql .= ' ORDER BY '.$orderby;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $block =& new XoopsBlock($myrow);
-                $ret[$myrow['bid']] =& $block;
-                unset($block);
-            }
-        }
-        return $ret;
-    }
-
-    function &getNonGroupedBlocks($module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
-    {
-        $db =& Database::getInstance();
-        $ret = array();
-        $bids = array();
-        $sql = "SELECT DISTINCT(bid) from ".$db->prefix('newblocks');
-        if ($result = $db->query($sql)) {
-            while ( $myrow = $db->fetchArray($result) ) {
-                $bids[] = $myrow['bid'];
-            }
-        }
-        $sql = "SELECT DISTINCT(p.gperm_itemid) from ".$db->prefix('group_permission')." p, ".$db->prefix('groups')." g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
-        $grouped = array();
-        if ($result = $db->query($sql)) {
-            while ( $myrow = $db->fetchArray($result) ) {
-                $grouped[] = $myrow['gperm_itemid'];
-            }
-        }
-        $non_grouped = array_diff($bids, $grouped);
-        if (!empty($non_grouped)) {
-            $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
-            $sql .= ' AND b.isactive='.$isactive;
-            if (isset($visible)) {
-                $sql .= ' AND b.visible='.intval($visible);
-            }
-            $module_id = intval($module_id);
-            if (!empty($module_id)) {
-                $sql .= ' AND m.module_id IN (0,'.$module_id;
-                if ($toponlyblock) {
-                    $sql .= ',-1';
-                }
-                $sql .= ')';
-            } else {
-                if ($toponlyblock) {
-                    $sql .= ' AND m.module_id IN (0,-1)';
-                } else {
-                    $sql .= ' AND m.module_id=0';
-                }
-            }
-            $sql .= ' AND b.bid IN ('.implode(',', $non_grouped).')';
-            $sql .= ' ORDER BY '.$orderby;
-            $result = $db->query($sql);
-            while ( $myrow = $db->fetchArray($result) ) {
-                $block =& new XoopsBlock($myrow);
-                $ret[$myrow['bid']] =& $block;
-                unset($block);
-            }
-        }
-        return $ret;
-    }
-
-    function countSimilarBlocks($moduleId, $funcNum, $showFunc = null)
-    {
-        $funcNum = intval($funcNum);
-        $moduleId = intval($moduleId);
-        if ($funcNum < 1 || $moduleId < 1) {
-            // invalid query
-            return 0;
-        }
-        $db =& Database::getInstance();
-        if (isset($showFunc)) {
-            // showFunc is set for more strict comparison
-            $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d AND show_func = %s", $db->prefix('newblocks'), $moduleId, $funcNum, $db->quoteString(trim($showFunc)));
-        } else {
-            $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d", $db->prefix('newblocks'), $moduleId, $funcNum);
-        }
-        if (!$result = $db->query($sql)) {
-            return 0;
-        }
-        list($count) = $db->fetchRow($result);
-        return $count;
-    }
+	exit();
 }
+require_once XOOPS_ROOT_PATH.'/kernel/block.php';
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:42:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:42:17 +0900
Subject: [xoops-cvslog 2746] CVS update: xoops2jp/html/kernel
Message-ID: <20060411084217.A0D362AC0CF@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.5 xoops2jp/html/kernel/block.php:1.2.8.6
--- xoops2jp/html/kernel/block.php:1.2.8.5	Thu Feb  9 18:09:32 2006
+++ xoops2jp/html/kernel/block.php	Tue Apr 11 17:42:17 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.5 2006/02/09 09:09:32 minahito Exp $
+// $Id: block.php,v 1.2.8.6 2006/04/11 08:42:17 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,10 +33,14 @@
     exit();
 }
 
-/**
- * @author  Kazumi Ono <onokazu ＠ xoops.org>
- * @copyright copyright (c) 2000 XOOPS.org
- **/
+if (!defined('SHOW_SIDEBLOCK_LEFT')) {
+    define ('SHOW_SIDEBLOCK_LEFT',     1);
+    define ('SHOW_SIDEBLOCK_RIGHT',    2);
+    define ('SHOW_CENTERBLOCK_LEFT',   4);
+    define ('SHOW_CENTERBLOCK_RIGHT',  8);
+    define ('SHOW_CENTERBLOCK_CENTER', 16);
+    define ('SHOW_BLOCK_ALL',          31);
+}
 
 /**
  * A block
@@ -48,6 +52,7 @@
  **/
 class XoopsBlock extends XoopsObject
 {
+	var $mBlockFlagMapping = array();
 
     /**
      * constructor
@@ -83,11 +88,17 @@
             if (is_array($id)) {
                 $this->assignVars($id);
             } else {
-                $blkhandler =& xoops_gethandler('block');
-                $obj =& $blkhandler->get($id);
-                $this->assignVars($obj->getVars());
+                $this->load($id);
             }
         }
+		$this->mBlockFlagMapping = array(
+			0 => false,
+			SHOW_SIDEBLOCK_LEFT => 0,
+			SHOW_SIDEBLOCK_RIGHT => 1,
+			SHOW_CENTERBLOCK_LEFT => 3,
+			SHOW_CENTERBLOCK_RIGHT => 4,
+			SHOW_CENTERBLOCK_CENTER => 5
+		);
     }
 
     /**
@@ -106,6 +117,11 @@
     {
         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'));
             } elseif ( $c_type == 'P' ) {
@@ -116,10 +132,10 @@
                 return 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'), 0, 1));
+                return 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'), 0, 0));
+                return str_replace('{X_SITEURL}', XOOPS_URL.'/', $myts->displayTarea($this->getVar('content', 'N'), 1, 0));
             }
             break;
         case 'E':
@@ -131,7 +147,84 @@
         }
     }
 
-    /**
+    function &buildBlock()
+    {
+        $ret = false;
+
+        $block = array();
+        // M for module block, S for system block C for Custom
+        if ( $this->getVar('block_type') != 'C' ) {
+            // get block display function
+            $show_func = $this->getVar('show_func');
+            if ( !$show_func ) {
+                return $ret;
+            }
+            // 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'));
+
+                require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');
+                $options = explode('|', $this->getVar('options'));
+                if ( function_exists($show_func) ) {
+                    // execute the function
+                    $block = $show_func($options);
+                    if ( !$block ) {
+                        return $ret;
+                    }
+                } else {
+                    return $ret;
+                }
+            } else {
+                return $ret;
+            }
+        } else {
+            // it is a custom block, so just return the contents
+            $block['content'] = $this->getContent('S',$this->getVar('c_type'));
+            if (empty($block['content'])) {
+                return $ret;
+            }
+        }
+        return $block;
+    }
+
+    /*
+    * Aligns the content of a block
+    * If position is 0, content in DB is positioned
+    * before the original content
+    * If position is 1, content in DB is positioned
+    * after the original content
+    */
+    function &buildContent($position,$content="",$contentdb="")
+    {
+        if ( $position == 0 ) {
+            $ret = $contentdb.$content;
+        } elseif ( $position == 1 ) {
+            $ret = $content.$contentdb;
+        }
+        return $ret;
+    }
+
+    function &buildTitle($originaltitle, $newtitle="")
+    {
+        if ($newtitle != "") {
+            $ret = $newtitle;
+        } else {
+            $ret = $originaltitle;
+        }
+        return $ret;
+    }
+
+    function isCustom()
+    {
+        if ( $this->getVar('block_type') == 'C' ) {
+            return true;
+        }
+        return false;
+    }
+
+/**
      * (HTML-) form for setting the options of the block
      *
      * @return string HTML for the form, FALSE if not defined for this block
@@ -163,6 +256,77 @@
             return false;
         }
     }
+
+    // Some functions for for backward compatibility
+    //  @deprecated
+
+    function load($id) 
+    {
+        $handler =& xoops_gethandler('block');
+        $obj =& $handler->get($id);
+        foreach ($obj->vars as $k => $v) {
+            $this->assignVar($k, $v['value']);
+        }
+    }
+
+    function store()
+    {
+        $handler =& xoops_gethandler('block');
+        if($handler->insert($this)) {
+            return $this->getVar('bid');
+         
+        } else {
+            return false;
+        }
+    }
+
+    function delete()
+    {
+        $handler =& xoops_gethandler('block');
+        return $handler->delete($this);
+    }
+    function &getAllBlocksByGroup($groupid, $asobject=true, $side=null, $visible=null, $orderby="b.weight,b.bid", $isactive=1)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getAllBlocksByGroup($groupid, $asobject, $side, $visible, $orderby, $isactive);
+        return $ret;
+    }
+    function &getAllBlocks($rettype="object", $side=null, $visible=null, $orderby="side,weight,bid", $isactive=1)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getAllBlocks($rettype, $side, $visible, $orderby, $isactive);
+        return $ret;
+    }
+    function &getByModule($moduleid, $asobject=true)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getByModule($moduleid, $asobject);
+        return $ret;
+    }
+    function &getAllByGroupModule($groupid, $module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getAllByGroupModule($groupid, $module_id, $toponlyblock, $visible, $orderby, $isactive);
+        return $ret;
+    }
+	function &getBlocks($groupid, $mid=false, $blockFlag=SHOW_BLOCK_ALL, $orderby='b.weight,b.bid')
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getBlocks($groupid, $mid, $blockFlag, $orderby);
+        return $ret;
+    }
+    function &getNonGroupedBlocks($module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->getNonGroupedBlocks($module_id, $toponlyblock, $visible, $orderby, $isactive);
+        return $ret;
+    }
+    function countSimilarBlocks($moduleId, $funcNum, $showFunc = null)
+    {
+        $handler =& xoops_gethandler('block');
+        $ret =& $handler->countSimilarBlocks($moduleId, $funcNum, $showFunc);
+        return $ret;
+    }
 }
 
 
@@ -206,7 +370,7 @@
 	 */
 	function &createByInfo($info)
 	{
-		$block=&$this->create();
+		$block =& $this->create();
 
 		$options=isset($info['options']) ? $info['options'] : null;
 		$edit_func=isset($info['edit_func']) ? $info['edit_func'] : null;
@@ -342,7 +506,7 @@
             return $ret;
         }
         while ($myrow = $this->db->fetchArray($result)) {
-            $block = new XoopsBlock();
+            $block =& $this->create(false);
             $block->assignVars($myrow);
             if (!$id_as_key) {
                 $ret[] =& $block;
@@ -370,7 +534,7 @@
 		}
 
 		while ($row = $this->db->fetchArray($result)) {
-			$block = new XoopsBlock();
+			$block =& $this->create(false);
 			$block->assignVars($row);
 			
 			$ret[] =& $block;
@@ -398,5 +562,339 @@
         }
         return $ret;
     }
+
+    /**
+    * get all the blocks that match the supplied parameters
+    * @param $side   0: sideblock - left
+    *        1: sideblock - right
+    *        2: sideblock - left and right
+    *        3: centerblock - left
+    *        4: centerblock - right
+    *        5: centerblock - center
+    *        6: centerblock - left, right, center
+    * @param $groupid   groupid (can be an array)
+    * @param $visible   0: not visible 1: visible
+    * @param $orderby   order of the blocks
+    * @returns array of block objects
+    */
+    function &getAllBlocksByGroup($groupid, $asobject=true, $side=null, $visible=null, $orderby="b.weight,b.bid", $isactive=1)
+    {
+        $ret = array();
+        if ( !$asobject ) {
+            $sql = "SELECT b.bid ";
+        } else {
+            $sql = "SELECT b.* ";
+        }
+        $sql .= "FROM ".$this->db->prefix("newblocks")." b LEFT JOIN ".$this->db->prefix("group_permission")." l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+        if ( is_array($groupid) ) {
+            $sql .= " AND (l.gperm_groupid=".intval($groupid[0])."";
+            $size = count($groupid);
+            if ( $size  > 1 ) {
+                for ( $i = 1; $i < $size; $i++ ) {
+                    $sql .= " OR l.gperm_groupid=".intval($groupid[$i])."";
+                }
+            }
+            $sql .= ")";
+        } else {
+            $sql .= " AND l.gperm_groupid=".intval($groupid)."";
+        }
+        $sql .= " AND b.isactive=".intval($isactive);
+        if ( isset($side) ) {
+            $side = intval($side);
+            // get both sides in sidebox? (some themes need this)
+            if ( $side == XOOPS_SIDEBLOCK_BOTH ) {
+                $side = "(b.side=0 OR b.side=1)";
+            } elseif ( $side == XOOPS_CENTERBLOCK_ALL ) {
+                $side = "(b.side=3 OR b.side=4 OR b.side=5)";
+            } else {
+                $side = "b.side=".$side;
+            }
+            $sql .= " AND ".$side;
+        }
+        if ( isset($visible) ) {
+            $sql .= " AND b.visible=".intval($visible);
+        }
+        $sql .= " ORDER BY ".addslashes($orderby);
+        $result = $this->db->query($sql);
+        $added = array();
+        while ( $myrow = $this->db->fetchArray($result) ) {
+            if ( !in_array($myrow['bid'], $added) ) {
+                if (!$asobject) {
+                    $ret[] = $myrow['bid'];
+                } else {
+                    $block =& $this->create(false);
+                    $block->assignVars($myrow);
+                    $ret[] =& $block;
+                }
+                array_push($added, $myrow['bid']);
+            }
+        }
+        return $ret;
+    }
+    function &getAllBlocks($rettype="object", $side=null, $visible=null, $orderby="side,weight,bid", $isactive=1)
+    {
+        $ret = array();
+        $where_query = " WHERE isactive=".intval($isactive);
+        if ( isset($side) ) {
+            $side = intval($side);
+            // get both sides in sidebox? (some themes need this)
+            if ( $side == 2 ) {
+                $side = "(side=0 OR side=1)";
+            } elseif ( $side == 6 ) {
+                $side = "(side=3 OR side=4 OR side=5)";
+            } else {
+                $side = "side=".$side;
+            }
+            $where_query .= " AND ".$side;
+        }
+        if ( isset($visible) ) {
+            $visible = intval($visible);
+            $where_query .= " AND visible=$visible";
+        }
+        $where_query .= " ORDER BY ".addslashes($orderby);
+        switch ($rettype) {
+        case "object":
+            $sql = "SELECT * FROM ".$this->db->prefix("newblocks")."".$where_query;
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $ret[] =& $block;
+            }
+            break;
+        case "list":
+            $sql = "SELECT * FROM ".$this->db->prefix("newblocks")."".$where_query;
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $name = ($block->getVar("block_type") != "C") ? $block->getVar("name") : $block->getVar("title");
+                $ret[$block->getVar("bid")] = $name;
+                unset($block);
+            }
+            break;
+        case "id":
+            $sql = "SELECT bid FROM ".$this->db->prefix("newblocks")."".$where_query;
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $ret[] = $myrow['bid'];
+            }
+            break;
+        }
+        //echo $sql;
+        return $ret;
+    }
+
+    function &getByModule($moduleid, $asobject=true)
+    {
+        $moduleid = intval($moduleid);
+        if ( $asobject == true ) {
+            $sql = $sql = "SELECT * FROM ".$this->db->prefix("newblocks")." WHERE mid=".$moduleid."";
+        } else {
+            $sql = "SELECT bid FROM ".$this->db->prefix("newblocks")." WHERE mid=".$moduleid."";
+        }
+        $result = $this->db->query($sql);
+        $ret = array();
+        while( $myrow = $this->db->fetchArray($result) ) {
+            if ( $asobject ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $ret[] =& $block;
+            } else {
+                $ret[] = $myrow['bid'];
+            }
+        }
+        return $ret;
+    }
+
+    function &getAllByGroupModule($groupid, $module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
+    {
+        $ret = array();
+        $sql = "SELECT DISTINCT gperm_itemid FROM ".$this->db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+        if ( is_array($groupid) ) {
+            $sql .= ' AND gperm_groupid IN ('.addslashes(implode(',', $groupid)).')';
+        } else {
+            if (intval($groupid) > 0) {
+                $sql .= ' AND gperm_groupid='.intval($groupid);
+            }
+        }
+        $result = $this->db->query($sql);
+        $blockids = array();
+        while ( $myrow = $this->db->fetchArray($result) ) {
+            $blockids[] = $myrow['gperm_itemid'];
+        }
+        if (!empty($blockids)) {
+            $sql = 'SELECT b.* FROM '.$this->db->prefix('newblocks').' b, '.$this->db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+            $sql .= ' AND b.isactive='.$isactive;
+            if (isset($visible)) {
+                $sql .= ' AND b.visible='.intval($visible);
+            }
+            if ($module_id !== false) {
+                $sql .= ' AND m.module_id IN (0,'.intval($module_id);
+                if ($toponlyblock) {
+                    $sql .= ',-1';
+                }
+                $sql .= ')';
+            } else {
+                if ($toponlyblock) {
+                    $sql .= ' AND m.module_id IN (0,-1)';
+                } else {
+                    $sql .= ' AND m.module_id=0';
+                }
+            }
+            $sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
+            $sql .= ' ORDER BY '.$orderby;
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $ret[$myrow['bid']] =& $block;
+                unset($block);
+            }
+        }
+        return $ret;
+    }
+
+	/**
+	 * Return block instance array by $groupid, $mid and $blockFlag.
+	 * This function is new function of Cube and used from controller.
+	 * @author minahito
+	 */
+	function &getBlocks($groupid, $mid=false, $blockFlag=SHOW_BLOCK_ALL, $orderby='b.weight,b.bid')
+    {
+        $root =& XCube_Root::getSingleton();
+        $this->db =& $root->mController->getDB();
+
+        $ret = array();
+        $sql = "SELECT DISTINCT gperm_itemid FROM ".$this->db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+        if ( is_array($groupid) ) {
+            $sql .= ' AND gperm_groupid IN ('.addslashes(implode(',', $groupid)).')';
+        } else {
+            if (intval($groupid) > 0) {
+                $sql .= ' AND gperm_groupid='.intval($groupid);
+            }
+        }
+        $result = $this->db->query($sql);
+        $blockids = array();
+        while ( $myrow = $this->db->fetchArray($result) ) {
+            $blockids[] = $myrow['gperm_itemid'];
+        }
+        if (!empty($blockids)) {
+            $sql = 'SELECT b.* FROM '.$this->db->prefix('newblocks').' b, '.$this->db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+            $sql .= ' AND b.isactive=1 AND b.visible=1 ';
+            if ($mid !== false && $mid !== 0) {
+                $sql .= ' AND m.module_id IN (0,'.intval($mid).')';
+            } else {
+                $sql .= ' AND m.module_id=0';
+            }
+
+            //
+            // SIDE
+            //
+            if ($blockFlag != SHOW_BLOCK_ALL) {
+				$arr = array();
+				if ($blockFlag & SHOW_SIDEBLOCK_LEFT) {
+					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_SIDEBLOCK_LEFT];
+				}
+				if ($blockFlag & SHOW_SIDEBLOCK_RIGHT) {
+					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_SIDEBLOCK_RIGHT];
+				}
+				if ($blockFlag & SHOW_CENTERBLOCK_LEFT) {
+					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_LEFT];
+				}
+				if ($blockFlag & SHOW_CENTERBLOCK_CENTER) {
+					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_CENTER];
+				}
+				if ($blockFlag & SHOW_CENTERBLOCK_RIGHT) {
+					$arr[] = "b.side=" . $this->mBlockFlagMapping[SHOW_CENTERBLOCK_RIGHT];
+				}
+				
+				$sql .= " AND (" . implode(" OR ", $arr) . ")";
+			}
+
+			$sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
+            $sql .= ' ORDER BY '.addslashes($orderby);
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $ret[$myrow['bid']] =& $block;
+                unset($block);
+            }
+        }
+        return $ret;
+    }
+
+    function &getNonGroupedBlocks($module_id=0, $toponlyblock=false, $visible=null, $orderby='b.weight,b.bid', $isactive=1)
+    {
+        $ret = array();
+        $bids = array();
+        $sql = "SELECT DISTINCT(bid) from ".$this->db->prefix('newblocks');
+        if ($result = $this->db->query($sql)) {
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $bids[] = $myrow['bid'];
+            }
+        }
+        $sql = "SELECT DISTINCT(p.gperm_itemid) from ".$this->db->prefix('group_permission')." p, ".$this->db->prefix('groups')." g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
+        $grouped = array();
+        if ($result = $this->db->query($sql)) {
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $grouped[] = $myrow['gperm_itemid'];
+            }
+        }
+        $non_grouped = array_diff($bids, $grouped);
+        if (!empty($non_grouped)) {
+            $sql = 'SELECT b.* FROM '.$this->db->prefix('newblocks').' b, '.$this->db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+            $sql .= ' AND b.isactive='.intval($isactive);
+            if (isset($visible)) {
+                $sql .= ' AND b.visible='.intval($visible);
+            }
+            $module_id = intval($module_id);
+            if (!empty($module_id)) {
+                $sql .= ' AND m.module_id IN (0,'.$module_id;
+                if ($toponlyblock) {
+                    $sql .= ',-1';
+                }
+                $sql .= ')';
+            } else {
+                if ($toponlyblock) {
+                    $sql .= ' AND m.module_id IN (0,-1)';
+                } else {
+                    $sql .= ' AND m.module_id=0';
+                }
+            }
+            $sql .= ' AND b.bid IN ('.implode(',', $non_grouped).')';
+            $sql .= ' ORDER BY '.addslashes($orderby);
+            $result = $this->db->query($sql);
+            while ( $myrow = $this->db->fetchArray($result) ) {
+                $block =& $this->create(false);
+                $block->assignVars($myrow);
+                $ret[$myrow['bid']] =& $block;
+                unset($block);
+            }
+        }
+        return $ret;
+    }
+
+    function countSimilarBlocks($moduleId, $funcNum, $showFunc = null)
+    {
+        $funcNum = intval($funcNum);
+        $moduleId = intval($moduleId);
+        if ($funcNum < 1 || $moduleId < 1) {
+            // invalid query
+            return 0;
+        }
+        if (isset($showFunc)) {
+            // showFunc is set for more strict comparison
+            $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d AND show_func = %s", $this->db->prefix('newblocks'), $moduleId, $funcNum, $this->db->quoteString(trim($showFunc)));
+        } else {
+            $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d", $this->db->prefix('newblocks'), $moduleId, $funcNum);
+        }
+        if (!$result = $this->db->query($sql)) {
+            return 0;
+        }
+        list($count) = $this->db->fetchRow($result);
+        return $count;
+    }
 }
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:42:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:42:17 +0900
Subject: [xoops-cvslog 2747] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060411084217.CEA382AC0CC@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.28 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.29
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.28	Wed Mar 29 23:12:28 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Tue Apr 11 17:42:17 2006
@@ -754,8 +754,6 @@
 	
 	function setupBlock(&$controller)
 	{
-		require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
-
 		$showFlag =0;
 		$mid=0;
 
@@ -770,14 +768,13 @@
 			$mid = -1;
 		}
 
+        $blockHandler =& xoops_gethandler('block');
 		$showCenterFlag = (SHOW_CENTERBLOCK_LEFT | SHOW_CENTERBLOCK_CENTER | SHOW_CENTERBLOCK_RIGHT);
 		$showRightFlag = SHOW_SIDEBLOCK_RIGHT;
 		$showFlag = SHOW_SIDEBLOCK_LEFT | $showRightFlag | $showCenterFlag;
 		$groups = is_object($controller->mXoopsUser) ? $controller->mXoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
 
-		$xoopsblock = new XoopsBlock();
-		$blockObjects=&$xoopsblock->getBlocks($groups, $mid, $showFlag);
-		
+		$blockObjects=&$blockHandler->getBlocks($groups, $mid, $showFlag);
 		foreach($blockObjects as $blockObject) {
 			$controller->mBlockChain[]=new XCube_LegacyAdaptBlockProcedure($blockObject);
 			unset($blockObject);
@@ -851,5 +848,4 @@
 	}
 }
 
-
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 17:42:17 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 17:42:17 +0900
Subject: [xoops-cvslog 2748] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060411084217.F388F2AC0CF@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.3 xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.4
--- xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php:1.1.2.3	Tue Mar 28 22:31:14 2006
+++ xoops2jp/html/modules/user/admin/actions/GroupPropertyAction.class.php	Tue Apr 11 17:42:17 2006
@@ -85,9 +85,7 @@
 		//
 		// Get block list
 		//
-		require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
-
-		$blockHandler = new XoopsBlock();
+		$blockHandler = xoops_gethandler('block');
 		
 		$idx = 0;
 		foreach (array(0, 1, 3, 4, 5) as $side) {

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:14:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:14:59 +0900
Subject: [xoops-cvslog 2749] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060411091459.184B22AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.12 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.13
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.12	Tue Apr 11 14:29:23 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Tue Apr 11 18:14:58 2006
@@ -63,8 +63,12 @@
 				$sql .= " WHERE ".$where;
 			}
 			
+			$sorts = array();
+			foreach ($criteria->getSorts() as $sort) {
+				$sorts[] = $sort['sort'] . ' ' . $sort['order'];
+			}
 			if ($criteria->getSort() != '') {
-				$sql .= " ORDER BY " . $criteria->getSort() . ' ' . $criteria->getOrder();
+				$sql .= " ORDER BY " . implode(',', $sorts);
 			}
 			
 			$limit=$criteria->getLimit();
@@ -270,11 +274,23 @@
 				// Render
 				//
 				$name = $criteria->getName();
-				$value = null;
+				$value = $criteria->getValue();
 				switch ($obj->mVars[$name]['data_type']) {
+					case XOBJ_DTYPE_BOOL:
+						$value = $value ? "1" : "0";
+						break;
+					
+					case XOBJ_DTYPE_INT:
+						$value = intval($value);
+						break;
+					
+					case XOBJ_DTYPE_FLOAT:
+						$value = floatval($value);
+						break;
+					
 					case XOBJ_DTYPE_STRING:
 					case XOBJ_DTYPE_TEXT:
-						$value = $this->db->quoteString($criteria->getValue());
+						$value = $this->db->quoteString($value);
 						break;
 						
 					default:

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:15:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:15:46 +0900
Subject: [xoops-cvslog 2750] CVS update: xoops2jp/html/modules/user/admin
Message-ID: <20060411091546.56F562AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/menu.php
diff -u xoops2jp/html/modules/user/admin/menu.php:1.1.2.6 xoops2jp/html/modules/user/admin/menu.php:1.1.2.7
--- xoops2jp/html/modules/user/admin/menu.php:1.1.2.6	Sat Feb  4 16:26:18 2006
+++ xoops2jp/html/modules/user/admin/menu.php	Tue Apr 11 18:15:46 2006
@@ -9,30 +9,34 @@
 $adminmenu[2]['keywords'] = _MI_USER_KEYWORD_USER_LIST;
 $adminmenu[2]['link'] = "admin/index.php";
 
-$adminmenu[3]['title'] = _MI_USER_MENU_CREATE_RANK;
-$adminmenu[3]['link'] = "admin/index.php?action=RanksEdit";
-$adminmenu[3]['keywords'] = _MI_USER_KEYWORD_CREATE_RANK;
-$adminmenu[3]['show'] = false;
+$adminmenu[3]['title'] = _MI_USER_ADMENU_USER_SEARCH;
+$adminmenu[3]['keywords'] = _MI_USER_KEYWORD_USER_SEARCH;
+$adminmenu[3]['link'] = "admin/index.php?action=UserSearch";
+
+$adminmenu[4]['title'] = _MI_USER_MENU_CREATE_RANK;
+$adminmenu[4]['link'] = "admin/index.php?action=RanksEdit";
+$adminmenu[4]['keywords'] = _MI_USER_KEYWORD_CREATE_RANK;
+$adminmenu[4]['show'] = false;
 
-$adminmenu[4]['title'] = _MI_USER_ADMENU_RANK_LIST;
-$adminmenu[4]['link'] = "admin/index.php?action=RanksList";
-
-$adminmenu[5]['title'] = _MI_USER_MENU_CREATE_GROUP;
+$adminmenu[5]['title'] = _MI_USER_ADMENU_RANK_LIST;
 $adminmenu[5]['link'] = "admin/index.php?action=RanksList";
-$adminmenu[5]['keywords'] = _MI_USER_KEYWORD_CREATE_GROUP;
-$adminmenu[5]['show'] = false;
 
-$adminmenu[6]['title'] = _MI_USER_ADMENU_GROUP_LIST;
-$adminmenu[6]['keywords'] = _MI_USER_KEYWORD_GROUP_LIST;
-$adminmenu[6]['link'] = "admin/index.php?action=GroupList";
-
-$adminmenu[7]['title'] = _MI_USER_MENU_CREATE_AVATAR;
-$adminmenu[7]['link'] = "admin/index.php?action=AvatarEdit";
-$adminmenu[7]['keywords'] = _MI_USER_KEYWORD_CREATE_AVATAR;
-$adminmenu[7]['show'] = false;
-
-$adminmenu[8]['title'] = _MI_USER_ADMENU_AVATAR_MANAGE;
-$adminmenu[8]['keywords'] = _MI_USER_KEYWORD_AVATAR_MANAGE;
-$adminmenu[8]['link'] = "admin/index.php?action=AvatarList";
+$adminmenu[6]['title'] = _MI_USER_MENU_CREATE_GROUP;
+$adminmenu[6]['link'] = "admin/index.php?action=RanksList";
+$adminmenu[6]['keywords'] = _MI_USER_KEYWORD_CREATE_GROUP;
+$adminmenu[6]['show'] = false;
+
+$adminmenu[7]['title'] = _MI_USER_ADMENU_GROUP_LIST;
+$adminmenu[7]['keywords'] = _MI_USER_KEYWORD_GROUP_LIST;
+$adminmenu[7]['link'] = "admin/index.php?action=GroupList";
+
+$adminmenu[8]['title'] = _MI_USER_MENU_CREATE_AVATAR;
+$adminmenu[8]['link'] = "admin/index.php?action=AvatarEdit";
+$adminmenu[8]['keywords'] = _MI_USER_KEYWORD_CREATE_AVATAR;
+$adminmenu[8]['show'] = false;
+
+$adminmenu[9]['title'] = _MI_USER_ADMENU_AVATAR_MANAGE;
+$adminmenu[9]['keywords'] = _MI_USER_KEYWORD_AVATAR_MANAGE;
+$adminmenu[9]['link'] = "admin/index.php?action=AvatarList";
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:16:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:16:07 +0900
Subject: [xoops-cvslog 2751] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060411091607.61A322AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/user_search.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/user_search.xml:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:07 2006
+++ xoops2jp/html/modules/user/admin/.xml/user_search.xml	Tue Apr 11 18:16:07 2006
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="UserSearchForm" type="XCube_ActionForm">
+    <form-property name="uname" type="String" />
+    <form-property name="name" type="String" />
+    <form-property name="email" type="String" />
+    <form-property name="user_icq" type="String" />
+    <form-property name="user_aim" type="String" />
+    <form-property name="user_yim" type="String" />
+    <form-property name="user_msnm" type="String" />
+    <form-property name="url" type="String" />
+    <form-property name="user_from" type="String" />
+    <form-property name="user_occ" type="String" />
+    <form-property name="user_intrest" type="String" />
+
+    <form-property name="lastlog_more" type="Int" />
+    <form-property name="lastlog_less" type="Int" />
+    
+    <form-property name="regdate_more" type="Int" />
+    <form-property name="regdate_less" type="Int" />
+
+    <form-property name="over_posts" type="Int" />
+    <form-property name="under_posts" type="Int" />
+
+    <form-property name="mail_condition" type="Int" />
+    <form-property name="user_level" type="Int" />
+	</form-bean>
+	<form-validation>
+    <field property="uname" depends="maxlength">
+      <arg0 key="const._AD_USER_LANG_UNAME" />
+      <arg1 name="maxlength" key="${var:maxlength}" />
+      <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+      <var name="maxlength" value="25" />
+    </field>
+    <field property="name" depends="maxlength">
+			<arg0 key="const._AD_USER_LANG_NAME" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="60" />
+		</field>
+		<field property="email" depends="maxlength">
+			<arg0 key="const._AD_USER_LANG_EMAIL" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="60" />
+		</field>
+    <field property="user_icq" depends="maxlength">
+      <arg0 key="const._AD_USER_LANG_USER_ICQ" />
+      <arg1 name="maxlength" key="${var:maxlength}" />
+      <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+      <var name="maxlength" value="15" />
+    </field>
+    <field property="user_aim" depends="maxlength">
+      <arg0 key="const._AD_USER_LANG_USER_AIM" />
+      <arg1 name="maxlength" key="${var:maxlength}" />
+      <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+      <var name="maxlength" value="18" />
+    </field>
+    <field property="user_yim" depends="maxlength">
+      <arg0 key="const._AD_USER_LANG_USER_YIM" />
+      <arg1 name="maxlength" key="${var:maxlength}" />
+      <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+      <var name="maxlength" value="25" />
+    </field>
+    <field property="user_msnm" depends="maxlength">
+      <arg0 key="const._AD_USER_LANG_USER_MSNM" />
+      <arg1 name="maxlength" key="${var:maxlength}" />
+      <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+      <var name="maxlength" value="100" />
+    </field>
+ 		<field property="url" depends="maxlength">
+		  <arg0 key="const._AD_USER_LANG_URL" />
+		  <arg1 name="maxlength" key="${var:maxlength}" />
+		  <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+		  <var name="maxlength" value="100" />
+	  </field>
+	  <field property="user_from" depends="maxlength">
+		  <arg0 key="const._AD_USER_LANG_USER_FROM" />
+		  <arg1 name="maxlength" key="${var:maxlength}" />
+		  <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+		  <var name="maxlength" value="100" />
+	  </field>
+	  <field property="user_occ" depends="maxlength">
+		  <arg0 key="const._AD_USER_LANG_USER_OCC" />
+		  <arg1 name="maxlength" key="${var:maxlength}" />
+		  <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+		  <var name="maxlength" value="100" />
+	  </field>
+	  <field property="user_intrest" depends="maxlength">
+		  <arg0 key="const._AD_USER_LANG_USER_INTREST" />
+		  <arg1 name="maxlength" key="${var:maxlength}" />
+		  <msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+		  <var name="maxlength" value="150" />
+	  </field>
+    <field property="lastlog_more" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_LASTLOG_MORE" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="lastlog_less" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_LASTLOG_LESS" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="regdate_more" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_REGDATE_MORE" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="regdate_less" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_REGDATE_LESS" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="over_posts" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_OVER_POSTS" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="under_posts" depends="intRange">
+      <arg0 key="const._AD_USER_LANG_UNDER_POSTS" />
+      <arg1 name="intRange" key="${var:min}" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="0" />
+      <var name="max" value="65535" />
+    </field>
+    <field property="mail_condition" depends="required,intRange">
+      <arg0 key="const._AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION" />
+      <msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="1" />
+      <var name="max" value="3" />
+    </field>
+    <field property="user_level" depends="required,intRange">
+      <arg0 key="const._AD_USER_LANG_DISPLAY_USER_LEVEL" />
+      <msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+      <msg name="intRange" key="const._AD_USER_ERROR_INTRANGE" />
+      <var name="min" value="1" />
+      <var name="max" value="3" />
+    </field>
+  </form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:16:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:16:26 +0900
Subject: [xoops-cvslog 2752] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060411091626.4AA992AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:26 2006
+++ xoops2jp/html/modules/user/admin/actions/UserSearchListAction.class.php	Tue Apr 11 18:16:26 2006
@@ -0,0 +1,41 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+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/UserSearchFilterForm.class.php";
+
+class User_UserSearchListAction extends User_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_gethandler('user');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new User_UserSearchFilterForm($navi);
+		return $filter;
+	}
+	
+	function _getBaseUrl()
+	{
+		return "./index.php?action=UsersSearchList";
+	}
+	
+	function execute(&$controller, &$xoopsUser)
+	{
+		return $this->getDefaultView($controller, $xoopsUser);
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("user_search_list.html");
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:26 2006
+++ xoops2jp/html/modules/user/admin/actions/UserSearchAction.class.php	Tue Apr 11 18:16:26 2006
@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserSearchForm.class.php";
+
+class User_UserSearchAction extends User_Action
+{
+	var $mActionForm = null;
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm =& new User_UserSearchForm();
+		$this->mActionForm->prepare();
+	}
+	
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mActionForm->fetch();
+		
+		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  Tue Apr 11 18:16:37 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:16:37 +0900
Subject: [xoops-cvslog 2753] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060411091637.AB11E2AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:37 2006
+++ xoops2jp/html/modules/user/admin/forms/UserSearchForm.class.php	Tue Apr 11 18:16:37 2006
@@ -0,0 +1,146 @@
+<?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 User_UserSearchForm extends XCube_ActionForm
+{
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['uname'] =& new XCube_StringProperty('uname');
+		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
+		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
+		$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['url'] =& new XCube_StringProperty('url');
+		$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['lastlog_more'] =& new XCube_IntProperty('lastlog_more');
+		$this->mFormProperties['lastlog_less'] =& new XCube_IntProperty('lastlog_less');
+		$this->mFormProperties['regdate_more'] =& new XCube_IntProperty('regdate_more');
+		$this->mFormProperties['regdate_less'] =& new XCube_IntProperty('regdate_less');
+		$this->mFormProperties['over_posts'] =& new XCube_IntProperty('over_posts');
+		$this->mFormProperties['under_posts'] =& new XCube_IntProperty('under_posts');
+		$this->mFormProperties['mail_condition'] =& new XCube_IntProperty('mail_condition');
+		$this->mFormProperties['user_level'] =& new XCube_IntProperty('user_level');
+	
+		//
+		// 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');
+		$this->mFieldProperties['uname']->addVar('maxlength', '25');
+	
+		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['name']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_NAME, '60');
+		$this->mFieldProperties['name']->addVar('maxlength', '60');
+	
+		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['email']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_EMAIL, '60');
+		$this->mFieldProperties['email']->addVar('maxlength', '60');
+	
+		$this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['user_icq']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_ICQ, '15');
+		$this->mFieldProperties['user_icq']->addVar('maxlength', '15');
+	
+		$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');
+		$this->mFieldProperties['user_aim']->addVar('maxlength', '18');
+	
+		$this->mFieldProperties['user_yim'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_yim']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['user_yim']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_YIM, '25');
+		$this->mFieldProperties['user_yim']->addVar('maxlength', '25');
+	
+		$this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['user_msnm']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_USER_MSNM, '100');
+		$this->mFieldProperties['user_msnm']->addVar('maxlength', '100');
+	
+		$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['url']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_URL, '100');
+		$this->mFieldProperties['url']->addVar('maxlength', '100');
+	
+		$this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_from']->setDependsByArray(array('maxlength'));
+		$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_occ'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength'));
+		$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['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['lastlog_more'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['lastlog_more']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['lastlog_more']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_LASTLOG_MORE, '0');
+		$this->mFieldProperties['lastlog_more']->addVar('min', '0');
+		$this->mFieldProperties['lastlog_more']->addVar('max', '65535');
+	
+		$this->mFieldProperties['lastlog_less'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['lastlog_less']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['lastlog_less']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_LASTLOG_LESS, '0');
+		$this->mFieldProperties['lastlog_less']->addVar('min', '0');
+		$this->mFieldProperties['lastlog_less']->addVar('max', '65535');
+	
+		$this->mFieldProperties['regdate_more'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['regdate_more']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['regdate_more']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_REGDATE_MORE, '0');
+		$this->mFieldProperties['regdate_more']->addVar('min', '0');
+		$this->mFieldProperties['regdate_more']->addVar('max', '65535');
+	
+		$this->mFieldProperties['regdate_less'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['regdate_less']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['regdate_less']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_REGDATE_LESS, '0');
+		$this->mFieldProperties['regdate_less']->addVar('min', '0');
+		$this->mFieldProperties['regdate_less']->addVar('max', '65535');
+	
+		$this->mFieldProperties['over_posts'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['over_posts']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['over_posts']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_OVER_POSTS, '0');
+		$this->mFieldProperties['over_posts']->addVar('min', '0');
+		$this->mFieldProperties['over_posts']->addVar('max', '65535');
+	
+		$this->mFieldProperties['under_posts'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['under_posts']->setDependsByArray(array('intRange'));
+		$this->mFieldProperties['under_posts']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_UNDER_POSTS, '0');
+		$this->mFieldProperties['under_posts']->addVar('min', '0');
+		$this->mFieldProperties['under_posts']->addVar('max', '65535');
+	
+		$this->mFieldProperties['mail_condition'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['mail_condition']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['mail_condition']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION);
+		$this->mFieldProperties['mail_condition']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION);
+		$this->mFieldProperties['mail_condition']->addVar('min', '1');
+		$this->mFieldProperties['mail_condition']->addVar('max', '3');
+	
+		$this->mFieldProperties['user_level'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['user_level']->setDependsByArray(array('required','intRange'));
+		$this->mFieldProperties['user_level']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_DISPLAY_USER_LEVEL);
+		$this->mFieldProperties['user_level']->addMessage('intRange', _AD_USER_ERROR_INTRANGE, _AD_USER_LANG_DISPLAY_USER_LEVEL);
+		$this->mFieldProperties['user_level']->addVar('min', '1');
+		$this->mFieldProperties['user_level']->addVar('max', '3');
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:37 2006
+++ xoops2jp/html/modules/user/admin/forms/UserSearchFilterForm.class.php	Tue Apr 11 18:16:37 2006
@@ -0,0 +1,167 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserSearchForm.class.php";
+
+define('USER_SORT_KEY_UID', 1);
+define('USER_SORT_KEY_NAME', 2);
+define('USER_SORT_KEY_UNAME', 3);
+define('USER_SORT_KEY_EMAIL', 4);
+define('USER_SORT_KEY_URL', 5);
+define('USER_SORT_KEY_USER_AVATAR', 6);
+define('USER_SORT_KEY_USER_REGDATE', 7);
+define('USER_SORT_KEY_USER_ICQ', 8);
+define('USER_SORT_KEY_USER_FROM', 9);
+define('USER_SORT_KEY_USER_SIG', 10);
+define('USER_SORT_KEY_USER_VIEWEMAIL', 11);
+define('USER_SORT_KEY_ACTKEY', 12);
+define('USER_SORT_KEY_USER_AIM', 13);
+define('USER_SORT_KEY_USER_YIM', 14);
+define('USER_SORT_KEY_USER_MSNM', 15);
+define('USER_SORT_KEY_PASS', 16);
+define('USER_SORT_KEY_POSTS', 17);
+define('USER_SORT_KEY_ATTACHSIG', 18);
+define('USER_SORT_KEY_RANK', 19);
+define('USER_SORT_KEY_LEVEL', 20);
+define('USER_SORT_KEY_THEME', 21);
+define('USER_SORT_KEY_TIMEZONE_OFFSET', 22);
+define('USER_SORT_KEY_LAST_LOGIN', 23);
+define('USER_SORT_KEY_UMODE', 24);
+define('USER_SORT_KEY_UORDER', 25);
+define('USER_SORT_KEY_NOTIFY_METHOD', 26);
+define('USER_SORT_KEY_NOTIFY_MODE', 27);
+define('USER_SORT_KEY_USER_OCC', 28);
+define('USER_SORT_KEY_BIO', 29);
+define('USER_SORT_KEY_USER_INTREST', 30);
+define('USER_SORT_KEY_USER_MAILOK', 31);
+define('USER_SORT_KEY_MAXVALUE', 31);
+
+define('USER_SORT_KEY_DEFAULT', USER_SORT_KEY_UID);
+
+class User_UserSearchFilterForm extends User_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $_mSortKeys = array(
+		USER_SORT_KEY_UID => 'uid',
+		USER_SORT_KEY_NAME => 'name',
+		USER_SORT_KEY_UNAME => 'uname',
+		USER_SORT_KEY_EMAIL => 'email',
+		USER_SORT_KEY_URL => 'url',
+		USER_SORT_KEY_USER_AVATAR => 'user_avatar',
+		USER_SORT_KEY_USER_REGDATE => 'user_regdate',
+		USER_SORT_KEY_USER_ICQ => 'user_icq',
+		USER_SORT_KEY_USER_FROM => 'user_from',
+		USER_SORT_KEY_USER_SIG => 'user_sig',
+		USER_SORT_KEY_USER_VIEWEMAIL => 'user_viewemail',
+		USER_SORT_KEY_ACTKEY => 'actkey',
+		USER_SORT_KEY_USER_AIM => 'user_aim',
+		USER_SORT_KEY_USER_YIM => 'user_yim',
+		USER_SORT_KEY_USER_MSNM => 'user_msnm',
+		USER_SORT_KEY_PASS => 'pass',
+		USER_SORT_KEY_POSTS => 'posts',
+		USER_SORT_KEY_ATTACHSIG => 'attachsig',
+		USER_SORT_KEY_RANK => 'rank',
+		USER_SORT_KEY_LEVEL => 'level',
+		USER_SORT_KEY_THEME => 'theme',
+		USER_SORT_KEY_TIMEZONE_OFFSET => 'timezone_offset',
+		USER_SORT_KEY_LAST_LOGIN => 'last_login',
+		USER_SORT_KEY_UMODE => 'umode',
+		USER_SORT_KEY_UORDER => 'uorder',
+		USER_SORT_KEY_NOTIFY_METHOD => 'notify_method',
+		USER_SORT_KEY_NOTIFY_MODE => 'notify_mode',
+		USER_SORT_KEY_USER_OCC => 'user_occ',
+		USER_SORT_KEY_BIO => 'bio',
+		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");
+	
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
+	
+		if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
+			$this->mSort = USER_SORT_KEY_DEFAULT;
+		}
+
+		$form =& new User_UserSearchForm();
+		$form->prepare();
+
+		$form->fetch();
+		$form->validate();
+		
+		if ($form->hasError()) {
+			return;
+		}
+		
+		foreach ($this->_mMatchFields as $field) {
+			if (strlen($form->get($field)) > 0) {
+				$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'));
+		switch ($form->get('mail_condition')) {
+			case 1:
+				$this->_mCriteria->add(new Criteria('user_mailok', 1));
+				break;
+				
+			case 2:
+				$this->_mCriteria->add(new Criteria('user_mailok', 0));
+				break;
+		}
+
+		$this->mNavi->addExtra('user_level', $form->get('user_level'));
+		switch ($form->get('user_level')) {
+			case 1:
+				$this->_mCriteria->add(new Criteria('level', 0, '>'));
+				break;
+				
+			case 2:
+				$this->_mCriteria->add(new Criteria('level', 0));
+				break;
+		}
+		
+		if (strlen($form->get('over_posts')) > 0) {
+			$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->_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'));
+			$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'));
+			$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'));
+			$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'));
+			$time = time() - $form->get('regdate_less') * 86400;
+			$this->_mCriteria->add(new Criteria('user_regdate', $time, '>='));
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:16:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:16:47 +0900
Subject: [xoops-cvslog 2754] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060411091647.10E342AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_search.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:46 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search.html	Tue Apr 11 18:16:46 2006
@@ -0,0 +1,142 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=UserList"><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></a>
+</div>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+
+<form action="./index.php?action=UserSearchList" method="post">
+  <{xoops_token form=$actionForm}>
+  <table class="outer">
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_UNAME}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=uname value=$actionForm->get('uname') size=25 maxlength=25}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_NAME}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=name value=$actionForm->get('name') size=30 maxlength=60}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_EMAIL}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=email value=$actionForm->get('email') size=30 maxlength=60}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_ICQ}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_icq value=$actionForm->get('user_icq') size=15 maxlength=15}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_AIM}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_aim value=$actionForm->get('user_aim') size=18 maxlength=18}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_YIM}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_yim value=$actionForm->get('user_yim') size=25 maxlength=25}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_MSNM}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_msnm value=$actionForm->get('user_msnm') size=25 maxlength=100}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_URL}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=url value=$actionForm->get('url') size=50 maxlength=100}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_FROM}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_from value=$actionForm->get('user_from') size=50 maxlength=100}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_OCC}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_occ value=$actionForm->get('user_occ') size=50 maxlength=100}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_USER_INTREST}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=user_intrest value=$actionForm->get('user_intrest') size=50 maxlength=150}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_LASTLOG_MORE}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=lastlog_more value=$actionForm->get('lastlog_more') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_LASTLOG_LESS}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=lastlog_less value=$actionForm->get('lastlog_less') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_REGDATE_MORE}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=regdate_more value=$actionForm->get('regdate_more') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_REGDATE_LESS}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=regdate_less value=$actionForm->get('regdate_less') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_OVER_POSTS}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=over_posts value=$actionForm->get('over_posts') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_UNDER_POSTS}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=under_posts value=$actionForm->get('under_posts') size=4 maxlength=5}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=radio name=mail_condition value=1}><{$smarty.const._AD_USER_LANG_MAIL_OK_USERS_ONLY}>
+        <{xoops_input type=radio name=mail_condition value=2}><{$smarty.const._AD_USER_LANG_MAIL_NG_USERS_ONLY}>
+        <{xoops_input type=radio name=mail_condition value=3 default=3}><{$smarty.const._AD_USER_LANG_ALL_OF_USERS}>
+      </td>
+    </tr>
+    <tr>
+      <td class="head"><{$smarty.const._AD_USER_LANG_DISPLAY_USER_LEVEL}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=radio name=user_level value=1}><{$smarty.const._AD_USER_LANG_APPROVE_USERS_ONLY}>
+        <{xoops_input type=radio name=user_level value=2}><{$smarty.const._AD_USER_LANG_PENDING_USERS_ONLY}>
+        <{xoops_input type=radio name=user_level value=3 default=3}><{$smarty.const._AD_USER_LANG_ALL_OF_USERS}>
+      </td>
+    </tr>
+    <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>
+</form>
Index: xoops2jp/html/modules/user/admin/templates/user_search_list.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.1
--- /dev/null	Tue Apr 11 18:16:47 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Tue Apr 11 18:16:46 2006
@@ -0,0 +1,56 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=UserList"><{$smarty.const._AD_USER_LANG_USER_LIST}></a>
+</div>
+
+<h3><{$smarty.const._AD_USER_LANG_USER_SEARCH_LIST}></h3>
+
+<div class="toptab">[ <a href="<{$pageNavi->getRenderOtherUrl('./index.php?action=UserSearch')}>"><{$smarty.const._AD_USER_LANG_SEARCH_AGAIN}></a> ]</div>
+
+<table class="outer">
+  <tr>
+    <th>&nbsp;</th>
+    <th><{$smarty.const._AD_USER_LANG_UID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_UNAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_REGDATE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_LASTLOGIN}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_POSTS}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_LEVEL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=user from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="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;">
+        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$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}>" /></a>
+        <{/if}>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+
+<div class="pagenavi"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:17:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:17:07 +0900
Subject: [xoops-cvslog 2755] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060411091707.9A00A2AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/PageNavigator.class.php
diff -u xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.2 xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.3
--- xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.2	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/PageNavigator.class.php	Tue Apr 11 18:17:07 2006
@@ -32,6 +32,45 @@
 	
 		return $ret;
 	}
+	
+	/**
+	 * Render URL with replacing base url. This method is used to user search list.
+	 * 
+	 * @param $url string
+	 * @param $mask mixed
+	 */
+	function getRenderOtherUrl($url, $mask = null)
+	{
+		if ($mask == null) {
+			$mask = array();
+		}
+		if (!is_array($mask)) {
+			$mask = array($mask);
+		}
+		
+		if(count($this->mExtra) > 0) {
+			$tarr=array();
+			
+			foreach($this->mExtra as $key=>$value) {
+				if (is_array($mask) && !isset($mask[$key])) {
+					$tarr[]=$key."=".urlencode($value);
+				}
+			}
+			
+			if (count($tarr)==0) {
+				return $url;
+			}
+			
+			if(strpos($url,"?")!==false) {
+				return $url."&amp;".implode("&amp;",$tarr);
+			}
+			else {
+				return $url."?".implode("&amp;",$tarr);
+			}
+		}
+		
+		return $url;
+	}
 }
 
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:17:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:17:24 +0900
Subject: [xoops-cvslog 2756] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060411091724.077C12AC032@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.12 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.13
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.12	Wed Apr  5 17:40:57 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Tue Apr 11 18:17:23 2006
@@ -7,6 +7,7 @@
 define('_AD_USER_ERROR_INJURY', "The specified value {0} is wrong.");
 define('_AD_USER_ERROR_INJURY_MIN_MAX', "Relationship between minimum value and maximum value is wrong.");
 define('_AD_USER_ERROR_INJURY_SPECIAL', "Value of the special rank is wrong.");
+define('_AD_USER_ERROR_INTRANGE', "intRange");
 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.");
@@ -19,6 +20,9 @@
 define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "Username has been taken.");
 define('_AD_USER_ERROR_WRONG_FORMAT', "Your format is invalid.");
 define('_AD_USER_LANG_ACTIVEUSER', "Active user");
+define('_AD_USER_LANG_ACTKEY', "actkey");
+define('_AD_USER_LANG_ALL_OF_USERS', "All of users");
+define('_AD_USER_LANG_APPROVE_USERS_ONLY', "Approve users only");
 define('_AD_USER_LANG_ATTACHSIG', "Always attach my signature");
 define('_AD_USER_LANG_AVATAR_CREATED', "Created");
 define('_AD_USER_LANG_AVATAR_DELETE', "Delete avatar");
@@ -40,6 +44,8 @@
 define('_AD_USER_LANG_CREATE_NEW', "Create new");
 define('_AD_USER_LANG_CUSTOM_AVATAR', "Custom avatar");
 define('_AD_USER_LANG_DELETE_RANK', "Delete a rank");
+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");
 define('_AD_USER_LANG_EMAIL', "Email address");
 define('_AD_USER_LANG_GROUP', "Group");
@@ -61,9 +67,14 @@
 define('_AD_USER_LANG_GROUP_TYPE', "Type");
 define('_AD_USER_LANG_GROUPID', "Group ID");
 define('_AD_USER_LANG_ID', "ID");
+define('_AD_USER_LANG_LAST_LOGIN', "last login");
+define('_AD_USER_LANG_LASTLOG_LESS', "Lastlog less");
+define('_AD_USER_LANG_LASTLOG_MORE', "Lastlog more");
 define('_AD_USER_LANG_LASTLOGIN', "Last login");
 define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
 define('_AD_USER_LANG_LEVEL', "Level");
+define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Mail NG users only");
+define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Mail OK users only");
 define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?");
 define('_AD_USER_LANG_NAME', "Real name");
 define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
@@ -71,7 +82,9 @@
 define('_AD_USER_LANG_NOTIFY_MODE', "Default Notification Mode");
 define('_AD_USER_LANG_OFF', "Off");
 define('_AD_USER_LANG_ON', "On");
+define('_AD_USER_LANG_OVER_POSTS', "over posts");
 define('_AD_USER_LANG_PASS', "Password");
+define('_AD_USER_LANG_PENDING_USERS_ONLY', "Pending users only");
 define('_AD_USER_LANG_PERM_ACCESS', "Access");
 define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Privilege of access control");
 define('_AD_USER_LANG_PERM_ADMIN', "Administration");
@@ -92,19 +105,25 @@
 define('_AD_USER_LANG_RANK_SPECIAL', "Special rank");
 define('_AD_USER_LANG_RANK_TITLE', "Title");
 define('_AD_USER_LANG_REGDATE', "Registered date");
+define('_AD_USER_LANG_REGDATE_LESS', "Regdate less");
+define('_AD_USER_LANG_REGDATE_MORE', "Regdate more");
 define('_AD_USER_LANG_REGISTDATE', "Registered date");
 define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag");
+define('_AD_USER_LANG_SEARCH_AGAIN', "Search again");
 define('_AD_USER_LANG_SENDER', "Sender");
 define('_AD_USER_LANG_SUBJECT', "Subject");
 define('_AD_USER_LANG_SUBMIT', "Submit");
 define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar");
+define('_AD_USER_LANG_THEME', "theme");
 define('_AD_USER_LANG_TIMEZONE_OFFSET', "TimeZone");
 define('_AD_USER_LANG_UID', "UID");
 define('_AD_USER_LANG_UMODE', "Comments Display Mode");
 define('_AD_USER_LANG_UNAME', "User name");
+define('_AD_USER_LANG_UNDER_POSTS', "under posts");
 define('_AD_USER_LANG_UORDER', "Comments Sort Order");
 define('_AD_USER_LANG_URL', "Website");
 define('_AD_USER_LANG_USER_AIM', "AIM");
+define('_AD_USER_LANG_USER_AVATAR', "user avatar");
 define('_AD_USER_LANG_USER_DELETE', "Delete a user");
 define('_AD_USER_LANG_USER_DELETE_ADVICE', "Delete ");
 define('_AD_USER_LANG_USER_EDIT', "Edit a user");
@@ -116,6 +135,8 @@
 define('_AD_USER_LANG_USER_MSNM', "MSNM");
 define('_AD_USER_LANG_USER_NEW', "Add a new user");
 define('_AD_USER_LANG_USER_OCC', "Occupation");
+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_VIEWEMAIL', "Allow other users to view my email address.");
 define('_AD_USER_LANG_USER_YIM', "YIM");
Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.9 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.10
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.9	Sat Mar 25 23:26:11 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Tue Apr 11 18:17:23 2006
@@ -7,6 +7,15 @@
 define('_MI_USER_ADMENU_NEW_RANK', "Add a New Rank");
 define('_MI_USER_ADMENU_RANK_LIST', "User Rank Manager");
 define('_MI_USER_ADMENU_SEARCH', "Find a User");
+define('_MI_USER_ADMENU_USER_SEARCH', "User search");
+define('_MI_USER_BLOCK_LOGIN_DESC', "Shows login form");
+define('_MI_USER_BLOCK_LOGIN_NAME', "Login");
+define('_MI_USER_BLOCK_NEWUSERS_DESC', "Shows most recent users");
+define('_MI_USER_BLOCK_NEWUSERS_NAME', "New Members");
+define('_MI_USER_BLOCK_ONLINE_DESC', "Displays users/guests currently online");
+define('_MI_USER_BLOCK_ONLINE_NAME', "Who's Online");
+define('_MI_USER_BLOCK_TOPUSERS_DESC', "Top posters");
+define('_MI_USER_BLOCK_TOPUSERS_NAME', "Top Posters");
 define('_MI_USER_CONF_ACTV_ADMIN', "User conf actv admin");
 define('_MI_USER_CONF_ACTV_AUTO', "Activate automatically");
 define('_MI_USER_CONF_ACTV_GROUP', "Select a group to which activation mail will be sent");
@@ -47,6 +56,7 @@
 define('_MI_USER_KEYWORD_CREATE_USER', "Create user");
 define('_MI_USER_KEYWORD_GROUP_LIST', "list edit modify delete user permission add remove member");
 define('_MI_USER_KEYWORD_USER_LIST', "user list");
+define('_MI_USER_KEYWORD_USER_SEARCH', "User search");
 define('_MI_USER_MENU_CREATE_AVATAR', "Create avatar");
 define('_MI_USER_MENU_CREATE_GROUP', "Create group");
 define('_MI_USER_MENU_CREATE_RANK', "user rank create new");
@@ -54,12 +64,4 @@
 define('_MI_USER_NAME', "User module");
 define('_MI_USER_NAME_DESC', "This module manages user account.");
 
-define('_MI_USER_BLOCK_LOGIN_NAME', "Login");
-define('_MI_USER_BLOCK_LOGIN_DESC', "Shows login form");
-define('_MI_USER_BLOCK_ONLINE_NAME', "Who's Online");
-define('_MI_USER_BLOCK_ONLINE_DESC', "Displays users/guests currently online");
-define('_MI_USER_BLOCK_NEWUSERS_NAME', "New Members");
-define('_MI_USER_BLOCK_NEWUSERS_DESC', "Shows most recent users");
-define('_MI_USER_BLOCK_TOPUSERS_NAME', "Top Posters");
-define('_MI_USER_BLOCK_TOPUSERS_DESC', "Top posters");
 ?>

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:17:24 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:17:24 +0900
Subject: [xoops-cvslog 2757] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060411091724.356442AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.12 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.13
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.12	Fri Mar 24 22:04:24 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Tue Apr 11 18:17:24 2006
@@ -7,6 +7,15 @@
 define('_MI_USER_ADMENU_NEW_RANK', "ユーザーランク新規登録");
 define('_MI_USER_ADMENU_RANK_LIST', "ユーザーランク管理");
 define('_MI_USER_ADMENU_SEARCH', "ユーザー検索");
+define('_MI_USER_ADMENU_USER_SEARCH', "ユーザー検索");
+define('_MI_USER_BLOCK_LOGIN_DESC', "ログインフォームを表示します");
+define('_MI_USER_BLOCK_LOGIN_NAME', "ログイン");
+define('_MI_USER_BLOCK_NEWUSERS_DESC', "新しい登録ユーザの一覧を表示します");
+define('_MI_USER_BLOCK_NEWUSERS_NAME', "新しい登録ユーザ");
+define('_MI_USER_BLOCK_ONLINE_DESC', "オンライン状況を表示します");
+define('_MI_USER_BLOCK_ONLINE_NAME', "オンライン状況");
+define('_MI_USER_BLOCK_TOPUSERS_DESC', "投稿数のランキングを表示します");
+define('_MI_USER_BLOCK_TOPUSERS_NAME', "投稿数ランキング");
 define('_MI_USER_CONF_ACTV_ADMIN', "管理者が確認してアカウントを有効にする");
 define('_MI_USER_CONF_ACTV_AUTO', "自動的にアカウントを有効にする");
 define('_MI_USER_CONF_ACTV_GROUP', "アカウント有効化依頼のメールの送信先グループ");
@@ -47,6 +56,7 @@
 define('_MI_USER_KEYWORD_CREATE_USER', "新規登録");
 define('_MI_USER_KEYWORD_GROUP_LIST', "グループ 一覧 リスト 編集 変更  削除 ユーザー ユーザグループ 権限 パーミッション 追加 メンバー");
 define('_MI_USER_KEYWORD_USER_LIST', "一覧 リスト 編集 変更 削除");
+define('_MI_USER_KEYWORD_USER_SEARCH', "User search");
 define('_MI_USER_MENU_CREATE_AVATAR', "アバターの新規作成");
 define('_MI_USER_MENU_CREATE_GROUP', "グループの新規作成");
 define('_MI_USER_MENU_CREATE_RANK', "ランクの新規作成");
@@ -54,12 +64,4 @@
 define('_MI_USER_NAME', "ユーザーモジュール");
 define('_MI_USER_NAME_DESC', "ユーザーアカウントに関する処理を行う基盤モジュール");
 
-define('_MI_USER_BLOCK_LOGIN_NAME', "ログイン");
-define('_MI_USER_BLOCK_LOGIN_DESC', "ログインフォームを表示します");
-define('_MI_USER_BLOCK_ONLINE_NAME', "オンライン状況");
-define('_MI_USER_BLOCK_ONLINE_DESC', "オンライン状況を表示します");
-define('_MI_USER_BLOCK_NEWUSERS_NAME', "新しい登録ユーザ");
-define('_MI_USER_BLOCK_NEWUSERS_DESC', "新しい登録ユーザの一覧を表示します");
-define('_MI_USER_BLOCK_TOPUSERS_NAME', "投稿数ランキング");
-define('_MI_USER_BLOCK_TOPUSERS_DESC', "投稿数のランキングを表示します");
 ?>
Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.21 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.22
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.21	Wed Apr  5 17:40:57 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Tue Apr 11 18:17:24 2006
@@ -7,6 +7,7 @@
 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_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
 define('_AD_USER_ERROR_MIN', "{0}は最低でも{1}以上の値を入力して下さい");
 define('_AD_USER_ERROR_NO_UPLOAD_FILE', "このランクのための画像ファイルをアップロードして下さい");
@@ -19,6 +20,9 @@
 define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "ユーザー名が重複しています。変更して下さい。");
 define('_AD_USER_ERROR_WRONG_FORMAT', "不正なフォーマットです");
 define('_AD_USER_LANG_ACTIVEUSER', "アクティブユーザー");
+define('_AD_USER_LANG_ACTKEY', "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', "アバター削除");
@@ -40,6 +44,8 @@
 define('_AD_USER_LANG_CREATE_NEW', "新規作成");
 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_GROUP', "グループ");
@@ -61,9 +67,14 @@
 define('_AD_USER_LANG_GROUP_TYPE', "タイプ");
 define('_AD_USER_LANG_GROUPID', "グループID");
 define('_AD_USER_LANG_ID', "ID");
+define('_AD_USER_LANG_LAST_LOGIN', "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_LEVEL', "レベル");
+define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
+define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
 define('_AD_USER_LANG_MAILOK', "当サイトの新着情報などをメールで受け取る");
 define('_AD_USER_LANG_NAME', "本名");
 define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
@@ -71,7 +82,9 @@
 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', "Pending users only");
 define('_AD_USER_LANG_PERM_ACCESS', "アクセス");
 define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "アクセス管理権限");
 define('_AD_USER_LANG_PERM_ADMIN', "管理");
@@ -92,19 +105,25 @@
 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_SENDER', "送信者");
 define('_AD_USER_LANG_SUBJECT', "件名");
 define('_AD_USER_LANG_SUBMIT', "送信");
 define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
+define('_AD_USER_LANG_THEME', "theme");
 define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
 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_AIM', "AIM");
+define('_AD_USER_LANG_USER_AVATAR', "user avatar");
 define('_AD_USER_LANG_USER_DELETE', "ユーザーの削除");
 define('_AD_USER_LANG_USER_DELETE_ADVICE', "<b>_%s_</b> のユーザーを削除します。よろしいですか？");
 define('_AD_USER_LANG_USER_EDIT', "ユーザーの編集");
@@ -116,6 +135,8 @@
 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', "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");

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:38:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:38:14 +0900
Subject: [xoops-cvslog 2758] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060411093814.F10642AC032@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/UserEventFunction.class.php
diff -u xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.9 xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.10
--- xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.9	Tue Mar 28 22:32:19 2006
+++ xoops2jp/html/modules/user/kernel/UserEventFunction.class.php	Tue Apr 11 18:38:14 2006
@@ -98,14 +98,21 @@
 		$controller->mRoot->mLanguageManager->loadModuleLanguage('user');
 
 		$memberHandler=&xoops_gethandler('member');
-		$user =& $memberHandler->loginUser(addslashes($_POST['uname']),addslashes($_POST['pass']));
-
-		if($user===false) {
+		
+		$criteria =& new CriteriaCompo();
+		$criteria->add(new Criteria('uname', xoops_getrequest('uname')));
+		$criteria->add(new Criteria('pass', md5(xoops_getrequest('pass'))));
+		
+		$userArr =& $memberHandler->getUsers($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);

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:54:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:54:49 +0900
Subject: [xoops-cvslog 2759] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060411095449.D181D2AC03F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/handler.php
diff -u xoops2jp/html/modules/base/kernel/handler.php:1.1.2.13 xoops2jp/html/modules/base/kernel/handler.php:1.1.2.14
--- xoops2jp/html/modules/base/kernel/handler.php:1.1.2.13	Tue Apr 11 18:14:58 2006
+++ xoops2jp/html/modules/base/kernel/handler.php	Tue Apr 11 18:54:49 2006
@@ -275,29 +275,37 @@
 				//
 				$name = $criteria->getName();
 				$value = $criteria->getValue();
-				switch ($obj->mVars[$name]['data_type']) {
-					case XOBJ_DTYPE_BOOL:
-						$value = $value ? "1" : "0";
-						break;
-					
-					case XOBJ_DTYPE_INT:
-						$value = intval($value);
-						break;
-					
-					case XOBJ_DTYPE_FLOAT:
-						$value = floatval($value);
-						break;
-					
-					case XOBJ_DTYPE_STRING:
-					case XOBJ_DTYPE_TEXT:
-						$value = $this->db->quoteString($value);
-						break;
+				if ($name != null && isset($obj->mVars[$name])) {
+					switch ($obj->mVars[$name]['data_type']) {
+						case XOBJ_DTYPE_BOOL:
+							$value = $value ? "1" : "0";
+							break;
 						
-					default:
-						$value = $criteria->getValue();
+						case XOBJ_DTYPE_INT:
+							$value = intval($value);
+							break;
+						
+						case XOBJ_DTYPE_FLOAT:
+							$value = floatval($value);
+							break;
+						
+						case XOBJ_DTYPE_STRING:
+						case XOBJ_DTYPE_TEXT:
+							$value = $this->db->quoteString($value);
+							break;
+							
+						default:
+							$value = $criteria->getValue();
+					}
+				}
+
+				if ($name != null) {
+					return $name . " " . $criteria->getOperator() . " " . $value;
+				}
+				else {
+					return null;
 				}
 				
-				$string = $name . " " . $criteria->getOperator() . " " . $value;
 				return $string;
 			}
 		}

From minahito ＠ users.sourceforge.jp  Tue Apr 11 18:55:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 18:55:25 +0900
Subject: [xoops-cvslog 2760] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060411095525.6874C2AC03F@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.2 xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.3
--- xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php:1.1.2.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/UserFilterForm.class.php	Tue Apr 11 18:55:25 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
 
-define('USER_SORT_KEY_DEFAULT', 0);
 define('USER_SORT_KEY_UID', 1);
 define('USER_SORT_KEY_NAME', 2);
 define('USER_SORT_KEY_UNAME', 3);
@@ -38,11 +37,12 @@
 define('USER_SORT_KEY_USER_MAILOK', 31);
 define('USER_SORT_KEY_MAXVALUE', 31);
 
+define('USER_SORT_KEY_DEFAULT', USER_SORT_KEY_UID);
+
 class User_UserFilterForm extends User_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		USER_SORT_KEY_DEFAULT => 'uid',
 		USER_SORT_KEY_UID => 'uid',
 		USER_SORT_KEY_NAME => 'name',
 		USER_SORT_KEY_UNAME => 'uname',
@@ -79,7 +79,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : USER_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > USER_SORT_KEY_MAXVALUE) {
 			$this->mSort = USER_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php:1.1.2.2 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.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/RanksFilterForm.class.php	Tue Apr 11 18:55:25 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
 
-define('RANKS_SORT_KEY_DEFAULT', 0);
 define('RANKS_SORT_KEY_RANK_ID', 1);
 define('RANKS_SORT_KEY_RANK_TITLE', 2);
 define('RANKS_SORT_KEY_RANK_MIN', 3);
@@ -13,11 +12,12 @@
 define('RANKS_SORT_KEY_RANK_IMAGE', 6);
 define('RANKS_SORT_KEY_MAXVALUE', 6);
 
+define('RANKS_SORT_KEY_DEFAULT', RANKS_SORT_KEY_RANK_ID);
+
 class User_RanksFilterForm extends User_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $_mSortKeys = array(
-		RANKS_SORT_KEY_DEFAULT => 'rank_id',
 		RANKS_SORT_KEY_RANK_ID => 'rank_id',
 		RANKS_SORT_KEY_RANK_TITLE => 'rank_title',
 		RANKS_SORT_KEY_RANK_MIN => 'rank_min',
@@ -29,7 +29,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : RANKS_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > RANKS_SORT_KEY_MAXVALUE) {
 			$this->mSort = RANKS_SORT_KEY_DEFAULT;
Index: xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php
diff -u xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php:1.1.2.2 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.2	Tue Mar 28 22:32:04 2006
+++ xoops2jp/html/modules/user/admin/forms/GroupFilterForm.class.php	Tue Apr 11 18:55:25 2006
@@ -4,13 +4,14 @@
 
 require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
 
-define('GROUP_SORT_KEY_DEFAULT', 0);
 define('GROUP_SORT_KEY_GROUPID', 1);
 define('GROUP_SORT_KEY_NAME', 2);
 define('GROUP_SORT_KEY_DESCRIPTION', 3);
 define('GROUP_SORT_KEY_GROUP_TYPE', 4);
 define('GROUP_SORT_KEY_MAXVALUE', 4);
 
+define('GROUP_SORT_KEY_DEFAULT', GROUP_SORT_KEY_GROUPID);
+
 class User_GroupFilterForm extends User_AbstractFilterForm
 {
 	var $mSort = 0;
@@ -25,7 +26,7 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : GROUP_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > GROUP_SORT_KEY_MAXVALUE) {
 			$this->mSort = GROUP_SORT_KEY_DEFAULT;

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:00:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:00:35 +0900
Subject: [xoops-cvslog 2761] CVS update: xoops2jp/html/include
Message-ID: <20060411100035.82CA22AC03F@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.10 xoops2jp/html/include/functions.php:1.2.8.11
--- xoops2jp/html/include/functions.php:1.2.8.10	Fri Feb  3 23:34:08 2006
+++ xoops2jp/html/include/functions.php	Tue Apr 11 19:00:35 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.10 2006/02/03 14:34:08 nobunobu Exp $
+// $Id: functions.php,v 1.2.8.11 2006/04/11 10:00:35 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -29,16 +29,21 @@
 
 function xoops_getrequest($name)
 {
-	if(isset($_REQUEST[$name]) && !is_array($_REQUEST[$name])) {
-	    if (get_magic_quotes_gpc()) {
-			return stripslashes($_REQUEST[$name]);
-		}
-		else {
-			return $_REQUEST[$name];
-		}
+	if (!get_magic_quotes_gpc()) {
+		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : null;
 	}
 	
-	return null;
+	if(is_array($_REQUEST[$name])) {
+		return stripslashes($_REQUEST[$name]);
+	}
+	else {
+		$ret = array();
+		foreach ($_REQUEST[$name] as $key => $value) {
+			$ret[$key] = stripslashes($value);
+		}
+		
+		return $ret;
+	}
 }
 
 /**

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:03:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:03:31 +0900
Subject: [xoops-cvslog 2762] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060411100331.99AA52AC03F@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.3 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.4
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.3	Tue Mar 28 22:29:21 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Tue Apr 11 19:03:31 2006
@@ -62,7 +62,7 @@
 			die();
 		}
 		
-		if (!$this->mAction->isPerm($controller, $controller->getXoopsUser())) {
+		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser())) {
 			if ($this->mAdminFlag) {
 				$controller->executeForward(XOOPS_URL . "/admin.php");
 			}

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:03:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:03:38 +0900
Subject: [xoops-cvslog 2763] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060411100338.B41992AC03F@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.4 xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/actions/HelpAction.class.php:1.1.2.4	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/HelpAction.class.php	Tue Apr 11 19:03:38 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: HelpAction.class.php,v 1.1.2.4 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: HelpAction.class.php,v 1.1.2.5 2006/04/11 10:03:38 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -75,7 +75,7 @@
 	 */
 	var $_mDirname = null;
 	
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		$this->_mDirname = xoops_getrequest('dirname');
 		
Index: xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php
diff -u xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php:1.1.2.4 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.4	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ActSearchAction.class.php	Tue Apr 11 19:03:38 2006
@@ -109,7 +109,7 @@
 		}
 	}
 
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		$permHandler =& xoops_gethandler('groupperm');
 		return $permHandler->checkRight('module_admin', -1, $xoopsUser->getGroups());

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:03:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:03:53 +0900
Subject: [xoops-cvslog 2764] CVS update: xoops2jp/html/modules/user/actions
Message-ID: <20060411100353.762E42AC053@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/actions/AvatarEditAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/AvatarEditAction.class.php:1.1.2.4	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/AvatarEditAction.class.php	Tue Apr 11 19:03:53 2006
@@ -97,7 +97,7 @@
 	 * 2) A current user has to equal the specified user, or a current user has
 	 *    to be a administrator.
 	 */
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		if (!is_object($this->mObject)) {
 			return false;
Index: xoops2jp/html/modules/user/actions/EditUserAction.class.php
diff -u xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.7 xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.8
--- xoops2jp/html/modules/user/actions/EditUserAction.class.php:1.1.2.7	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/EditUserAction.class.php	Tue Apr 11 19:03:53 2006
@@ -34,7 +34,7 @@
 		return true;
 	}
 	
-	function isPerm(&$controller, &$xoopsUser, &$moduleConfig)
+	function hasPerm(&$controller, &$xoopsUser, &$moduleConfig)
 	{
 		if ($this->mObject != null) {
 			return ($this->mObject->get('uid') == $xoopsUser->get('uid') || $xoopsUser->isAdmin());
Index: xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php
diff -u xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.4 xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.5
--- xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php:1.1.2.4	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/AvatarSelectAction.class.php	Tue Apr 11 19:03:53 2006
@@ -66,7 +66,7 @@
 	 * 2) A current user has to equal the specified user, or a current user has
 	 *    to be a administrator.
 	 */
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		if (!is_object($this->mObject)) {
 			return false;
Index: xoops2jp/html/modules/user/actions/LostPassAction.class.php
diff -u xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.2 xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.3
--- xoops2jp/html/modules/user/actions/LostPassAction.class.php:1.1.2.2	Tue Mar 28 22:31:02 2006
+++ xoops2jp/html/modules/user/actions/LostPassAction.class.php	Tue Apr 11 19:03:53 2006
@@ -20,7 +20,7 @@
 		return false;
 	}
 	
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		return !is_object($xoopsUser);
 	}

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:03:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:03:53 +0900
Subject: [xoops-cvslog 2765] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060411100353.9EC4A2AC062@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.4 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.5
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.4	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Tue Apr 11 19:03:53 2006
@@ -72,7 +72,7 @@
 		
 		$this->mAction->prepare($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig);
 	
-		if (!$this->mAction->isPerm($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
+		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser(), $controller->mModuleController->mConfig)) {
 			//
 			// error
 			//

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:21:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:21:09 +0900
Subject: [xoops-cvslog 2766] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060411102110.00F2F2AC02D@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.4 xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.5
--- xoops2jp/html/modules/base/class/ActionFrame.class.php:1.1.2.4	Tue Apr 11 19:03:31 2006
+++ xoops2jp/html/modules/base/class/ActionFrame.class.php	Tue Apr 11 19:21:09 2006
@@ -112,7 +112,7 @@
 		$this->_mAdminFlag = $adminFlag;
 	}
 
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		if ($this->_mAdminFlag) {
 			$moduleHandler =& xoops_gethandler('module');

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:21:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:21:18 +0900
Subject: [xoops-cvslog 2767] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060411102118.7F6F92AC02D@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.5 xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.6
--- xoops2jp/html/modules/user/class/ActionFrame.class.php:1.1.2.5	Tue Apr 11 19:03:53 2006
+++ xoops2jp/html/modules/user/class/ActionFrame.class.php	Tue Apr 11 19:21:18 2006
@@ -118,7 +118,7 @@
 		return false;
 	}
 	
-	function isPerm(&$controller, &$xoopsUser)
+	function hasPerm(&$controller, &$xoopsUser)
 	{
 		return true;
 	}

From minahito ＠ users.sourceforge.jp  Tue Apr 11 19:27:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 11 Apr 2006 19:27:27 +0900
Subject: [xoops-cvslog 2768] CVS update: xoops2jp/html/include
Message-ID: <20060411102727.59EC42AC02D@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.11 xoops2jp/html/include/functions.php:1.2.8.12
--- xoops2jp/html/include/functions.php:1.2.8.11	Tue Apr 11 19:00:35 2006
+++ xoops2jp/html/include/functions.php	Tue Apr 11 19:27:27 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.11 2006/04/11 10:00:35 minahito Exp $
+// $Id: functions.php,v 1.2.8.12 2006/04/11 10:27:27 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -33,7 +33,7 @@
 		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : null;
 	}
 	
-	if(is_array($_REQUEST[$name])) {
+	if(!is_array($_REQUEST[$name])) {
 		return stripslashes($_REQUEST[$name]);
 	}
 	else {

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 21:58:56 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 21:58:56 +0900
Subject: [xoops-cvslog 2769] CVS update: xoops2jp/html/class
Message-ID: <20060411125856.B0F332AC06B@users.sourceforge.jp>

Index: xoops2jp/html/class/errorhandler.php
diff -u xoops2jp/html/class/errorhandler.php:1.4 xoops2jp/html/class/errorhandler.php:1.4.6.1
--- xoops2jp/html/class/errorhandler.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/class/errorhandler.php	Tue Apr 11 21:58:56 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: errorhandler.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: errorhandler.php,v 1.4.6.1 2006/04/11 12:58:56 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -135,10 +135,13 @@
      */
     function renderErrors()
     {
+		//
+		// TODO We should plan new style about the following lines.
+		//
         $output = '';
         if ($this->_isFatal) {
             $output .= 'This page cannot be displayed due to an internal error.<br/><br/>';
-            $output .= 'If you are the administrator of this site, please visit the <a href="http://wiki.xoops.org/wakka.php?wakka=TroubleshootingBlankPage">Xoops Troubleshooting Page</a> for assistance.<br/><br/>';
+            $output .= 'If you are the administrator of this site, please visit the <a href="http://xoopscube.org/">XOOPS Cube official site</a> for assistance.<br/><br/>';
         }
         if (!$this->_showErrors || empty($this->_errors)) {
             return $output;

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:00:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:00:16 +0900
Subject: [xoops-cvslog 2770] CVS update: xoops2jp/html/class
Message-ID: <20060411130016.A87E92AC05A@users.sourceforge.jp>

Index: xoops2jp/html/class/snoopy.php
diff -u xoops2jp/html/class/snoopy.php:1.1 xoops2jp/html/class/snoopy.php:1.1.16.1
--- xoops2jp/html/class/snoopy.php:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/html/class/snoopy.php	Tue Apr 11 22:00:16 2006
@@ -31,7 +31,7 @@
 Lincoln, NE 68510
 
 The latest version of Snoopy can be obtained from:
-http://snoopy.sourceforge.com
+http://snoopy.sourceforge.net/
 
 *************************************************/
 
@@ -45,7 +45,10 @@
 	var $port			=	80;					// port we are connecting to
 	var $proxy_host		=	"";					// proxy host to use
 	var $proxy_port		=	"";					// proxy port to use
-	var $agent			=	"Snoopy v1.01";		// agent we masquerade as
+	var $proxy_user		=	"";					// proxy user to use
+	var $proxy_pass		=	"";					// proxy password to use
+	
+	var $agent			=	"Snoopy v1.2.3";	// agent we masquerade as
 	var	$referer		=	"";					// referer info to pass
 	var $cookies		=	array();			// array of cookies to pass
 												// $cookies["username"]="joe";
@@ -58,7 +61,7 @@
 	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
 	var $expandlinks	=	true;				// expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
-												// or submitlinks()
+												// submitlinks(), and submittext()
 	var $passcookies	=	true;				// pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
@@ -80,7 +83,11 @@
 												// set to 0 to disallow timeouts
 	var $timed_out		=	false;				// if a read operation timed out
 	var	$status			=	0;					// http request status
-	
+
+	var $temp_dir		=	"/tmp";				// temporary directory that the webserver
+												// has permission to write to.
+												// under Windows, this should be C:\temp
+
 	var	$curl_path		=	"/usr/local/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
@@ -128,8 +135,12 @@
 			$this->user = $URI_PARTS["user"];
 		if (!empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
+		if (empty($URI_PARTS["query"]))
+			$URI_PARTS["query"] = '';
+		if (empty($URI_PARTS["path"]))
+			$URI_PARTS["path"] = '';
 				
-		switch($URI_PARTS["scheme"])
+		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
@@ -191,8 +202,11 @@
 				return true;					
 				break;
 			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path)))
+				if(!$this->curl_path)
 					return false;
+				if(function_exists("is_executable"))
+				    if (!is_executable($this->curl_path))
+				        return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -257,6 +271,8 @@
 	Input:		$URI	the location to post the data
 				$formvars	the formvars to use.
 					format: $formvars["var"] = "val";
+				$formfiles  an array of files to submit
+					format: $formfiles["var"] = "/dir/filename.ext";
 	Output:		$this->results	the text output from the post
 \*======================================================================*/
 
@@ -271,8 +287,12 @@
 			$this->user = $URI_PARTS["user"];
 		if (!empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
-				
-		switch($URI_PARTS["scheme"])
+		if (empty($URI_PARTS["query"]))
+			$URI_PARTS["query"] = '';
+		if (empty($URI_PARTS["path"]))
+			$URI_PARTS["path"] = '';
+
+		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
@@ -308,7 +328,10 @@
 								/* follow the redirect */
 								$this->_redirectdepth++;
 								$this->lastredirectaddr=$this->_redirectaddr;
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								if( strpos( $this->_redirectaddr, "?" ) > 0 )
+									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
+								else
+									$this->submit($this->_redirectaddr,$formvars, $formfiles);
 							}
 						}
 					}
@@ -338,8 +361,11 @@
 				return true;					
 				break;
 			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path)))
+				if(!$this->curl_path)
 					return false;
+				if(function_exists("is_executable"))
+				    if (!is_executable($this->curl_path))
+				        return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -369,7 +395,10 @@
 							/* follow the redirect */
 							$this->_redirectdepth++;
 							$this->lastredirectaddr=$this->_redirectaddr;
-							$this->submit($this->_redirectaddr,$formvars, $formfiles);
+							if( strpos( $this->_redirectaddr, "?" ) > 0 )
+								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
+							else
+								$this->submit($this->_redirectaddr,$formvars, $formfiles);
 						}
 					}
 				}
@@ -413,7 +442,8 @@
 	{
 		if ($this->fetch($URI))
 		{			
-
+			if($this->lastredirectaddr)
+				$URI = $this->lastredirectaddr;
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
@@ -493,6 +523,8 @@
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{			
+			if($this->lastredirectaddr)
+				$URI = $this->lastredirectaddr;
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
@@ -525,6 +557,8 @@
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{			
+			if($this->lastredirectaddr)
+				$URI = $this->lastredirectaddr;
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
@@ -569,7 +603,7 @@
 		$this->_submit_type = "application/x-www-form-urlencoded";
 	}
 
-
+	
 // XOOPS2 Hack begin
 // Added on March 4, 2003 by onokazu ＠ xoops.org
 /*======================================================================*\
@@ -582,7 +616,7 @@
 		$this->_submit_type = "text/xml";
 	}
 // XOOPS2 Hack end
-
+	
 
 /*======================================================================*\
 	Private functions
@@ -725,14 +759,20 @@
 		preg_match("/^[^\?]+/",$URI,$match);
 
 		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+		$match = preg_replace("|/$|","",$match);
+		$match_part = parse_url($match);
+		$match_root =
+		$match_part["scheme"]."://".$match_part["host"];
 				
 		$search = array( 	"|^http://".preg_quote($this->host)."|i",
-							"|^(?!http://)(\/)?(?!mailto:)|i",
+							"|^(\/)|i",
+							"|^(?!http://)(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 						
 		$replace = array(	"",
+							$match_root."/",
 							$match."/",
 							"/",
 							"/"
@@ -765,8 +805,12 @@
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
 		if(!empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
+		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+			$headers .= "Host: ".$this->host;
+			if(!empty($this->port))
+				$headers .= ":".$this->port;
+			$headers .= "\r\n";
+		}
 		if(!empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
 		if(!empty($this->referer))
@@ -802,6 +846,11 @@
 			$headers .= "Content-length: ".strlen($body)."\r\n";
 		if(!empty($this->user) || !empty($this->pass))	
 			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
+		
+		//add proxy auth headers
+		if(!empty($this->proxy_user))	
+			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+
 
 		$headers .= "\r\n";
 		
@@ -830,7 +879,7 @@
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)[ ]+(.*)/",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)[ ]+(.*)/i",chop($currentHeader),$matches);
 				// look for :// in the Location header to see if hostname is included
 				if(!preg_match("|\:\/\/|",$matches[2]))
 				{
@@ -875,7 +924,8 @@
 		
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+
 		{
 			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
 		}
@@ -921,7 +971,10 @@
 		if(!empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
 		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
+			if(!empty($this->port))
+				$headers[] = "Host: ".$this->host.":".$this->port;
+			else
+				$headers[] = "Host: ".$this->host;
 		if(!empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
 		if(!empty($this->referer))
@@ -958,8 +1011,10 @@
 		if(!empty($this->user) || !empty($this->pass))	
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++)
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
+		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+			$safer_header = strtr( $headers[$curr_header], "\"", " " );
+			$cmdline_params .= " -H \"".$safer_header."\"";
+		}
 		
 		if(!empty($body))
 			$cmdline_params .= " -d \"$body\"";
@@ -967,9 +1022,10 @@
 		if($this->read_timeout > 0)
 			$cmdline_params .= " -m ".$this->read_timeout;
 		
-		$headerfile = uniqid(time());
+		$headerfile = tempnam($temp_dir, "sno");
 
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".$cmdline_params." ".$URI,$results,$return);
+		$safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
+		exec($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\"",$results,$return);
 		
 		if($return)
 		{
@@ -980,7 +1036,7 @@
 			
 		$results = implode("\r\n",$results);
 		
-		$result_headers = file("/tmp/$headerfile");
+		$result_headers = file("$headerfile");
 						
 		$this->_redirectaddr = false;
 		unset($this->headers);
@@ -1016,7 +1072,7 @@
 
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
 		{
 			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
 		}
@@ -1035,7 +1091,7 @@
 		else
 			$this->results = $results;
 
-		unlink("/tmp/$headerfile");
+		unlink("$headerfile");
 		
 		return true;
 	}
@@ -1050,7 +1106,7 @@
 		for($x=0; $x<count($this->headers); $x++)
 		{
 		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
+			$this->cookies[$match[1]] = urldecode($match[2]);
 		}
 	}
 
@@ -1084,6 +1140,7 @@
 		if(!empty($this->proxy_host) && !empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
+				
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
 			}
@@ -1149,6 +1206,7 @@
 	{
 		settype($formvars, "array");
 		settype($formfiles, "array");
+		$postdata = '';
 
 		if (count($formvars) == 0 && count($formfiles) == 0)
 			return;

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:02:45 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:02:45 +0900
Subject: [xoops-cvslog 2771] CVS update: xoops2jp/html/class/smarty
Message-ID: <20060411130245.5A65C2AC05A@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/Config_File.class.php
diff -u xoops2jp/html/class/smarty/Config_File.class.php:1.2 xoops2jp/html/class/smarty/Config_File.class.php:1.2.16.1
--- xoops2jp/html/class/smarty/Config_File.class.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/smarty/Config_File.class.php	Tue Apr 11 22:02:45 2006
@@ -18,14 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @version 2.6.5-dev
- * @copyright Copyright: 2001-2004 ispi of Lincoln, Inc.
+ * @version 2.6.12
+ * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei ＠ php.net>
  * @access public
  * @package Smarty
  */
 
-/* $Id: Config_File.class.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $ */
+/* $Id: Config_File.class.php,v 1.2.16.1 2006/04/11 13:02:45 nobunobu Exp $ */
 
 /**
  * Config file reading class
@@ -105,7 +105,7 @@
      * @param string $var_name (optional) variable to get info for
      * @return string|array a value or array of values
      */
-    function &get($file_name, $section_name = NULL, $var_name = NULL)
+    function get($file_name, $section_name = NULL, $var_name = NULL)
     {
         if (empty($file_name)) {
             $this->_trigger_error_msg('Empty config file name');
@@ -285,9 +285,9 @@
             $line = $lines[$i];
             if (empty($line)) continue;
 
-            if ( $line{0} == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
+            if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
                 /* section found */
-                if ($match[1]{0} == '.') {
+                if (substr($match[1], 0, 1) == '.') {
                     /* hidden section */
                     if ($this->read_hidden) {
                         $section_name = substr($match[1], 1);
@@ -347,7 +347,7 @@
      */
     function _set_config_var(&$container, $var_name, $var_value, $booleanize)
     {
-        if ($var_name{0} == '.') {
+        if (substr($var_name, 0, 1) == '.') {
             if (!$this->read_hidden)
                 return;
             else
Index: xoops2jp/html/class/smarty/Smarty.class.php
diff -u xoops2jp/html/class/smarty/Smarty.class.php:1.2 xoops2jp/html/class/smarty/Smarty.class.php:1.2.16.1
--- xoops2jp/html/class/smarty/Smarty.class.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/smarty/Smarty.class.php	Tue Apr 11 22:02:45 2006
@@ -23,14 +23,14 @@
  * smarty-general-subscribe ＠ lists.php.net
  *
  * @link http://smarty.php.net/
- * @copyright 2001-2004 ispi of Lincoln, Inc.
- * @author Monte Ohrt <monte ＠ ispi.net>
+ * @copyright 2001-2005 New Digital Group, Inc.
+ * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei ＠ php.net>
  * @package Smarty
- * @version 2.6.5-dev
+ * @version 2.6.12
  */
 
-/* $Id: Smarty.class.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $ */
+/* $Id: Smarty.class.php,v 1.2.16.1 2006/04/11 13:02:45 nobunobu Exp $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -49,6 +49,10 @@
     define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 }
 
+if (!defined('SMARTY_CORE_DIR')) {
+    define('SMARTY_CORE_DIR', SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR);
+}
+
 define('SMARTY_PHP_PASSTHRU',   0);
 define('SMARTY_PHP_QUOTE',      1);
 define('SMARTY_PHP_REMOVE',     2);
@@ -228,7 +232,7 @@
                                                                'isset', 'empty',
                                                                'count', 'sizeof',
                                                                'in_array', 'is_array',
-                                                               'true','false'),
+                                                               'true', 'false', 'null'),
                                     'INCLUDE_ANY'     => false,
                                     'PHP_TAGS'        => false,
                                     'MODIFIER_FUNCS'  => array('count'),
@@ -460,7 +464,7 @@
      *
      * @var string
      */
-    var $_version              = '2.6.5-dev';
+    var $_version              = '2.6.12';
 
     /**
      * current template inclusion depth
@@ -910,7 +914,7 @@
         switch ($type) {
             case 'output':
                 $_params = array('plugins' => array(array($type . 'filter', $name, null, null, false)));
-                require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_plugins.php');
+                require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
                 smarty_core_load_plugins($_params, $this);
                 break;
 
@@ -950,7 +954,7 @@
                             'auto_source' => $tpl_file,
                             'auto_id' => $_auto_id,
                             'exp_time' => $exp_time);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rm_auto.php');
+            require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
             return smarty_core_rm_auto($_params, $this);
         }
 
@@ -990,7 +994,7 @@
             'cache_id' => $cache_id,
             'compile_id' => $compile_id
         );
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.read_cache_file.php');
+        require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
         return smarty_core_read_cache_file($_params, $this);
     }
 
@@ -1024,7 +1028,7 @@
                         'auto_id' => $compile_id,
                         'exp_time' => $exp_time,
                         'extensions' => array('.inc', '.php'));
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rm_auto.php');
+        require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
         return smarty_core_rm_auto($_params, $this);
     }
 
@@ -1051,9 +1055,12 @@
     {
         if(!isset($name)) {
             return $this->_tpl_vars;
-        }
-        if(isset($this->_tpl_vars[$name])) {
+        } elseif(isset($this->_tpl_vars[$name])) {
             return $this->_tpl_vars[$name];
+        } else {
+            // var non-existant, return valid reference
+            $_tmp = null;
+            return $_tmp;   
         }
     }
 
@@ -1070,6 +1077,10 @@
             return $this->_config[0]['vars'];
         } else if(isset($this->_config[0]['vars'][$name])) {
             return $this->_config[0]['vars'][$name];
+        } else {
+            // var non-existant, return valid reference
+            $_tmp = null;
+            return $_tmp;
         }
     }
 
@@ -1128,15 +1139,14 @@
                     $this->debugging = true;
                 }
             } else {
-                $_cookie_var = $this->request_use_auto_globals ? $_COOKIE['SMARTY_DEBUG'] : $GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG'];
-                $this->debugging = $_cookie_var ? true : false;
+                $this->debugging = (bool)($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
             }
         }
 
         if ($this->debugging) {
             // capture time for debugging info
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $_debug_start_time = smarty_core_get_microtime($_params, $this);
             $this->_smarty_debug_info[] = array('type'      => 'template',
                                                 'filename'  => $resource_name,
@@ -1161,20 +1171,20 @@
                 'compile_id' => $compile_id,
                 'results' => null
             );
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.read_cache_file.php');
+            require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
             if (smarty_core_read_cache_file($_params, $this)) {
                 $_smarty_results = $_params['results'];
-                if (@count($this->_cache_info['insert_tags'])) {
+                if (!empty($this->_cache_info['insert_tags'])) {
                     $_params = array('plugins' => $this->_cache_info['insert_tags']);
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                     $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.process_cached_inserts.php');
+                    require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
                     $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
                 }
-                if (@count($this->_cache_info['cache_serials'])) {
+                if (!empty($this->_cache_info['cache_serials'])) {
                     $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.process_compiled_include.php');
+                    require_once(SMARTY_CORE_DIR . 'core.process_compiled_include.php');
                     $_smarty_results = smarty_core_process_compiled_include($_params, $this);
                 }
 
@@ -1184,9 +1194,9 @@
                     {
                         // capture time for debugging info
                         $_params = array();
-                        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+                        require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
                         $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $_debug_start_time;
-                        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.display_debug_console.php');
+                        require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
                         $_smarty_results .= smarty_core_display_debug_console($_params, $this);
                     }
                     if ($this->cache_modified_check) {
@@ -1267,9 +1277,9 @@
                         'cache_id' => $cache_id,
                         'compile_id' => $compile_id,
                         'results' => $_smarty_results);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_cache_file.php');
+            require_once(SMARTY_CORE_DIR . 'core.write_cache_file.php');
             smarty_core_write_cache_file($_params, $this);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.process_cached_inserts.php');
+            require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
             $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
 
             if ($this->_cache_serials) {
@@ -1288,9 +1298,9 @@
             if ($this->debugging) {
                 // capture time for debugging info
                 $_params = array();
-                require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
                 $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
-                require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.display_debug_console.php');
+                require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
                 echo smarty_core_display_debug_console($_params, $this);
             }
             error_reporting($_smarty_old_error_level);
@@ -1356,7 +1366,7 @@
     function _get_plugin_filepath($type, $name)
     {
         $_params = array('type' => $type, 'name' => $name);
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.assemble_plugin_filepath.php');
+        require_once(SMARTY_CORE_DIR . 'core.assemble_plugin_filepath.php');
         return smarty_core_assemble_plugin_filepath($_params, $this);
     }
 
@@ -1414,12 +1424,12 @@
         if ($this->_compile_source($resource_name, $_source_content, $_compiled_content, $_cache_include)) {
             // if a _cache_serial was set, we also have to write an include-file:
             if ($this->_cache_include_info) {
-                require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_compiled_include.php');
-                smarty_core_write_compiled_include(array_merge($this->_cache_include_info, array('compiled_content'=>$_compiled_content)),  $this);
+                require_once(SMARTY_CORE_DIR . 'core.write_compiled_include.php');
+                smarty_core_write_compiled_include(array_merge($this->_cache_include_info, array('compiled_content'=>$_compiled_content, 'resource_name'=>$resource_name)),  $this);
             }
 
             $_params = array('compile_path'=>$compile_path, 'compiled_content' => $_compiled_content);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_compiled_resource.php');
+            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
             smarty_core_write_compiled_resource($_params, $this);
 
             return true;
@@ -1472,7 +1482,9 @@
         $smarty_compiler->_config            = $this->_config;
         $smarty_compiler->request_use_auto_globals  = $this->request_use_auto_globals;
 
-        $smarty_compiler->_cache_serial = null;
+        if (isset($cache_include_path) && isset($this->_cache_serials[$cache_include_path])) {
+            $smarty_compiler->_cache_serial = $this->_cache_serials[$cache_include_path];
+        }
         $smarty_compiler->_cache_include = $cache_include_path;
 
 
@@ -1579,7 +1591,7 @@
                 $this->trigger_error('unable to read resource: "' . $params['resource_name'] . '"');
             }
         } else if ($_return && $this->security) {
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.is_secure.php');
+            require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
             if (!smarty_core_is_secure($_params, $this)) {
                 if (!$params['quiet'])
                     $this->trigger_error('(secure mode) accessing "' . $params['resource_name'] . '" is not allowed');
@@ -1635,7 +1647,7 @@
                     }
                     // didn't find the file, try include_path
                     $_params = array('file_path' => $_fullpath);
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php');
+                    require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
                     if(smarty_core_get_include_path($_params, $this)) {
                         $params['resource_name'] = $_params['new_file_path'];
                         return true;
@@ -1648,7 +1660,7 @@
             }
         } elseif (empty($this->_plugins['resource'][$params['resource_type']])) {
             $_params = array('type' => $params['resource_type']);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_resource_plugin.php');
+            require_once(SMARTY_CORE_DIR . 'core.load_resource_plugin.php');
             smarty_core_load_resource_plugin($_params, $this);
         }
 
@@ -1686,8 +1698,8 @@
      */
     function _dequote($string)
     {
-        if (($string{0} == "'" || $string{0} == '"') &&
-            $string{strlen($string)-1} == $string{0})
+        if ((substr($string, 0, 1) == "'" || substr($string, 0, 1) == '"') &&
+            substr($string, -1) == substr($string, 0, 1))
             return substr($string, 1, -1);
         else
             return $string;
@@ -1695,18 +1707,18 @@
 
 
     /**
-     * read in a file from line $start for $lines.
-     * read the entire file if $start and $lines are null.
+     * read in a file
      *
      * @param string $filename
-     * @param integer $start
-     * @param integer $lines
      * @return string
      */
     function _read_file($filename)
     {
         if ( file_exists($filename) && ($fd = @fopen($filename, 'rb')) ) {
-            $contents = ($size = filesize($filename)) ? fread($fd, $size) : '';
+            $contents = '';
+            while (!feof($fd)) {
+                $contents .= fread($fd, 8192);
+            }
             fclose($fd);
             return $contents;
         } else {
@@ -1836,7 +1848,7 @@
     {
         if ($this->debugging) {
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $debug_start_time = smarty_core_get_microtime($_params, $this);
             $this->_smarty_debug_info[] = array('type'      => 'template',
                                                   'filename'  => $params['smarty_include_tpl_file'],
@@ -1867,7 +1879,7 @@
         if ($this->debugging) {
             // capture time for debugging info
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $this->_smarty_debug_info[$included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $debug_start_time;
         }
 
@@ -1887,7 +1899,7 @@
 
         if ($this->_cache_including) {
             /* return next set of cache_attrs */
-            $_return =& current($_cache_attrs);
+            $_return = current($_cache_attrs);
             next($_cache_attrs);
             return $_return;
 
Index: xoops2jp/html/class/smarty/Smarty_Compiler.class.php
diff -u xoops2jp/html/class/smarty/Smarty_Compiler.class.php:1.2 xoops2jp/html/class/smarty/Smarty_Compiler.class.php:1.2.16.1
--- xoops2jp/html/class/smarty/Smarty_Compiler.class.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/smarty/Smarty_Compiler.class.php	Tue Apr 11 22:02:45 2006
@@ -19,14 +19,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @author Monte Ohrt <monte ＠ ispi.net>
+ * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei ＠ php.net>
- * @version 2.6.5-dev
- * @copyright 2001-2004 ispi of Lincoln, Inc.
+ * @version 2.6.12
+ * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.2.16.1 2006/04/11 13:02:45 nobunobu Exp $ */
 
 /**
  * Template compiling class
@@ -49,7 +49,9 @@
     var $_si_qstr_regexp        =   null;
     var $_qstr_regexp           =   null;
     var $_func_regexp           =   null;
+    var $_reg_obj_regexp        =   null;
     var $_var_bracket_regexp    =   null;
+    var $_num_const_regexp      =   null;
     var $_dvar_guts_regexp      =   null;
     var $_dvar_regexp           =   null;
     var $_cvar_regexp           =   null;
@@ -101,7 +103,7 @@
         // 30
         // -12
         // 13.22
-        $this->_num_const_regexp = '\-?\d+(?:\.\d+)?';
+        $this->_num_const_regexp = '(?:\-?\d+(?:\.\d+)?)';
 
         // matches $ vars (not objects):
         // $foo
@@ -137,7 +139,7 @@
         // #foo#
         // "text"
         // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_num_const_regexp . '|' . $this->_qstr_regexp . ')';
+        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
 
         // matches valid object call (one level of object nesting allowed in parameters):
         // $foo->bar
@@ -152,8 +154,8 @@
         // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
         $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
         $this->_obj_restricted_param_regexp = '(?:'
-                . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp . '(?:\((?:' . $this->_var_regexp
-                . '(?:\s*,\s*' . $this->_var_regexp . ')*)?\))?)*)';
+                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
+                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
         $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
                 . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
         $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
@@ -169,7 +171,7 @@
         // |foo:"bar":$foobar
         // |foo|bar
         // |foo:$foo->bar
-        $this->_mod_regexp = '(?:\|@?\w+(?::(?>-?\w+|'
+        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
            . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
 
         // matches valid function name:
@@ -191,7 +193,7 @@
         // "text"|bar
         // $foo->bar
         $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -316,6 +318,36 @@
             return;
         }
 
+        /* Reformat $text_blocks between 'strip' and '/strip' tags,
+           removing spaces, tabs and newlines. */
+        $strip = false;
+        for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
+            if ($compiled_tags[$i] == '{strip}') {
+                $compiled_tags[$i] = '';
+                $strip = true;
+                /* remove leading whitespaces */
+                $text_blocks[$i + 1] = ltrim($text_blocks[$i + 1]);
+            }
+            if ($strip) {
+                /* strip all $text_blocks before the next '/strip' */
+                for ($j = $i + 1; $j < $for_max; $j++) {
+                    /* remove leading and trailing whitespaces of each line */
+                    $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
+                    if ($compiled_tags[$j] == '{/strip}') {                       
+                        /* remove trailing whitespaces from the last text_block */
+                        $text_blocks[$j] = rtrim($text_blocks[$j]);
+                    }
+                    $text_blocks[$j] = "<?php echo '" . strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>";
+                    if ($compiled_tags[$j] == '{/strip}') {
+                        $compiled_tags[$j] = "\n"; /* slurped by php, but necessary
+                                    if a newline is following the closing strip-tag */
+                        $strip = false;
+                        $i = $j;
+                        break;
+                    }
+                }
+            }
+        }
         $compiled_content = '';
 
         /* Interleave the compiled contents and text blocks to get the final result. */
@@ -328,19 +360,8 @@
         }
         $compiled_content .= $text_blocks[$i];
 
-        /* Reformat data between 'strip' and '/strip' tags, removing spaces, tabs and newlines. */
-        if (preg_match_all("~{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}~s", $compiled_content, $_match)) {
-            $strip_tags = $_match[0];
-            $strip_tags_modified = preg_replace("~{$ldq}/?strip{$rdq}|[\t ]+$|^[\t ]+~m", '', $strip_tags);
-            $strip_tags_modified = preg_replace('~[\r\n]+~m', '', $strip_tags_modified);
-            for ($i = 0, $for_max = count($strip_tags); $i < $for_max; $i++)
-                $compiled_content = preg_replace("~{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}~s",
-                                                  $this->_quote_replace($strip_tags_modified[$i]),
-                                                  $compiled_content, 1);
-        }
-
         // remove \n from the end of the file, if any
-        if (($_len=strlen($compiled_content)) && ($compiled_content{$_len - 1} == "\n" )) {
+        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
             $compiled_content = substr($compiled_content, 0, -1);
         }
 
@@ -375,19 +396,19 @@
             $_plugins_params = "array('plugins' => array(";
             foreach ($this->_plugin_info as $plugin_type => $plugins) {
                 foreach ($plugins as $plugin_name => $plugin_info) {
-                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '$plugin_info[0]', $plugin_info[1], ";
+                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '" . strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\")) . "', $plugin_info[1], ";
                     $_plugins_params .= $plugin_info[2] ? 'true),' : 'false),';
                 }
             }
             $_plugins_params .= '))';
-            $plugins_code = "<?php require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_plugins.php');\nsmarty_core_load_plugins($_plugins_params, \$this); ?>\n";
+            $plugins_code = "<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');\nsmarty_core_load_plugins($_plugins_params, \$this); ?>\n";
             $template_header .= $plugins_code;
             $this->_plugin_info = array();
             $this->_plugins_code = $plugins_code;
         }
 
         if ($this->_init_smarty_vars) {
-            $template_header .= "<?php require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.assign_smarty_interface.php');\nsmarty_core_assign_smarty_interface(null, \$this); ?>\n";
+            $template_header .= "<?php require_once(SMARTY_CORE_DIR . 'core.assign_smarty_interface.php');\nsmarty_core_assign_smarty_interface(null, \$this); ?>\n";
             $this->_init_smarty_vars = false;
         }
 
@@ -404,7 +425,7 @@
     function _compile_tag($template_tag)
     {
         /* Matched comment. */
-        if ($template_tag{0} == '*' && $template_tag{strlen($template_tag) - 1} == '*')
+        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
             return '';
         
         /* Split tag into two three parts: command, command modifiers and the arguments. */
@@ -421,12 +442,8 @@
 
         if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
             /* tag name is a variable or object */
-            $_return = $this->_parse_var_props($tag_command . $tag_modifier, $this->_parse_attrs($tag_args));
-            if(isset($_tag_attrs['assign'])) {
-                return "<?php \$this->assign('" . $this->_dequote($_tag_attrs['assign']) . "', $_return ); ?>\n";
-            } else {
-                return "<?php echo $_return; ?>" . $this->_additional_newline;
-            }
+            $_return = $this->_parse_var_props($tag_command . $tag_modifier);
+            return "<?php echo $_return; ?>" . $this->_additional_newline;
         }
 
         /* If the tag name is a registered object, we process it. */
@@ -500,29 +517,29 @@
 
             case 'foreachelse':
                 $this->_push_tag('foreachelse');
-                return "<?php endforeach; unset(\$_from); else: ?>";
+                return "<?php endforeach; else: ?>";
 
             case '/foreach':
                 $_open_tag = $this->_pop_tag('foreach');
                 if ($_open_tag == 'foreachelse')
-                    return "<?php endif; ?>";
+                    return "<?php endif; unset(\$_from); ?>";
                 else
-                    return "<?php endforeach; unset(\$_from); endif; ?>";
+                    return "<?php endforeach; endif; unset(\$_from); ?>";
                 break;
 
             case 'strip':
             case '/strip':
-                if ($tag_command{0}=='/') {
+                if (substr($tag_command, 0, 1)=='/') {
                     $this->_pop_tag('strip');
                     if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
                         $this->_additional_newline = "\n";
-                        return $this->left_delimiter.$tag_command.$this->right_delimiter;
+                        return '{' . $tag_command . '}';
                     }
                 } else {
                     $this->_push_tag('strip');
                     if ($this->_strip_depth++==0) { /* outermost opening {strip} */
                         $this->_additional_newline = "";
-                        return $this->left_delimiter.$tag_command.$this->right_delimiter;
+                        return '{' . $tag_command . '}';
                     }
                 }
                 return '';
@@ -647,7 +664,7 @@
      */
     function _compile_block_tag($tag_command, $tag_args, $tag_modifier, &$output)
     {
-        if ($tag_command{0} == '/') {
+        if (substr($tag_command, 0, 1) == '/') {
             $start_tag = false;
             $tag_command = substr($tag_command, 1);
         } else
@@ -709,17 +726,18 @@
         if ($start_tag) {
             $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
             $attrs = $this->_parse_attrs($tag_args);
-            $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs='');
+            $_cache_attrs='';
+            $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs);
             $output .= "$_cache_attrs\$this->_tag_stack[] = array('$tag_command', array(".implode(',', $arg_list).')); ';
-            $output .= $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat=true);';
+            $output .= '$_block_repeat=true;' . $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
             $output .= 'while ($_block_repeat) { ob_start(); ?>';
         } else {
-            $output = '<?php $this->_block_content = ob_get_contents(); ob_end_clean(); ';
-            $_out_tag_text = $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], $this->_block_content, $this, $_block_repeat=false)';
+            $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); ';
+            $_out_tag_text = $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], $_block_content, $this, $_block_repeat)';
             if ($tag_modifier != '') {
                 $this->_parse_modifiers($_out_tag_text, $tag_modifier);
             }
-            $output .= 'echo '.$_out_tag_text.'; } ';
+            $output .= '$_block_repeat=false;echo ' . $_out_tag_text . '; } ';
             $output .= " array_pop(\$this->_tag_stack); " . $this->_pop_cacheable_state('block', $tag_command) . '?>';
         }
 
@@ -784,7 +802,8 @@
 
         $_cacheable_state = $this->_push_cacheable_state('function', $tag_command);
         $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs='');
+        $_cache_attrs = '';
+        $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
 
         $output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
         if($tag_modifier != '') {
@@ -809,7 +828,7 @@
      */
     function _compile_registered_object_tag($tag_command, $attrs, $tag_modifier)
     {
-        if ($tag_command{0} == '/') {
+        if (substr($tag_command, 0, 1) == '/') {
             $start_tag = false;
             $tag_command = substr($tag_command, 1);
         } else {
@@ -857,13 +876,13 @@
                 // block method
                 if ($start_tag) {
                     $prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
-                    $prefix .= "\$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], null, \$this, \$_block_repeat=true); ";
+                    $prefix .= "\$_block_repeat=true; \$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], null, \$this, \$_block_repeat); ";
                     $prefix .= "while (\$_block_repeat) { ob_start();";
                     $return = null;
                     $postfix = '';
             } else {
-                    $prefix = "\$this->_obj_block_content = ob_get_contents(); ob_end_clean(); ";
-                    $return = "\$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], \$this->_obj_block_content, \$this, \$_block_repeat=false)";
+                    $prefix = "\$_obj_block_content = ob_get_contents(); ob_end_clean(); ";
+                    $return = "\$_block_repeat=false; \$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], \$_obj_block_content, \$this, \$_block_repeat)";
                     $postfix = "} array_pop(\$this->_tag_stack);";
                 }
             } else {
@@ -924,7 +943,7 @@
 
         $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
 
-        return "<?php require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
     }
 
     /**
@@ -1008,7 +1027,7 @@
 
         $_params = "array('smarty_file' => " . $attrs['file'] . ", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
 
-        return "<?php require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
     }
 
 
@@ -1159,19 +1178,15 @@
         }
 
         $output = '<?php ';
+        $output .= "\$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array'); }";
         if (isset($name)) {
             $foreach_props = "\$this->_foreach[$name]";
-            $output .= "if (isset(\$this->_foreach[$name])) unset(\$this->_foreach[$name]);\n";
-            $output .= "{$foreach_props}['total'] = count(\$_from = (array)$from);\n";
-            $output .= "{$foreach_props}['show'] = {$foreach_props}['total'] > 0;\n";
-            $output .= "if ({$foreach_props}['show']):\n";
-            $output .= "{$foreach_props}['iteration'] = 0;\n";
+            $output .= "{$foreach_props} = array('total' => count(\$_from), 'iteration' => 0);\n";
+            $output .= "if ({$foreach_props}['total'] > 0):\n";
             $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
             $output .= "        {$foreach_props}['iteration']++;\n";
-            $output .= "        {$foreach_props}['first'] = ({$foreach_props}['iteration'] == 1);\n";
-            $output .= "        {$foreach_props}['last']  = ({$foreach_props}['iteration'] == {$foreach_props}['total']);\n";
         } else {
-            $output .= "if (count(\$_from = (array)$from)):\n";
+            $output .= "if (count(\$_from)):\n";
             $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
         }
         $output .= '?>';
@@ -1237,6 +1252,13 @@
 
         $tokens = $match[0];
 
+        if(empty($tokens)) {
+            $_error_msg .= $elseif ? "'elseif'" : "'if'";
+            $_error_msg .= ' statement requires arguments'; 
+            $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
+        }
+            
+                
         // make sure we have balanced parenthesis
         $token_count = array_count_values($tokens);
         if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
@@ -1359,6 +1381,9 @@
                                !in_array($token, $this->security_settings['IF_FUNCS'])) {
                                 $this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
                             }
+                    } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
+                        // variable function call
+                        $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);                      
                     } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
                         // object or variable
                         $token = $this->_parse_var_props($token);
@@ -1528,7 +1553,7 @@
                             $token = 'false';
                         } else if ($token == 'null') {
                             $token = 'null';
-                        } else if (preg_match('~^-?([0-9]+|0[xX][0-9a-fA-F]+)$~', $token)) {
+                        } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
                             /* treat integer literally */
                         } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
                             /* treat as a string, double-quote it escaping quotes */
@@ -1627,7 +1652,7 @@
             }
         elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
             // literal string
-            return $this->_expand_quoted_text('"' . $val .'"');
+            return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
         }
         return $val;
     }
@@ -1641,7 +1666,7 @@
     function _expand_quoted_text($var_expr)
     {
         // if contains unescaped $, expand it
-        if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
+        if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
             $_match = $_match[0];
             rsort($_match);
             reset($_match);
@@ -1707,7 +1732,7 @@
         }
 
         // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric($var_expr{0}))
+        if(is_numeric(substr($var_expr, 0, 1)))
             $_var_ref = $var_expr;
         else
             $_var_ref = substr($var_expr, 1);
@@ -1733,7 +1758,7 @@
                     $_var_name = substr(array_shift($_indexes), 1);
                     $_output = "\$this->_smarty_vars['$_var_name']";
                 }
-            } elseif(is_numeric($_var_name) && is_numeric($var_expr{0})) {
+            } elseif(is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
                 // because . is the operator for accessing arrays thru inidizes we need to put it together again for floating point numbers
                 if(count($_indexes) > 0)
                 {
@@ -1746,11 +1771,11 @@
             }
 
             foreach ($_indexes as $_index) {
-                if ($_index{0} == '[') {
+                if (substr($_index, 0, 1) == '[') {
                     $_index = substr($_index, 1, -1);
                     if (is_numeric($_index)) {
                         $_output .= "[$_index]";
-                    } elseif ($_index{0} == '$') {
+                    } elseif (substr($_index, 0, 1) == '$') {
                         if (strpos($_index, '.') !== false) {
                             $_output .= '[' . $this->_parse_var($_index) . ']';
                         } else {
@@ -1762,8 +1787,8 @@
                         $_var_section_prop = isset($_var_parts[1]) ? $_var_parts[1] : 'index';
                         $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
                     }
-                } else if ($_index{0} == '.') {
-                    if ($_index{1} == '$')
+                } else if (substr($_index, 0, 1) == '.') {
+                    if (substr($_index, 1, 1) == '$')
                         $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
                     else
                         $_output .= "['" . substr($_index, 1) . "']";
@@ -1772,7 +1797,7 @@
                         $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                     } elseif($this->security && substr($_index, 2, 1) == '_') {
                         $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif ($_index{2} == '$') {
+                    } elseif (substr($_index, 2, 1) == '$') {
                         if ($this->security) {
                             $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                         } else {
@@ -1781,7 +1806,7 @@
                     } else {
                         $_output .= $_index;
                     }
-                } elseif ($_index{0} == '(') {
+                } elseif (substr($_index, 0, 1) == '(') {
                     $_index = $this->_parse_parenth_args($_index);
                     $_output .= $_index;
                 } else {
@@ -1878,7 +1903,7 @@
             preg_match_all('~:(' . $this->_qstr_regexp . '|[^:]+)~', $modifier_arg_strings[$_i], $_match);
             $_modifier_args = $_match[1];
 
-            if ($_modifier_name{0} == '@') {
+            if (substr($_modifier_name, 0, 1) == '@') {
                 $_map_array = false;
                 $_modifier_name = substr($_modifier_name, 1);
             } else {
@@ -1900,10 +1925,10 @@
 
             if($_modifier_name == 'default') {
                 // supress notifications of default modifier vars and args
-                if($output{0} == '$') {
+                if(substr($output, 0, 1) == '$') {
                     $output = '@' . $output;
                 }
-                if(isset($_modifier_args[0]) && $_modifier_args[0]{0} == '$') {
+                if(isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
                     $_modifier_args[0] = '@' . $_modifier_args[0];
                 }
             }
@@ -1955,7 +1980,7 @@
         /* Extract the reference name. */
         $_ref = substr($indexes[0], 1);
         foreach($indexes as $_index_no=>$_index) {
-            if ($_index{0} != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
+            if (substr($_index, 0, 1) != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
                 $this->_syntax_error('$smarty' . implode('', array_slice($indexes, 0, 2)) . ' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
             }
         }
@@ -1967,13 +1992,41 @@
                 break;
 
             case 'foreach':
+                array_shift($indexes);
+                $_var = $this->_parse_var_props(substr($indexes[0], 1));
+                $_propname = substr($indexes[1], 1);
+                $_max_index = 1;
+                switch ($_propname) {
+                    case 'index':
+                        array_shift($indexes);
+                        $compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
+                        break;
+                        
+                    case 'first':
+                        array_shift($indexes);
+                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
+                        break;
+
+                    case 'last':
+                        array_shift($indexes);
+                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
+                        break;
+                        
+                    case 'show':
+                        array_shift($indexes);
+                        $compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
+                        break;
+                        
+                    default:
+                        unset($_max_index);
+                        $compiled_ref = "\$this->_foreach[$_var]";
+                }
+                break;
+
             case 'section':
                 array_shift($indexes);
                 $_var = $this->_parse_var_props(substr($indexes[0], 1));
-                if ($_ref == 'foreach')
-                    $compiled_ref = "\$this->_foreach[$_var]";
-                else
-                    $compiled_ref = "\$this->_sections[$_var]";
+                $compiled_ref = "\$this->_sections[$_var]";
                 break;
 
             case 'get':
@@ -2033,8 +2086,12 @@
                     return;
                 }
                 array_shift($indexes);
-                $_val = $this->_parse_var_props(substr($indexes[0],1));
-                $compiled_ref = '@constant(' . $_val . ')';
+                if (preg_match('!^\.\w+$!', $indexes[0])) {
+                    $compiled_ref = '@' . substr($indexes[0], 1);
+                } else {
+                    $_val = $this->_parse_var_props(substr($indexes[0], 1));
+                    $compiled_ref = '@constant(' . $_val . ')';
+                }
                 $_max_index = 1;
                 break;
 
@@ -2105,7 +2162,7 @@
                 if ($prefilter === false) {
                     unset($this->_plugins['prefilter'][$filter_name]);
                     $_params = array('plugins' => array(array('prefilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2115,7 +2172,7 @@
                 if ($postfilter === false) {
                     unset($this->_plugins['postfilter'][$filter_name]);
                     $_params = array('plugins' => array(array('postfilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2159,9 +2216,9 @@
         if ($_cacheable
             || 0<$this->_cacheable_state++) return '';
         if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
-        $_ret = 'if ($this->caching) { echo \'{nocache:'
+        $_ret = 'if ($this->caching && !$this->_cache_including) { echo \'{nocache:'
             . $this->_cache_serial . '#' . $this->_nocache_count
-            . '}\';}';
+            . '}\'; };';
         return $_ret;
     }
 
@@ -2176,9 +2233,9 @@
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
             || --$this->_cacheable_state>0) return '';
-        return 'if ($this->caching) { echo \'{/nocache:'
+        return 'if ($this->caching && !$this->_cache_including) { echo \'{/nocache:'
             . $this->_cache_serial . '#' . ($this->_nocache_count++)
-            . '}\';}';
+            . '}\'; };';
     }
 
 
Index: xoops2jp/html/class/smarty/debug.tpl
diff -u xoops2jp/html/class/smarty/debug.tpl:1.2 xoops2jp/html/class/smarty/debug.tpl:1.2.16.1
--- xoops2jp/html/class/smarty/debug.tpl:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/smarty/debug.tpl	Tue Apr 11 22:02:45 2006
@@ -36,7 +36,7 @@
 	   var title = 'Console_' + self.name;
 	{rdelim}
 	_smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
-	_smarty_console.document.write("<HTML><TITLE>Smarty Debug Console_"+self.name+"</TITLE><BODY bgcolor=#ffffff>");
+	_smarty_console.document.write("<HTML><HEAD><TITLE>Smarty Debug Console_"+self.name+"</TITLE></HEAD><BODY bgcolor=#ffffff>");
 	_smarty_console.document.write("<table border=0 width=100%>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>");

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:02:45 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:02:45 +0900
Subject: [xoops-cvslog 2772] CVS update: xoops2jp/html/class/smarty/core
Message-ID: <20060411130245.98EAF2AC05A@users.sourceforge.jp>

Index: xoops2jp/html/class/smarty/core/core.assemble_plugin_filepath.php
diff -u xoops2jp/html/class/smarty/core/core.assemble_plugin_filepath.php:1.1 xoops2jp/html/class/smarty/core/core.assemble_plugin_filepath.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.assemble_plugin_filepath.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.assemble_plugin_filepath.php	Tue Apr 11 22:02:45 2006
@@ -50,7 +50,7 @@
                 $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename;
 
                 $_params = array('file_path' => $_plugin_filepath);
-                require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php');
+                require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
                 if(smarty_core_get_include_path($_params, $smarty)) {
                     $_return = $_params['new_file_path'];
                     break;
Index: xoops2jp/html/class/smarty/core/core.create_dir_structure.php
diff -u xoops2jp/html/class/smarty/core/core.create_dir_structure.php:1.1 xoops2jp/html/class/smarty/core/core.create_dir_structure.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.create_dir_structure.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.create_dir_structure.php	Tue Apr 11 22:02:45 2006
@@ -22,7 +22,7 @@
             /* unix-style paths */
             $_dir = $params['dir'];
             $_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY);
-            $_new_dir = ($_dir{0}=='/') ? '/' : getcwd().'/';
+            $_new_dir = (substr($_dir, 0, 1)=='/') ? '/' : getcwd().'/';
             if($_use_open_basedir = !empty($_open_basedir_ini)) {
                 $_open_basedirs = explode(':', $_open_basedir_ini);
             }
Index: xoops2jp/html/class/smarty/core/core.display_debug_console.php
diff -u xoops2jp/html/class/smarty/core/core.display_debug_console.php:1.1 xoops2jp/html/class/smarty/core/core.display_debug_console.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.display_debug_console.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.display_debug_console.php	Tue Apr 11 22:02:45 2006
@@ -23,7 +23,7 @@
         // set path to debug template from SMARTY_DIR
         $smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
         if($smarty->security && is_file($smarty->debug_tpl)) {
-            $smarty->secure_dir[] = dirname(realpath($smarty->debug_tpl));
+            $smarty->secure_dir[] = realpath($smarty->debug_tpl);
         }
         $smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
     }
Index: xoops2jp/html/class/smarty/core/core.get_php_resource.php
diff -u xoops2jp/html/class/smarty/core/core.get_php_resource.php:1.1 xoops2jp/html/class/smarty/core/core.get_php_resource.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.get_php_resource.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.get_php_resource.php	Tue Apr 11 22:02:45 2006
@@ -32,7 +32,7 @@
         } else {
             // test for file in include_path
             $_params = array('file_path' => $params['resource_name']);
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
             if(smarty_core_get_include_path($_params, $smarty)) {
                 $_include_path = $_params['new_file_path'];
                 $_readable = true;
@@ -56,7 +56,7 @@
 
     if ($_readable) {
         if ($smarty->security) {
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.is_trusted.php');
+            require_once(SMARTY_CORE_DIR . 'core.is_trusted.php');
             if (!smarty_core_is_trusted($params, $smarty)) {
                 $smarty->$_error_funcc('(secure mode) ' . $params['resource_type'] . ':' . $params['resource_name'] . ' is not trusted');
                 return false;
Index: xoops2jp/html/class/smarty/core/core.is_secure.php
diff -u xoops2jp/html/class/smarty/core/core.is_secure.php:1.1 xoops2jp/html/class/smarty/core/core.is_secure.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.is_secure.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.is_secure.php	Tue Apr 11 22:02:45 2006
@@ -27,18 +27,21 @@
             foreach ((array)$params['resource_base_path'] as $curr_dir) {
                 if ( ($_cd = realpath($curr_dir)) !== false &&
                      strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                     $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
+                     substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
                     return true;
                 }
             }
         }
         if (!empty($smarty->secure_dir)) {
             foreach ((array)$smarty->secure_dir as $curr_dir) {
-                if ( ($_cd = realpath($curr_dir)) !== false &&
-                     strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                     $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
-                    return true;
-                }            
+                if ( ($_cd = realpath($curr_dir)) !== false) {
+                    if($_cd == $_rp) {
+                        return true;
+                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
+                        substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR) {
+                        return true;
+                    }
+                }
             }
         }
     } else {
Index: xoops2jp/html/class/smarty/core/core.is_trusted.php
diff -u xoops2jp/html/class/smarty/core/core.is_trusted.php:1.1 xoops2jp/html/class/smarty/core/core.is_trusted.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.is_trusted.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.is_trusted.php	Tue Apr 11 22:02:45 2006
@@ -25,7 +25,7 @@
                 if (!empty($curr_dir) && is_readable ($curr_dir)) {
                     $_cd = realpath($curr_dir);
                     if (strncmp($_rp, $_cd, strlen($_cd)) == 0
-                        && $_rp{strlen($_cd)} == DIRECTORY_SEPARATOR ) {
+                        && substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
                         $_smarty_trusted = true;
                         break;
                     }
Index: xoops2jp/html/class/smarty/core/core.process_cached_inserts.php
diff -u xoops2jp/html/class/smarty/core/core.process_cached_inserts.php:1.1 xoops2jp/html/class/smarty/core/core.process_cached_inserts.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.process_cached_inserts.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.process_cached_inserts.php	Tue Apr 11 22:02:45 2006
@@ -20,7 +20,7 @@
     for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) {
         if ($smarty->debugging) {
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $debug_start_time = smarty_core_get_microtime($_params, $smarty);
         }
 
@@ -29,7 +29,7 @@
 
         if (isset($args['script'])) {
             $_params = array('resource_name' => $smarty->_dequote($args['script']));
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
             if(!smarty_core_get_php_resource($_params, $smarty)) {
                 return false;
             }
@@ -52,10 +52,10 @@
             $replace = '';
         }
 
-        $params['results'] = str_replace($cached_inserts[$i], $replace, $params['results']);
+        $params['results'] = substr_replace($params['results'], $replace, strpos($params['results'], $cached_inserts[$i]), strlen($cached_inserts[$i]));
         if ($smarty->debugging) {
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $smarty->_smarty_debug_info[] = array('type'      => 'insert',
                                                 'filename'  => 'insert_'.$name,
                                                 'depth'     => $smarty->_inclusion_depth,
Index: xoops2jp/html/class/smarty/core/core.process_compiled_include.php
diff -u xoops2jp/html/class/smarty/core/core.process_compiled_include.php:1.1 xoops2jp/html/class/smarty/core/core.process_compiled_include.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.process_compiled_include.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.process_compiled_include.php	Tue Apr 11 22:02:45 2006
@@ -20,6 +20,11 @@
     $smarty->_cache_including = true;
 
     $_return = $params['results'];
+
+    foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
+        $smarty->_include($_include_file_path, true);
+    }
+
     foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
         $_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
                                          array(&$smarty, '_process_compiled_include_callback'),
Index: xoops2jp/html/class/smarty/core/core.read_cache_file.php
diff -u xoops2jp/html/class/smarty/core/core.read_cache_file.php:1.1 xoops2jp/html/class/smarty/core/core.read_cache_file.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.read_cache_file.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.read_cache_file.php	Tue Apr 11 22:02:45 2006
@@ -48,10 +48,11 @@
         return false;
     }
 
-    $cache_split = explode("\n", $params['results'], 2);
-    $cache_header = $cache_split[0];
-
-    $_cache_info = unserialize($cache_header);
+    $_contents = $params['results'];
+    $_info_start = strpos($_contents, "\n") + 1;
+    $_info_len = (int)substr($_contents, 0, $_info_start - 1);
+    $_cache_info = unserialize(substr($_contents, $_info_start, $_info_len));
+    $params['results'] = substr($_contents, $_info_start + $_info_len);
 
     if ($smarty->caching == 2 && isset ($_cache_info['expires'])){
         // caching by expiration time
@@ -89,17 +90,6 @@
         }
     }
 
-    foreach ($_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
-        if (empty($smarty->_cache_serials[$_include_file_path])) {
-            $smarty->_include($_include_file_path, true);
-        }
-
-        if ($smarty->_cache_serials[$_include_file_path] != $_cache_serial) {
-            /* regenerate */
-            return false;
-        }
-    }
-    $params['results'] = $cache_split[1];
     $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info);
 
     $smarty->_cache_info = $_cache_info;
Index: xoops2jp/html/class/smarty/core/core.rm_auto.php
diff -u xoops2jp/html/class/smarty/core/core.rm_auto.php:1.1 xoops2jp/html/class/smarty/core/core.rm_auto.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.rm_auto.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.rm_auto.php	Tue Apr 11 22:02:45 2006
@@ -28,7 +28,7 @@
             'level' => 0,
             'exp_time' => $params['exp_time']
         );
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php');
+        require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
         $_res = smarty_core_rmdir($_params, $smarty);
     } else {
         $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']);
@@ -47,7 +47,7 @@
                 'level' => 1,
                 'exp_time' => $params['exp_time']
             );
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php');
+            require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
             $_res = smarty_core_rmdir($_params, $smarty);
         } else {
             // remove matching file names
Index: xoops2jp/html/class/smarty/core/core.rmdir.php
diff -u xoops2jp/html/class/smarty/core/core.rmdir.php:1.1 xoops2jp/html/class/smarty/core/core.rmdir.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.rmdir.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.rmdir.php	Tue Apr 11 22:02:45 2006
@@ -32,7 +32,6 @@
                         'level' => $params['level'] + 1,
                         'exp_time' => $params['exp_time']
                     );
-                    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rmdir.php');
                     smarty_core_rmdir($_params, $smarty);
                 }
                 else {
Index: xoops2jp/html/class/smarty/core/core.run_insert_handler.php
diff -u xoops2jp/html/class/smarty/core/core.run_insert_handler.php:1.1 xoops2jp/html/class/smarty/core/core.run_insert_handler.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.run_insert_handler.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.run_insert_handler.php	Tue Apr 11 22:02:45 2006
@@ -14,7 +14,7 @@
 function smarty_core_run_insert_handler($params, &$smarty)
 {
 
-    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+    require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
     if ($smarty->debugging) {
         $_params = array();
         $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
@@ -34,7 +34,7 @@
     } else {
         if (isset($params['args']['script'])) {
             $_params = array('resource_name' => $smarty->_dequote($params['args']['script']));
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
             if(!smarty_core_get_php_resource($_params, $smarty)) {
                 return false;
             }
@@ -51,7 +51,7 @@
         $_content = $_funcname($params['args'], $smarty);
         if ($smarty->debugging) {
             $_params = array();
-            require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
             $smarty->_smarty_debug_info[] = array('type'      => 'insert',
                                                 'filename'  => 'insert_'.$params['args']['name'],
                                                 'depth'     => $smarty->_inclusion_depth,
Index: xoops2jp/html/class/smarty/core/core.smarty_include_php.php
diff -u xoops2jp/html/class/smarty/core/core.smarty_include_php.php:1.1 xoops2jp/html/class/smarty/core/core.smarty_include_php.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.smarty_include_php.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.smarty_include_php.php	Tue Apr 11 22:02:45 2006
@@ -21,7 +21,7 @@
 function smarty_core_smarty_include_php($params, &$smarty)
 {
     $_params = array('resource_name' => $params['smarty_file']);
-    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_php_resource.php');
+    require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
     smarty_core_get_php_resource($_params, $smarty);
     $_smarty_resource_type = $_params['resource_type'];
     $_smarty_php_resource = $_params['php_resource'];
Index: xoops2jp/html/class/smarty/core/core.write_cache_file.php
diff -u xoops2jp/html/class/smarty/core/core.write_cache_file.php:1.1 xoops2jp/html/class/smarty/core/core.write_cache_file.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.write_cache_file.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.write_cache_file.php	Tue Apr 11 22:02:45 2006
@@ -31,16 +31,39 @@
         $smarty->_cache_info['expires'] = -1;
     }
 
-    // collapse {nocache...}-tags
-    $params['results'] = preg_replace('!((\{nocache\:([0-9a-f]{32})#(\d+)\})'
-                                      .'.*'
-                                      .'{/nocache\:\\3#\\4\})!Us'
-                                      ,'\\2'
-                                      ,$params['results']);
+    // collapse nocache.../nocache-tags
+    if (preg_match_all('!\{(/?)nocache\:[0-9a-f]{32}#\d+\}!', $params['results'], $match, PREG_PATTERN_ORDER)) {
+        // remove everything between every pair of outermost noache.../nocache-tags
+        // and replace it by a single nocache-tag
+        // this new nocache-tag will be replaced by dynamic contents in
+        // smarty_core_process_compiled_includes() on a cache-read
+        
+        $match_count = count($match[0]);
+        $results = preg_split('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!', $params['results'], -1, PREG_SPLIT_DELIM_CAPTURE);
+        
+        $level = 0;
+        $j = 0;
+        for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) {
+            if ($results[$i] == $match[0][$j]) {
+                // nocache tag
+                if ($match[1][$j]) { // closing tag
+                    $level--;
+                    unset($results[$i]);
+                } else { // opening tag
+                    if ($level++ > 0) unset($results[$i]);
+                }
+                $j++;
+            } elseif ($level > 0) {
+                unset($results[$i]);
+            }
+        }
+        $params['results'] = implode('', $results);
+    }
     $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials;
 
     // prepend the cache header info into cache file
-    $params['results'] = serialize($smarty->_cache_info)."\n".$params['results'];
+    $_cache_info = serialize($smarty->_cache_info);
+    $params['results'] = strlen($_cache_info) . "\n" . $_cache_info . $params['results'];
 
     if (!empty($smarty->cache_handler_func)) {
         // use cache_handler function
@@ -62,7 +85,7 @@
         $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
         $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
         $_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true);
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php');
+        require_once(SMARTY_CORE_DIR . 'core.write_file.php');
         smarty_core_write_file($_params, $smarty);
         return true;
     }
Index: xoops2jp/html/class/smarty/core/core.write_compiled_include.php
diff -u xoops2jp/html/class/smarty/core/core.write_compiled_include.php:1.1 xoops2jp/html/class/smarty/core/core.write_compiled_include.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.write_compiled_include.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.write_compiled_include.php	Tue Apr 11 22:02:45 2006
@@ -15,8 +15,8 @@
 
 function smarty_core_write_compiled_include($params, &$smarty)
 {
-    $_tag_start = 'if \(\$this->caching\) \{ echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\';\}';
-    $_tag_end   = 'if \(\$this->caching\) \{ echo \'\{/nocache\:(\\2)#(\\3)\}\';\}';
+    $_tag_start = 'if \(\$this->caching && \!\$this->_cache_including\) \{ echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\'; \};';
+    $_tag_end   = 'if \(\$this->caching && \!\$this->_cache_including\) \{ echo \'\{/nocache\:(\\2)#(\\3)\}\'; \};';
 
     preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
                    $params['compiled_content'], $_match_source, PREG_SET_ORDER);
@@ -25,7 +25,8 @@
     if (count($_match_source)==0) return;
 
     // convert the matched php-code to functions
-    $_include_compiled = "<?php /* funky header here */\n\n";
+    $_include_compiled =  "<?php /* Smarty version ".$smarty->_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
+    $_include_compiled .= "         compiled from " . strtr(urlencode($params['resource_name']), array('%2F'=>'/', '%3A'=>':')) . " */\n\n";
 
     $_compile_path = $params['include_file_path'];
 
@@ -42,7 +43,19 @@
         if ($this_varname == '_smarty') {
             /* rename $this to $_smarty in the sourcecode */
             $tokens = token_get_all('<?php ' . $_match[4]);
-            array_shift($tokens); /* remove the opening <.?.php */
+
+            /* remove trailing <?php */
+            $open_tag = '';
+            while ($tokens) {
+                $token = array_shift($tokens);
+                if (is_array($token)) {
+                    $open_tag .= $token[1];
+                } else {
+                    $open_tag .= $token;
+                }
+                if ($open_tag == '<?php ') break;
+            }
+
             for ($i=0, $count = count($tokens); $i < $count; $i++) {
                 if (is_array($tokens[$i])) {
                     if ($tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$this') {
@@ -69,7 +82,7 @@
     $_params = array('filename' => $_compile_path,
                      'contents' => $_include_compiled, 'create_dirs' => true);
 
-    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php');
+    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
     smarty_core_write_file($_params, $smarty);
     return true;
 }
Index: xoops2jp/html/class/smarty/core/core.write_compiled_resource.php
diff -u xoops2jp/html/class/smarty/core/core.write_compiled_resource.php:1.1 xoops2jp/html/class/smarty/core/core.write_compiled_resource.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.write_compiled_resource.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.write_compiled_resource.php	Tue Apr 11 22:02:45 2006
@@ -25,7 +25,7 @@
     }
 
     $_params = array('filename' => $params['compile_path'], 'contents' => $params['compiled_content'], 'create_dirs' => true);
-    require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.write_file.php');
+    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
     smarty_core_write_file($_params, $smarty);
     return true;
 }
Index: xoops2jp/html/class/smarty/core/core.write_file.php
diff -u xoops2jp/html/class/smarty/core/core.write_file.php:1.1 xoops2jp/html/class/smarty/core/core.write_file.php:1.1.16.1
--- xoops2jp/html/class/smarty/core/core.write_file.php:1.1	Fri Mar 18 21:56:02 2005
+++ xoops2jp/html/class/smarty/core/core.write_file.php	Tue Apr 11 22:02:45 2006
@@ -19,7 +19,7 @@
 
     if ($params['create_dirs']) {
         $_params = array('dir' => $_dirname);
-        require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.create_dir_structure.php');
+        require_once(SMARTY_CORE_DIR . 'core.create_dir_structure.php');
         smarty_core_create_dir_structure($_params, $smarty);
     }
 

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:04:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:04:04 +0900
Subject: [xoops-cvslog 2773] CVS update: xoops2jp/html/class/mail/phpmailer
Message-ID: <20060411130404.1E6C32AC05A@users.sourceforge.jp>

Index: xoops2jp/html/class/mail/phpmailer/ChangeLog.txt
diff -u xoops2jp/html/class/mail/phpmailer/ChangeLog.txt:1.1 xoops2jp/html/class/mail/phpmailer/ChangeLog.txt:1.1.16.1
--- xoops2jp/html/class/mail/phpmailer/ChangeLog.txt:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/html/class/mail/phpmailer/ChangeLog.txt	Tue Apr 11 22:04:03 2006
@@ -1,5 +1,35 @@
 ChangeLog
 
+Version 1.73 (Sun, Jun 10 2005)
+* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
+* Now has a total of 20 translations
+* Fixed alt attachments bug: http://tinyurl.com/98u9k
+
+Version 1.72 (Wed, May 25 2004)
+* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
+* Received: Removed this method because spam filter programs like 
+SpamAssassin reject this header.
+* Fixed error count bug.
+* SetLanguage default is now "language/".
+* Fixed magic_quotes_runtime bug.
+
+Version 1.71 (Tue, Jul 28 2003)
+* Made several speed enhancements
+* Added German and Italian translation files
+* Fixed HELO/AUTH bugs on keep-alive connects
+* Now provides an error message if language file does not load
+* Fixed attachment EOL bug
+* Updated some unclear documentation
+* Added additional tests and improved others
+
+Version 1.70 (Mon, Jun 20 2003)
+* Added SMTP keep-alive support
+* Added IsError method for error detection
+* Added error message translation support (SetLanguage)
+* Refactored many methods to increase library performance
+* Hello now sends the newer EHLO message before HELO as per RFC 2821
+* Removed the boundary class and replaced it with GetBoundary
+* Removed queue support methods
 * New $Hostname variable
 * New Message-ID header
 * Received header reformat
@@ -10,6 +40,7 @@
 * quoted-encoding should now encode NULs \000
 * Fixed encoding of body/AltBody (#553370)
 * Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
+* Multiple bug fixes
 
 Version 1.65 (Fri, Aug 09 2002)
 * Fixed non-visible attachment bug (#585097) for Outlook
Index: xoops2jp/html/class/mail/phpmailer/README
diff -u xoops2jp/html/class/mail/phpmailer/README:1.1 xoops2jp/html/class/mail/phpmailer/README:1.1.16.1
--- xoops2jp/html/class/mail/phpmailer/README:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/html/class/mail/phpmailer/README	Tue Apr 11 22:04:03 2006
@@ -1,9 +1,11 @@
-phpmailer - PHP email class
-==============================
-http://phpmailer.sourceforge.net
+PHPMailer
+Full Featured Email Transfer Class for PHP
+==========================================
 
-Please read LICENSE for information on this softwares availability and
-distribution.
+http://phpmailer.sourceforge.net/
+
+This software is licenced under the LGPL.  Please read LICENSE for information on the
+software availability and distribution.
 
 Class Features:
 - Send emails with multiple TOs, CCs, BCCs and REPLY-TOs
@@ -12,8 +14,8 @@
 - Support for 8bit, base64, binary, and quoted-printable encoding
 - Uses the same methods as the very popular AspEmail active server (COM) component
 - SMTP authentication
-- Word wrap
-- Many more...
+- Native language support
+- Word wrap, and more!
 
 Why you might need it:
 
@@ -37,19 +39,34 @@
 
 Copy class.phpmailer.php into your php.ini include_path. If you are
 using the SMTP mailer then place class.smtp.php in your path as well.
+In the language directory you will find several files like 
+phpmailer.lang-en.php.  If you look right before the .php extension 
+that there are two letters.  These represent the language type of the 
+translation file.  For instance "en" is the English file and "br" is 
+the Portuguese file.  Chose the file that best fits with your language 
+and place it in the PHP include path.  If your language is English 
+then you have nothing more to do.  If it is a different language then 
+you must point PHPMailer to the correct translation.  To do this, call 
+the PHPMailer SetLanguage method like so:
+
+// To load the Portuguese version
+$mail->SetLanguage("br", "/optional/path/to/language/directory/");
+
+That's it.  You should now be ready to use PHPMailer!
+
 
-Example
+A Simple Example:
 
 <?php
 require("class.phpmailer.php");
 
-$mail = new phpmailer();
+$mail = new PHPMailer();
 
 $mail->IsSMTP();                                      // set mailer to use SMTP
 $mail->Host = "smtp1.example.com;smtp2.example.com";  // specify main and backup server
-$mail->SMTPAuth = true     // turn on SMTP authentication
-$mail->Username = "jswan"  // SMTP username
-$mail->Password = "secret" // SMTP password
+$mail->SMTPAuth = true;     // turn on SMTP authentication
+$mail->Username = "jswan";  // SMTP username
+$mail->Password = "secret"; // SMTP password
 
 $mail->From = "from ＠ example.com";
 $mail->FromName = "Mailer";
@@ -82,4 +99,4 @@
 
 Download: http://sourceforge.net/project/showfiles.php?group_id=26031
 
-Brent R. Matzelle <bmatzelle ＠ yahoo.com>
+Brent R. Matzelle
Index: xoops2jp/html/class/mail/phpmailer/class.phpmailer.php
diff -u xoops2jp/html/class/mail/phpmailer/class.phpmailer.php:1.1 xoops2jp/html/class/mail/phpmailer/class.phpmailer.php:1.1.16.1
--- xoops2jp/html/class/mail/phpmailer/class.phpmailer.php:1.1	Thu Sep  9 14:14:50 2004
+++ xoops2jp/html/class/mail/phpmailer/class.phpmailer.php	Tue Apr 11 22:04:03 2006
@@ -1,23 +1,23 @@
 <?php
 ////////////////////////////////////////////////////
-// phpmailer - PHP email class
-//
-// Version 1.65, Created 08/09/2002
+// PHPMailer - PHP email class
 //
 // Class for sending email using either
 // sendmail, PHP mail(), or SMTP.  Methods are
 // based upon the standard AspEmail(tm) classes.
 //
-// Author: Brent R. Matzelle <bmatzelle ＠ yahoo.com>
+// Copyright (C) 2001 - 2003  Brent R. Matzelle
 //
 // License: LGPL, see LICENSE
 ////////////////////////////////////////////////////
 
 /**
- * phpmailer - PHP email transport class
+ * PHPMailer - PHP email transport class
+ * @package PHPMailer
  * @author Brent R. Matzelle
+ * @copyright 2001 - 2003 Brent R. Matzelle
  */
-class phpmailer
+class PHPMailer
 {
     /////////////////////////////////////////////////
     // PUBLIC VARIABLES
@@ -25,21 +25,18 @@
 
     /**
      * Email priority (1 = High, 3 = Normal, 5 = low).
-     * @access public
      * @var int
      */
     var $Priority          = 3;
 
     /**
      * Sets the CharSet of the message.
-     * @access public
      * @var string
      */
     var $CharSet           = "iso-8859-1";
 
     /**
      * Sets the Content-type of the message.
-     * @access public
      * @var string
      */
     var $ContentType        = "text/plain";
@@ -47,43 +44,37 @@
     /**
      * Sets the Encoding of the message. Options for this are "8bit",
      * "7bit", "binary", "base64", and "quoted-printable".
-     * @access public
      * @var string
      */
     var $Encoding          = "8bit";
 
     /**
      * Holds the most recent mailer error message.
-     * @access public
      * @var string
      */
     var $ErrorInfo         = "";
 
     /**
      * Sets the From email address for the message.
-     * @access public
      * @var string
      */
     var $From               = "root ＠ localhost";
 
     /**
      * Sets the From name of the message.
-     * @access public
      * @var string
      */
     var $FromName           = "Root User";
 
     /**
-     * Sets the Sender email of the message. If not empty, will be sent via -f to sendmail
-     * or as 'MAIL FROM' in smtp mode.
-     * @access public
+     * Sets the Sender email (Return-Path) of the message.  If not empty,
+     * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
      * @var string
      */
     var $Sender            = "";
 
     /**
      * Sets the Subject of the message.
-     * @access public
      * @var string
      */
     var $Subject           = "";
@@ -91,7 +82,6 @@
     /**
      * Sets the Body of the message.  This can be either an HTML or text body.
      * If HTML then run IsHTML(true).
-     * @access public
      * @var string
      */
     var $Body               = "";
@@ -101,7 +91,6 @@
      * email to multipart/alternative.  This body can be read by mail
      * clients that do not have HTML email capability such as mutt. Clients
      * that can read HTML will view the normal Body.
-     * @access public
      * @var string
      */
     var $AltBody           = "";
@@ -109,72 +98,49 @@
     /**
      * Sets word wrapping on the body of the message to a given number of 
      * characters.
-     * @access public
      * @var int
      */
     var $WordWrap          = 0;
 
     /**
      * Method to send mail: ("mail", "sendmail", or "smtp").
-     * @access public
      * @var string
      */
     var $Mailer            = "mail";
 
     /**
      * Sets the path of the sendmail program.
-     * @access public
      * @var string
      */
     var $Sendmail          = "/usr/sbin/sendmail";
-
-    /**
-     *  Turns Microsoft mail client headers on and off.  Useful mostly
-     *  for older clients.
-     *  @access public
-     *  @var bool
-     */
-    var $UseMSMailHeaders = false;
     
     /**
-     * Path to phpmailer plugins.  This is now only useful if the SMTP class 
+     * Path to PHPMailer plugins.  This is now only useful if the SMTP class 
      * is in a different directory than the PHP include path.  
-     * @access public
      * @var string
      */
     var $PluginDir         = "";
 
     /**
-     *  Holds phpmailer version.
-     *  @access public
+     *  Holds PHPMailer version.
      *  @var string
      */
-    var $Version           = "1.65";
+    var $Version           = "1.73";
 
     /**
      * Sets the email address that a reading confirmation will be sent.
-     * @access public
      * @var string
      */
     var $ConfirmReadingTo  = "";
 
     /**
-     *  Sets the line endings of the message.
-     *  @access public
-     *  @var string
-     */
-    var $LE           = "\n";
-
-    /**
      *  Sets the hostname to use in Message-Id and Received headers
      *  and as default HELO string. If empty, the value returned
      *  by SERVER_NAME is used or 'localhost.localdomain'.
-     *  @access public
      *  @var string
      */
     var $Hostname          = "";
 
-
     /////////////////////////////////////////////////
     // SMTP VARIABLES
     /////////////////////////////////////////////////
@@ -185,42 +151,36 @@
      *  for each host by using this format: [hostname:port]
      *  (e.g. "smtp1.example.com:25;smtp2.example.com").
      *  Hosts will be tried in order.
-     *  @access public
      *  @var string
      */
     var $Host        = "localhost";
 
     /**
      *  Sets the default SMTP server port.
-     *  @access public
      *  @var int
      */
     var $Port        = 25;
 
     /**
      *  Sets the SMTP HELO of the message (Default is $Hostname).
-     *  @access public
      *  @var string
      */
     var $Helo        = "";
 
     /**
      *  Sets SMTP authentication. Utilizes the Username and Password variables.
-     *  @access public
      *  @var bool
      */
     var $SMTPAuth     = false;
 
     /**
      *  Sets SMTP username.
-     *  @access public
      *  @var string
      */
     var $Username     = "";
 
     /**
      *  Sets SMTP password.
-     *  @access public
      *  @var string
      */
     var $Password     = "";
@@ -228,83 +188,48 @@
     /**
      *  Sets the SMTP server timeout in seconds. This function will not 
      *  work with the win32 version.
-     *  @access public
      *  @var int
      */
     var $Timeout      = 10;
 
     /**
      *  Sets SMTP class debugging on or off.
-     *  @access public
      *  @var bool
      */
     var $SMTPDebug    = false;
 
-
-    /////////////////////////////////////////////////
-    // PRIVATE VARIABLES
-    /////////////////////////////////////////////////
-
     /**
-     *  Holds all "To" addresses.
-     *  @access private
-     *  @var array
+     * Prevents the SMTP connection from being closed after each mail 
+     * sending.  If this is set to true then to close the connection 
+     * requires an explicit call to SmtpClose(). 
+     * @var bool
      */
-    var $to              = array();
+    var $SMTPKeepAlive = false;
 
-    /**
-     *  Holds all "CC" addresses.
-     *  @access private
-     *  @var array
+    /**#@+
+     * @access private
      */
+    var $smtp            = NULL;
+    var $to              = array();
     var $cc              = array();
-
-    /**
-     *  Holds all "BCC" addresses.
-     *  @access private
-     *  @var array
-     */
     var $bcc             = array();
-
-    /**
-     *  Holds all "Reply-To" addresses.
-     *  @var array
-     */
     var $ReplyTo         = array();
-
-    /**
-     *  Holds all string and binary attachments.
-     *  @access private
-     *  @var array
-     */
     var $attachment      = array();
-
-    /**
-     *  Holds all custom headers.
-     *  @var array
-     */
     var $CustomHeader    = array();
-
-    /**
-     *  Holds the type of the message.
-     *  @var string
-     */
     var $message_type    = "";
-
-    /**
-     *  Holds the message boundaries.
-     *  @access private
-     *  @var string array
-     */
     var $boundary        = array();
-
+    var $language        = array();
+    var $error_count     = 0;
+    var $LE              = "\n";
+    /**#@-*/
+    
     /////////////////////////////////////////////////
     // VARIABLE METHODS
     /////////////////////////////////////////////////
 
     /**
-     * Sets message type to HTML.  Returns void.
-     * @access public
+     * Sets message type to HTML.  
+     * @param bool $bool
      * @return void
      */
     function IsHTML($bool) {
@@ -316,8 +241,6 @@
 
     /**
      * Sets Mailer to send message using SMTP.
-     * Returns void.
-     * @access public
      * @return void
      */
     function IsSMTP() {
@@ -326,8 +249,6 @@
 
     /**
      * Sets Mailer to send message using PHP mail() function.
-     * Returns void.
-     * @access public
      * @return void
      */
     function IsMail() {
@@ -336,8 +257,6 @@
 
     /**
      * Sets Mailer to send message using the $Sendmail program.
-     * Returns void.
-     * @access public
      * @return void
      */
     function IsSendmail() {
@@ -345,12 +264,10 @@
     }
 
     /**
-     * Sets Mailer to send message using the qmail MTA.  Returns void.
-     * @access public
+     * Sets Mailer to send message using the qmail MTA. 
      * @return void
      */
     function IsQmail() {
-        //$this->Sendmail = "/var/qmail/bin/qmail-inject";
         $this->Sendmail = "/var/qmail/bin/sendmail";
         $this->Mailer = "sendmail";
     }
@@ -361,8 +278,9 @@
     /////////////////////////////////////////////////
 
     /**
-     * Adds a "To" address.  Returns void.
-     * @access public
+     * Adds a "To" address.  
+     * @param string $address
+     * @param string $name
      * @return void
      */
     function AddAddress($address, $name = "") {
@@ -374,10 +292,9 @@
     /**
      * Adds a "Cc" address. Note: this function works
      * with the SMTP mailer on win32, not with the "mail"
-     * mailer.  This is a PHP bug that has been submitted
-     * on http://bugs.php.net. The *NIX version of PHP
-     * functions correctly. Returns void.
-     * @access public
+     * mailer.  
+     * @param string $address
+     * @param string $name
      * @return void
     */
     function AddCC($address, $name = "") {
@@ -389,11 +306,9 @@
     /**
      * Adds a "Bcc" address. Note: this function works
      * with the SMTP mailer on win32, not with the "mail"
-     * mailer.  This is a PHP bug that has been submitted
-     * on http://bugs.php.net. The *NIX version of PHP
-     * functions correctly.
-     * Returns void.
-     * @access public
+     * mailer.  
+     * @param string $address
+     * @param string $name
      * @return void
      */
     function AddBCC($address, $name = "") {
@@ -403,8 +318,9 @@
     }
 
     /**
-     * Adds a "Reply-to" address.  Returns void.
-     * @access public
+     * Adds a "Reply-to" address.  
+     * @param string $address
+     * @param string $name
      * @return void
      */
     function AddReplyTo($address, $name = "") {
@@ -421,17 +337,17 @@
     /**
      * Creates message and assigns Mailer. If the message is
      * not sent successfully then it returns false.  Use the ErrorInfo
-     * variable to view description of the error.  Returns bool.
-     * @access public
+     * variable to view description of the error.  
      * @return bool
      */
     function Send() {
         $header = "";
         $body = "";
+        $result = true;
 
         if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
         {
-            $this->error_handler("You must provide at least one recipient email address");
+            $this->SetError($this->Lang("provide_address"));
             return false;
         }
 
@@ -439,153 +355,40 @@
         if(!empty($this->AltBody))
             $this->ContentType = "multipart/alternative";
 
-        // Attach sender information & date
-        $header = $this->received();
-        $header .= sprintf("Date: %s%s", $this->rfc_date(), $this->LE);
-        $header .= $this->create_header();
-
-        if(!$body = $this->create_body())
-            return false;
+        $this->error_count = 0; // reset errors
+        $this->SetMessageType();
+        $header .= $this->CreateHeader();
+        $body = $this->CreateBody();
 
-        //echo "<pre>".$header . $body . "</pre>"; // debugging
+        if($body == "") { return false; }
 
         // Choose the mailer
-        if($this->Mailer == "sendmail")
-        {
-          if(!$this->sendmail_send($header, $body))
-              return false;
-        }
-        elseif($this->Mailer == "mail")
-        {
-          if(!$this->mail_send($header, $body))
-              return false;
-        }
-        elseif($this->Mailer == "smtp")
+        switch($this->Mailer)
         {
-          if(!$this->smtp_send($header, $body))
-              return false;
-        }
-        else
-        {
-            $this->error_handler(sprintf("%s mailer is not supported", $this->Mailer));
-            return false;
+            case "sendmail":
+                $result = $this->SendmailSend($header, $body);
+                break;
+            case "mail":
+                $result = $this->MailSend($header, $body);
+                break;
+            case "smtp":
+                $result = $this->SmtpSend($header, $body);
+                break;
+            default:
+            $this->SetError($this->Mailer . $this->Lang("mailer_not_supported"));
+                $result = false;
+                break;
         }
 
-        return true;
+        return $result;
     }
     
     /**
-     * Sends mail message to an assigned queue directory.  Has an optional 
-     * sendTime argument.  This is used when the user wants the 
-     * message to be sent from the queue at a predetermined time. 
-     * The data must be a valid timestamp like that returned from 
-     * the time() or strtotime() functions.  Returns false on failure 
-     * or the message file name if success.
-     * @access public
-     * @return string
-     */
-    function SendToQueue($queue_path, $send_time = 0) {
-        $message = array();
-        $header = "";
-        $body = "";
-        
-        // If invalid or empty just set to the current time
-        if($send_time == 0)
-            $send_time = time();
-        
-        if(!is_dir($queue_path))
-        {
-            $this->error_handler("The supplied queue directory does not exist");
-            return false;
-        }
-
-        if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
-        {
-            $this->error_handler("You must provide at least one recipient email address");
-            return false;
-        }
-
-        // Set whether the message is multipart/alternative
-        if(!empty($this->AltBody))
-            $this->ContentType = "multipart/alternative";
-
-        $header = $this->create_header();
-        if(!$body = $this->create_body())
-            return false;
-
-        // Seed randomizer
-        mt_srand(time());
-        $msg_id = md5(uniqid(mt_rand()));
-        
-        $fp = @fopen($queue_path . $msg_id . ".pqm", "wb");
-        if(!$fp)
-        {
-            $this->error_handler(sprintf("Could not write to %s directory", $queue_path));
-            return false;
-        }
-       
-        $message[] = sprintf("----START PQM HEADER----%s", $this->LE);
-        $message[] = sprintf("SendTime: %s%s", $send_time, $this->LE);
-        $message[] = sprintf("Mailer: %s%s", $this->Mailer, $this->LE);
-
-        // Choose the mailer
-        if($this->Mailer == "sendmail")
-        {
-            $message[] = sprintf("Sendmail: %s%s", $this->Sendmail, $this->LE);
-            $message[] = sprintf("Sender: %s%s", $this->Sender, $this->LE);
-        }
-        elseif($this->Mailer == "mail")
-        {
-            $message[] = sprintf("Sender: %s%s", $this->Sender, $this->LE);
-            $message[] = sprintf("Subject: %s%s", $this->Subject, $this->LE);
-            $message[] = sprintf("to: %s%s", $this->addr_list($this->to), $this->LE);
-        }
-        elseif($this->Mailer == "smtp")
-        {
-            $message[] = sprintf("Host: %s%s", $this->Host, $this->LE);
-            $message[] = sprintf("Port: %d%s", $this->Port, $this->LE);
-            $message[] = sprintf("Helo: %s%s", $this->Helo, $this->LE);
-            $message[] = sprintf("Timeout: %d%s", $this->Timeout, $this->LE);
-            
-            if($this->SMTPAuth)
-                $auth_no = 1;
-            else
-                $auth_no = 0;
-            $message[] = sprintf("SMTPAuth: %d%s", $auth_no, $this->LE);
-            $message[] = sprintf("Username: %s%s", $this->Username, $this->LE);
-            $message[] = sprintf("Password: %s%s", $this->Password, $this->LE);
-            $message[] = sprintf("From: %s%s", $this->From, $this->LE);
-
-            $message[] = sprintf("to: %s%s", $this->addr_list($this->to), $this->LE);
-            $message[] = sprintf("cc: %s%s", $this->addr_list($this->cc), $this->LE);
-            $message[] = sprintf("bcc: %s%s", $this->addr_list($this->bcc), $this->LE);
-        }
-        else
-        {
-            $this->error_handler(sprintf("%s mailer is not supported", $this->Mailer));
-            return false;
-        }
-
-        $message[] = sprintf("----END PQM HEADER----%s", $this->LE); // end of pqm header        
-        $message[] = $header;
-        $message[] = $body;
-       
-        if(fwrite($fp, join("", $message)) == -1)
-        {
-            $this->error_handler("Write to file failed");
-            return false;
-        }
-        fclose($fp);
-
-        return ($msg_id . ".pqm");
-    }
-
-    /**
-     * Sends mail using the $Sendmail program.  Returns bool.
+     * Sends mail using the $Sendmail program.  
      * @access private
      * @return bool
      */
-    function sendmail_send($header, $body) {
+    function SendmailSend($header, $body) {
         if ($this->Sender != "")
             $sendmail = sprintf("%s -oi -f %s -t", $this->Sendmail, $this->Sender);
         else
@@ -593,7 +396,7 @@
 
         if(!@$mail = popen($sendmail, "w"))
         {
-            $this->error_handler(sprintf("Could not execute %s", $this->Sendmail));
+            $this->SetError($this->Lang("execute") . $this->Sendmail);
             return false;
         }
 
@@ -603,7 +406,7 @@
         $result = pclose($mail) >> 8 & 0xFF;
         if($result != 0)
         {
-            $this->error_handler(sprintf("Could not execute %s", $this->Sendmail));
+            $this->SetError($this->Lang("execute") . $this->Sendmail);
             return false;
         }
 
@@ -611,41 +414,35 @@
     }
 
     /**
-     * Sends mail using the PHP mail() function.  Returns bool.
+     * Sends mail using the PHP mail() function.  
      * @access private
      * @return bool
      */
-    function mail_send($header, $body) {
-        //$to = substr($this->addr_append("To", $this->to), 4, -2);
-
-        // Cannot add Bcc's to the $to
-        $to = $this->to[0][0]; // no extra comma
-        for($i = 1; $i < count($this->to); $i++)
-            $to .= sprintf(",%s", $this->to[$i][0]);
-
-        if ($this->Sender != "" && PHP_VERSION >= "4.0")
+    function MailSend($header, $body) {
+        $to = "";
+        for($i = 0; $i < count($this->to); $i++)
         {
-            $old_from = ini_get("sendmail_from");
-            ini_set("sendmail_from", $this->Sender);
+            if($i != 0) { $to .= ", "; }
+            $to .= $this->to[$i][0];
         }
 
-        if ($this->Sender != "" && PHP_VERSION >= "4.0.5")
+        if ($this->Sender != "" && strlen(ini_get("safe_mode"))< 1)
         {
-            // The fifth parameter to mail is only available in PHP >= 4.0.5
+            $old_from = ini_get("sendmail_from");
+            ini_set("sendmail_from", $this->Sender);
             $params = sprintf("-oi -f %s", $this->Sender);
-            $rt = @mail($to, $this->encode_header($this->Subject), $body, $header, $params);
+            $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, 
+                        $header, $params);
         }
         else
-        {
-            $rt = @mail($to, $this->encode_header($this->Subject), $body, $header);
-        }
+            $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, $header);
 
         if (isset($old_from))
             ini_set("sendmail_from", $old_from);
 
         if(!$rt)
         {
-            $this->error_handler("Could not instantiate mail()");
+            $this->SetError($this->Lang("instantiate"));
             return false;
         }
 
@@ -659,158 +456,178 @@
      * @access private
      * @return bool
      */
-    function smtp_send($header, $body) {
-        // Include SMTP class code, but not twice
+    function SmtpSend($header, $body) {
         include_once($this->PluginDir . "class.smtp.php");
-
-        $smtp = new SMTP;
-
-        $smtp->do_debug = $this->SMTPDebug;
-
-        // Try to connect to all SMTP servers
-        $hosts = explode(";", $this->Host);
-        $index = 0;
-        $connection = false;
-        $smtp_from = "";
+        $error = "";
         $bad_rcpt = array();
-        $e = "";
 
-        // Retry while there is no connection
-        while($index < count($hosts) && $connection == false)
-        {
-            if(strstr($hosts[$index], ":"))
-                list($host, $port) = explode(":", $hosts[$index]);
-            else
-            {
-                $host = $hosts[$index];
-                $port = $this->Port;
-            }
-
-            if($smtp->Connect($host, $port, $this->Timeout))
-                $connection = true;
-            //printf("%s host could not connect<br>", $hosts[$index]); //debug only
-            $index++;
-        }
-        if(!$connection)
-        {
-            $this->error_handler("SMTP Error: could not connect to SMTP host server(s)");
+        if(!$this->SmtpConnect())
             return false;
-        }
-
-        // Must perform HELO before authentication
-	if ($this->Helo != '')
-            $smtp->Hello($this->Helo);
-        else
-            $smtp->Hello($this->get_server_hostname());
-
-        // If user requests SMTP authentication
-        if($this->SMTPAuth)
-        {
-            if(!$smtp->Authenticate($this->Username, $this->Password))
-            {
-                $this->error_handler("SMTP Error: Could not authenticate");
-                return false;
-            }
-        }
 
-        if ($this->Sender == "")
-            $smtp_from = $this->From;
-        else
-            $smtp_from = $this->Sender;
-
-        if(!$smtp->Mail(sprintf("<%s>", $smtp_from)))
+        $smtp_from = ($this->Sender == "") ? $this->From : $this->Sender;
+        if(!$this->smtp->Mail($smtp_from))
         {
-            $e = sprintf("SMTP Error: From address [%s] failed", $smtp_from);
-            $this->error_handler($e);
+            $error = $this->Lang("from_failed") . $smtp_from;
+            $this->SetError($error);
+            $this->smtp->Reset();
             return false;
         }
 
         // Attempt to send attach all recipients
         for($i = 0; $i < count($this->to); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->to[$i][0])))
+            if(!$this->smtp->Recipient($this->to[$i][0]))
                 $bad_rcpt[] = $this->to[$i][0];
         }
         for($i = 0; $i < count($this->cc); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->cc[$i][0])))
+            if(!$this->smtp->Recipient($this->cc[$i][0]))
                 $bad_rcpt[] = $this->cc[$i][0];
         }
         for($i = 0; $i < count($this->bcc); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->bcc[$i][0])))
+            if(!$this->smtp->Recipient($this->bcc[$i][0]))
                 $bad_rcpt[] = $this->bcc[$i][0];
         }
 
-        // Create error message
-        if(count($bad_rcpt) > 0)
+        if(count($bad_rcpt) > 0) // Create error message
         {
             for($i = 0; $i < count($bad_rcpt); $i++)
             {
-                if($i != 0)
-                    $e .= ", ";
-                $e .= $bad_rcpt[$i];
+                if($i != 0) { $error .= ", "; }
+                $error .= $bad_rcpt[$i];
             }
-            $e = sprintf("SMTP Error: The following recipients failed [%s]", $e);
-            $this->error_handler($e);
-
+            $error = $this->Lang("recipients_failed") . $error;
+            $this->SetError($error);
+            $this->smtp->Reset();
             return false;
         }
 
-
-        if(!$smtp->Data(sprintf("%s%s", $header, $body)))
+        if(!$this->smtp->Data($header . $body))
         {
-            $this->error_handler("SMTP Error: Data not accepted");
+            $this->SetError($this->Lang("data_not_accepted"));
+            $this->smtp->Reset();
             return false;
         }
-        $smtp->Quit();
-        $smtp->Close();
+        if($this->SMTPKeepAlive == true)
+            $this->smtp->Reset();
+        else
+            $this->SmtpClose();
 
         return true;
     }
 
-
-    /////////////////////////////////////////////////
-    // MESSAGE CREATION METHODS
-    /////////////////////////////////////////////////
-
     /**
-     * Creates recipient headers.  Returns string.
+     * Initiates a connection to an SMTP server.  Returns false if the 
+     * operation failed.
      * @access private
-     * @return string
+     * @return bool
      */
-    function addr_append($type, $addr) {
-        $addr_str = $type . ": ";
-        $addr_str .= $this->addr_format($addr[0]);
-        if(count($addr) > 1)
+    function SmtpConnect() {
+        if($this->smtp == NULL) { $this->smtp = new SMTP(); }
+
+        $this->smtp->do_debug = $this->SMTPDebug;
+        $hosts = explode(";", $this->Host);
+        $index = 0;
+        $connection = ($this->smtp->Connected()); 
+
+        // Retry while there is no connection
+        while($index < count($hosts) && $connection == false)
         {
-            for($i = 1; $i < count($addr); $i++)
+            if(strstr($hosts[$index], ":"))
+                list($host, $port) = explode(":", $hosts[$index]);
+            else
+            {
+                $host = $hosts[$index];
+                $port = $this->Port;
+            }
+
+            if($this->smtp->Connect($host, $port, $this->Timeout))
             {
-                $addr_str .= sprintf(", %s", $this->addr_format($addr[$i]));
+                if ($this->Helo != '')
+                    $this->smtp->Hello($this->Helo);
+                else
+                    $this->smtp->Hello($this->ServerHostname());
+        
+                if($this->SMTPAuth)
+                {
+                    if(!$this->smtp->Authenticate($this->Username, 
+                                                  $this->Password))
+                    {
+                        $this->SetError($this->Lang("authenticate"));
+                        $this->smtp->Reset();
+                        $connection = false;
+                    }
+                }
+                $connection = true;
             }
-            $addr_str .= $this->LE;
+            $index++;
         }
-        else
-            $addr_str .= $this->LE;
+        if(!$connection)
+            $this->SetError($this->Lang("connect_host"));
 
-        return($addr_str);
+        return $connection;
+    }
+
+    /**
+     * Closes the active SMTP session if one exists.
+     * @return void
+     */
+    function SmtpClose() {
+        if($this->smtp != NULL)
+        {
+            if($this->smtp->Connected())
+            {
+                $this->smtp->Quit();
+                $this->smtp->Close();
+            }
+        }
     }
+
+    /**
+     * Sets the language for all class error messages.  Returns false 
+     * if it cannot load the language file.  The default language type
+     * is English.
+     * @param string $lang_type Type of language (e.g. Portuguese: "br")
+     * @param string $lang_path Path to the language file directory
+     * @access public
+     * @return bool
+     */
+    function SetLanguage($lang_type, $lang_path = "language/") {
+        if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php'))
+            include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
+        else if(file_exists($lang_path.'phpmailer.lang-en.php'))
+            include($lang_path.'phpmailer.lang-en.php');
+        else
+        {
+            $this->SetError("Could not load language file");
+            return false;
+        }
+        $this->language = $PHPMAILER_LANG;
     
+        return true;
+    }
+
+    /////////////////////////////////////////////////
+    // MESSAGE CREATION METHODS
+    /////////////////////////////////////////////////
+
     /**
-     * Creates a semicolon delimited list for use in pqm files.
+     * Creates recipient headers.  
      * @access private
      * @return string
      */
-    function addr_list($list_array) {
-        $addr_list = "";
-        for($i = 0; $i < count($list_array); $i++)
-        {
-            if($i > 0)
-                $addr_list .= ";";
-            $addr_list .= $list_array[$i][0];
+    function AddrAppend($type, $addr) {
+        $addr_str = $type . ": ";
+        $addr_str .= $this->AddrFormat($addr[0]);
+        if(count($addr) > 1)
+        {
+            for($i = 1; $i < count($addr); $i++)
+                $addr_str .= ", " . $this->AddrFormat($addr[$i]);
         }
-        
-        return $addr_list;
+        $addr_str .= $this->LE;
+
+        return $addr_str;
     }
     
     /**
@@ -818,11 +635,14 @@
      * @access private
      * @return string
      */
-    function addr_format($addr) {
+    function AddrFormat($addr) {
         if(empty($addr[1]))
             $formatted = $addr[0];
         else
-            $formatted = sprintf('%s <%s>', $this->encode_header($addr[1], 'phrase'), $addr[0]);
+        {
+            $formatted = $this->EncodeHeader($addr[1], 'phrase') . " <" . 
+                         $addr[0] . ">";
+        }
 
         return $formatted;
     }
@@ -830,19 +650,16 @@
     /**
      * Wraps message for use with mailers that do not
      * automatically perform wrapping and for quoted-printable.
-     * Original written by philippe.  Returns string.
+     * Original written by philippe.  
      * @access private
      * @return string
      */
-    function word_wrap($message, $length, $qp_mode = false) {
-        if ($qp_mode)
-        $soft_break = sprintf(" =%s", $this->LE);
-        else
-        $soft_break = $this->LE;
+    function WrapText($message, $length, $qp_mode = false) {
+        $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
 
-        $message = $this->fix_eol($message);
+        $message = $this->FixEOL($message);
         if (substr($message, -1) == $this->LE)
-        $message = substr($message, 0, -1);
+            $message = substr($message, 0, -1);
 
         $line = explode($this->LE, $message);
         $message = "";
@@ -895,10 +712,8 @@
               else
               {
                 $buf_o = $buf;
-                if ($e == 0)
-                    $buf .= $word;
-                else
-                    $buf .= " " . $word;
+                $buf .= ($e == 0) ? $word : (" " . $word); 
+
                 if (strlen($buf) > $length and $buf_o != "")
                 {
                     $message .= $buf_o . $soft_break;
@@ -909,7 +724,7 @@
           $message .= $buf . $this->LE;
         }
 
-        return ($message);
+        return $message;
     }
     
     /**
@@ -924,218 +739,245 @@
         switch($this->message_type)
         {
            case "alt":
-           case "alt_attachment":
-              $this->AltBody = $this->word_wrap($this->AltBody, $this->WordWrap);
+              // fall through
+           case "alt_attachments":
+              $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
               break;
            default:
-              $this->Body = $this->word_wrap($this->Body, $this->WordWrap);
+              $this->Body = $this->WrapText($this->Body, $this->WordWrap);
               break;
         }
     }
 
     /**
-     * Assembles message header.  Returns a string if successful
-     * or false if unsuccessful.
+     * Assembles message header.  
      * @access private
      * @return string
      */
-    function create_header() {
-        $header = array();
+    function CreateHeader() {
+        $result = "";
         
         // Set the boundaries
         $uniq_id = md5(uniqid(time()));
         $this->boundary[1] = "b1_" . $uniq_id;
         $this->boundary[2] = "b2_" . $uniq_id;
 
+        $result .= $this->HeaderLine("Date", $this->RFCDate());
+        if($this->Sender == "")
+            $result .= $this->HeaderLine("Return-Path", trim($this->From));
+        else
+            $result .= $this->HeaderLine("Return-Path", trim($this->Sender));
+        
         // To be created automatically by mail()
         if($this->Mailer != "mail")
         {
             if(count($this->to) > 0)
-                $header[] = $this->addr_append("To", $this->to);
+                $result .= $this->AddrAppend("To", $this->to);
             else if (count($this->cc) == 0)
-                $header[] = "To: undisclosed-recipients:;".$this->LE;
+                $result .= $this->HeaderLine("To", "undisclosed-recipients:;");
+            if(count($this->cc) > 0)
+                $result .= $this->AddrAppend("Cc", $this->cc);
         }
 
         $from = array();
         $from[0][0] = trim($this->From);
         $from[0][1] = $this->FromName;
-        $header[] = $this->addr_append("From", $from); 
-
-        if(count($this->cc) > 0)
-            $header[] = $this->addr_append("Cc", $this->cc);
+        $result .= $this->AddrAppend("From", $from); 
 
         // sendmail and mail() extract Bcc from the header before sending
         if((($this->Mailer == "sendmail") || ($this->Mailer == "mail")) && (count($this->bcc) > 0))
-            $header[] = $this->addr_append("Bcc", $this->bcc);
+            $result .= $this->AddrAppend("Bcc", $this->bcc);
 
         if(count($this->ReplyTo) > 0)
-            $header[] = $this->addr_append("Reply-to", $this->ReplyTo);
+            $result .= $this->AddrAppend("Reply-to", $this->ReplyTo);
 
         // mail() sets the subject itself
         if($this->Mailer != "mail")
-            $header[] = sprintf("Subject: %s%s", $this->encode_header(trim($this->Subject)), $this->LE);
+            $result .= $this->HeaderLine("Subject", $this->EncodeHeader(trim($this->Subject)));
 
-        $header[] = sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->get_server_hostname(), $this->LE);
-        $header[] = sprintf("X-Priority: %d%s", $this->Priority, $this->LE);
-        $header[] = sprintf("X-Mailer: phpmailer [version %s]%s", $this->Version, $this->LE);
-        if($this->Sender == "")
-            $header[] = sprintf("Return-Path: %s%s", trim($this->From), $this->LE);
-        else
-            $header[] = sprintf("Return-Path: %s%s", trim($this->Sender), $this->LE);
+        $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+        $result .= $this->HeaderLine("X-Priority", $this->Priority);
+        $result .= $this->HeaderLine("X-Mailer", "PHPMailer [version " . $this->Version . "]");
         
         if($this->ConfirmReadingTo != "")
-            $header[] = sprintf("Disposition-Notification-To: <%s>%s", 
-                            trim($this->ConfirmReadingTo), $this->LE);
+        {
+            $result .= $this->HeaderLine("Disposition-Notification-To", 
+                       "<" . trim($this->ConfirmReadingTo) . ">");
+        }
 
         // Add custom headers
         for($index = 0; $index < count($this->CustomHeader); $index++)
-            $header[] = sprintf("%s: %s%s", trim($this->CustomHeader[$index][0]), $this->encode_header(trim($this->CustomHeader[$index][1])), $this->LE);
-
-        if($this->UseMSMailHeaders)
-            $header[] = $this->AddMSMailHeaders();
-
-        $header[] = sprintf("MIME-Version: 1.0%s", $this->LE);
-
-        // Determine what type of message this is        
-        if(count($this->attachment) < 1 && strlen($this->AltBody) < 1)
-            $this->message_type = "plain";
-        else
         {
-            if(count($this->attachment) > 0)
-                $this->message_type = "attachments";
-            if(strlen($this->AltBody) > 0 && count($this->attachment) < 1)
-                $this->message_type = "alt";
-            if(strlen($this->AltBody) > 0 && count($this->attachment) > 0)
-                $this->message_type = "alt_attachments";
+            $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), 
+                       $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
         }
-        
+        $result .= $this->HeaderLine("MIME-Version", "1.0");
+
         switch($this->message_type)
         {
             case "plain":
-                $header[] = sprintf("Content-Transfer-Encoding: %s%s", 
-                                    $this->Encoding, $this->LE);
-                $header[] = sprintf("Content-Type: %s; charset=\"%s\"",
+                $result .= $this->HeaderLine("Content-Transfer-Encoding", $this->Encoding);
+                $result .= sprintf("Content-Type: %s; charset=\"%s\"",
                                     $this->ContentType, $this->CharSet);
                 break;
             case "attachments":
+                // fall through
             case "alt_attachments":
-                if($this->EmbeddedImageCount() > 0)
+                if($this->InlineImageExists())
                 {
-                    $header[] = sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 
+                    $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 
                                     "multipart/related", $this->LE, $this->LE, 
                                     $this->boundary[1], $this->LE);
                 }
                 else
                 {
-                    $header[] = sprintf("Content-Type: %s;%s",
-                                    "multipart/mixed", $this->LE);
-                    $header[] = sprintf("\tboundary=\"%s\"%s", $this->boundary[1], $this->LE);
+                    $result .= $this->HeaderLine("Content-Type", "multipart/mixed;");
+                    $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
                 }
                 break;
             case "alt":
-                $header[] = sprintf("Content-Type: %s;%s",
-                                    "multipart/alternative", $this->LE);
-                $header[] = sprintf("\tboundary=\"%s\"%s", $this->boundary[1], $this->LE);
+                $result .= $this->HeaderLine("Content-Type", "multipart/alternative;");
+                $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
                 break;
         }
 
-        // No additional lines when using mail() function
         if($this->Mailer != "mail")
-            $header[] = $this->LE.$this->LE;
+            $result .= $this->LE.$this->LE;
 
-        return(join("", $header));
+        return $result;
     }
 
     /**
-     * Assembles the message body.  Returns a string if successful
-     * or false if unsuccessful.
+     * Assembles the message body.  Returns an empty string on failure.
      * @access private
      * @return string
      */
-    function create_body() {
-        $body = array();
+    function CreateBody() {
+        $result = "";
 
         $this->SetWordWrap();
 
         switch($this->message_type)
         {
             case "alt":
-                // Return text of body
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource();
-    
-                $body[] = $this->encode_string($this->AltBody, $this->Encoding);
-                $body[] = $this->LE.$this->LE;
-    
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/html";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource();
+                $result .= $this->GetBoundary($this->boundary[1], "", 
+                                              "text/plain", "");
+                $result .= $this->EncodeString($this->AltBody, $this->Encoding);
+                $result .= $this->LE.$this->LE;
+                $result .= $this->GetBoundary($this->boundary[1], "", 
+                                              "text/html", "");
                 
-                $body[] = $this->encode_string($this->Body, $this->Encoding);
-                $body[] = $this->LE.$this->LE;
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE.$this->LE;
     
-                // End the boundary
-                $body[] = sprintf("%s--%s--%s", $this->LE, 
-                                  $this->boundary[1], $this->LE.$this->LE);
+                $result .= $this->EndBoundary($this->boundary[1]);
                 break;
             case "plain":
-                $body[] = $this->encode_string($this->Body, $this->Encoding);
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
                 break;
             case "attachments":
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = $this->ContentType;
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource(false) . $this->LE;
-                $body[] = $this->encode_string($this->Body, $this->Encoding);
-                $body[] = $this->LE;
+                $result .= $this->GetBoundary($this->boundary[1], "", "", "");
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE;
      
-                if(!$body[] = $this->attach_all())
-                    return false;
+                $result .= $this->AttachAll();
                 break;
             case "alt_attachments":
-                $body[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-                $body[] = sprintf("Content-Type: %s;%s" .
-                                  "\tboundary=\"%s\"%s",
+                $result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+                $result .= sprintf("Content-Type: %s;%s" .
+                                   "\tboundary=\"%s\"%s",
                                    "multipart/alternative", $this->LE, 
                                    $this->boundary[2], $this->LE.$this->LE);
     
                 // Create text body
-                $bndry = new Boundary($this->boundary[2]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/plain";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource() . $this->LE;
-    
-                $body[] = $this->encode_string($this->AltBody, $this->Encoding);
-                $body[] = $this->LE.$this->LE;
+                $result .= $this->GetBoundary($this->boundary[2], "", 
+                                              "text/plain", "") . $this->LE;
+
+                $result .= $this->EncodeString($this->AltBody, $this->Encoding);
+                $result .= $this->LE.$this->LE;
     
                 // Create the HTML body
-                $bndry = new Boundary($this->boundary[2]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/html";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource() . $this->LE;
+                $result .= $this->GetBoundary($this->boundary[2], "", 
+                                              "text/html", "") . $this->LE;
     
-                $body[] = $this->encode_string($this->Body, $this->Encoding);
-                $body[] = $this->LE.$this->LE;
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE.$this->LE;
 
-                $body[] = sprintf("%s--%s--%s", $this->LE, 
-                                  $this->boundary[2], $this->LE.$this->LE);
+                $result .= $this->EndBoundary($this->boundary[2]);
                 
-                if(!$body[] = $this->attach_all())
-                    return false;
+                $result .= $this->AttachAll();
                 break;
         }
-        $sBody = join("", $body);
+        if($this->IsError())
+            $result = "";
 
-        return $sBody;
+        return $result;
     }
 
+    /**
+     * Returns the start of a message boundary.
+     * @access private
+     */
+    function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+        $result = "";
+        if($charSet == "") { $charSet = $this->CharSet; }
+        if($contentType == "") { $contentType = $this->ContentType; }
+        if($encoding == "") { $encoding = $this->Encoding; }
+
+        $result .= $this->TextLine("--" . $boundary);
+        $result .= sprintf("Content-Type: %s; charset = \"%s\"", 
+                            $contentType, $charSet);
+        $result .= $this->LE;
+        $result .= $this->HeaderLine("Content-Transfer-Encoding", $encoding);
+        $result .= $this->LE;
+       
+        return $result;
+    }
+    
+    /**
+     * Returns the end of a message boundary.
+     * @access private
+     */
+    function EndBoundary($boundary) {
+        return $this->LE . "--" . $boundary . "--" . $this->LE; 
+    }
+    
+    /**
+     * Sets the message type.
+     * @access private
+     * @return void
+     */
+    function SetMessageType() {
+        if(count($this->attachment) < 1 && strlen($this->AltBody) < 1)
+            $this->message_type = "plain";
+        else
+        {
+            if(count($this->attachment) > 0)
+                $this->message_type = "attachments";
+            if(strlen($this->AltBody) > 0 && count($this->attachment) < 1)
+                $this->message_type = "alt";
+            if(strlen($this->AltBody) > 0 && count($this->attachment) > 0)
+                $this->message_type = "alt_attachments";
+        }
+    }
+
+    /**
+     * Returns a formatted header line.
+     * @access private
+     * @return string
+     */
+    function HeaderLine($name, $value) {
+        return $name . ": " . $value . $this->LE;
+    }
+
+    /**
+     * Returns a formatted mail line.
+     * @access private
+     * @return string
+     */
+    function TextLine($value) {
+        return $value . $this->LE;
+    }
 
     /////////////////////////////////////////////////
     // ATTACHMENT METHODS
@@ -1143,17 +985,19 @@
 
     /**
      * Adds an attachment from a path on the filesystem.
-     * Checks if attachment is valid and then adds
-     * the attachment to the list.
      * Returns false if the file could not be found
      * or accessed.
-     * @access public
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
      * @return bool
      */
-    function AddAttachment($path, $name = "", $encoding = "base64", $type = "application/octet-stream") {
+    function AddAttachment($path, $name = "", $encoding = "base64", 
+                           $type = "application/octet-stream") {
         if(!@is_file($path))
         {
-            $this->error_handler(sprintf("Could not access [%s] file", $path));
+            $this->SetError($this->Lang("file_access") . $path);
             return false;
         }
 
@@ -1161,7 +1005,6 @@
         if($name == "")
             $name = $filename;
 
-        // Append to $attachment array
         $cur = count($this->attachment);
         $this->attachment[$cur][0] = $path;
         $this->attachment[$cur][1] = $filename;
@@ -1177,11 +1020,11 @@
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
-     * Returns a string if successful or false if unsuccessful.
+     * Returns an empty string on failure.
      * @access private
      * @return string
      */
-    function attach_all() {
+    function AttachAll() {
         // Return text of body
         $mime = array();
 
@@ -1191,13 +1034,10 @@
             // Check for string attachment
             $bString = $this->attachment[$i][5];
             if ($bString)
-            {
                 $string = $this->attachment[$i][0];
-            }
             else
-            {
                 $path = $this->attachment[$i][0];
-            }
+
             $filename    = $this->attachment[$i][1];
             $name        = $this->attachment[$i][2];
             $encoding    = $this->attachment[$i][3];
@@ -1218,93 +1058,92 @@
             // Encode as string attachment
             if($bString)
             {
-                if(!$mime[] = $this->encode_string($string, $encoding))                
-                    return false;
+                $mime[] = $this->EncodeString($string, $encoding);
+                if($this->IsError()) { return ""; }
                 $mime[] = $this->LE.$this->LE;
             }
             else
             {
-                if(!$mime[] = $this->encode_file($path, $encoding))                
-                    return false;
+                $mime[] = $this->EncodeFile($path, $encoding);                
+                if($this->IsError()) { return ""; }
                 $mime[] = $this->LE.$this->LE;
             }
         }
 
         $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
 
-        return(join("", $mime));
+        return join("", $mime);
     }
     
     /**
-     * Encodes attachment in requested format.  Returns a
-     * string if successful or false if unsuccessful.
+     * Encodes attachment in requested format.  Returns an
+     * empty string on failure.
      * @access private
      * @return string
      */
-    function encode_file ($path, $encoding = "base64") {
+    function EncodeFile ($path, $encoding = "base64") {
         if(!@$fd = fopen($path, "rb"))
         {
-            $this->error_handler(sprintf("File Error: Could not open file %s", $path));
-            return false;
+            $this->SetError($this->Lang("file_open") . $path);
+            return "";
         }
+        $magic_quotes = get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
         $file_buffer = fread($fd, filesize($path));
-        $file_buffer = $this->encode_string($file_buffer, $encoding);
+        $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
+        set_magic_quotes_runtime($magic_quotes);
 
         return $file_buffer;
     }
 
     /**
-     * Encodes string to requested format. Returns a
-     * string if successful or false if unsuccessful.
+     * Encodes string to requested format. Returns an
+     * empty string on failure.
      * @access private
      * @return string
      */
-    function encode_string ($str, $encoding = "base64") {
+    function EncodeString ($str, $encoding = "base64") {
+        $encoded = "";
         switch(strtolower($encoding)) {
           case "base64":
               // chunk_split is found in PHP >= 3.0.6
-              $encoded = chunk_split(base64_encode($str));
+              $encoded = chunk_split(base64_encode($str), 76, $this->LE);
               break;
-
           case "7bit":
           case "8bit":
-              $encoded = $this->fix_eol($str);
-              if (substr($encoded, -2) != $this->LE)
+              $encoded = $this->FixEOL($str);
+              if (substr($encoded, -(strlen($this->LE))) != $this->LE)
                 $encoded .= $this->LE;
               break;
-
           case "binary":
               $encoded = $str;
               break;
-
           case "quoted-printable":
-              $encoded = $this->encode_qp($str);
+              $encoded = $this->EncodeQP($str);
               break;
-
           default:
-              $this->error_handler(sprintf("Unknown encoding: %s", $encoding));
-              return false;
+              $this->SetError($this->Lang("encoding") . $encoding);
+              break;
         }
-        return($encoded);
+        return $encoded;
     }
 
     /**
-     * Encode a header string to best of Q, B, quoted or none.  Returns a string.
+     * Encode a header string to best of Q, B, quoted or none.  
      * @access private
      * @return string
      */
-    function encode_header ($str, $position = 'text') {
+    function EncodeHeader ($str, $position = 'text') {
       $x = 0;
       
       switch (strtolower($position)) {
         case 'phrase':
-          if (preg_match_all('/[\200-\377]/', $str, $matches) == 0) {
+          if (!preg_match('/[\200-\377]/', $str)) {
             // Can't use addslashes as we don't know what value has magic_quotes_sybase.
-            $encoded = addcslashes($str, '\000-\037\177');
-            $encoded = preg_replace('/([\"])/', '\\"', $encoded);
+            $encoded = addcslashes($str, "\0..\37\177\\\"");
 
-            if (($str == $encoded) && (preg_match_all('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str, $matches) == 0))
+            if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str))
               return ($encoded);
             else
               return ("\"$encoded\"");
@@ -1325,32 +1164,32 @@
 
       $maxlen = 75 - 7 - strlen($this->CharSet);
       // Try to select the encoding which should produce the shortest output
-//     if (strlen($str)/3 < $x) {
+      if (strlen($str)/3 < $x) {
         $encoding = 'B';
         $encoded = base64_encode($str);
         $maxlen -= $maxlen % 4;
         $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-//      } else {
-//        $encoding = 'Q';
-//        $encoded = $this->encode_q($str, $position);
-//        $encoded = $this->word_wrap($encoded, $maxlen, true);
-//        $encoded = str_replace("=".$this->LE, "\n", trim($encoded));
-//      }
+      } else {
+        $encoding = 'Q';
+        $encoded = $this->EncodeQ($str, $position);
+        $encoded = $this->WrapText($encoded, $maxlen, true);
+        $encoded = str_replace("=".$this->LE, "\n", trim($encoded));
+      }
 
       $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
       $encoded = trim(str_replace("\n", $this->LE, $encoded));
       
-      return($encoded);
+      return $encoded;
     }
     
     /**
-     * Encode string to quoted-printable.  Returns a string.
+     * Encode string to quoted-printable.  
      * @access private
      * @return string
      */
-    function encode_qp ($str) {
-        $encoded = $this->fix_eol($str);
-        if (substr($encoded, -2) != $this->LE)
+    function EncodeQP ($str) {
+        $encoded = $this->FixEOL($str);
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
             $encoded .= $this->LE;
 
         // Replace every high ascii, control and = characters
@@ -1361,28 +1200,27 @@
                   "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
 
         // Maximum line length of 76 characters before CRLF (74 + space + '=')
-        $encoded = $this->word_wrap($encoded, 74, true);
+        $encoded = $this->WrapText($encoded, 74, true);
 
         return $encoded;
     }
 
     /**
-     * Encode string to q encoding.  Returns a string.
+     * Encode string to q encoding.  
      * @access private
      * @return string
      */
-    function encode_q ($str, $position = 'text') {
+    function EncodeQ ($str, $position = "text") {
         // There should not be any EOL in the string
         $encoded = preg_replace("[\r\n]", "", $str);
 
         switch (strtolower($position)) {
-          case 'phrase':
+          case "phrase":
             $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
             break;
-          case 'comment':
+          case "comment":
             $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-            // Fall-through
-          case 'text':
+          case "text":
           default:
             // Replace every high ascii, control =, ? and _ characters
             $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
@@ -1400,10 +1238,14 @@
      * Adds a string or binary attachment (non-filesystem) to the list.
      * This method can be used to attach ascii or binary data,
      * such as a BLOB record from a database.
-     * @access public
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
      * @return void
      */
-    function AddStringAttachment($string, $filename, $encoding = "base64", $type = "application/octet-stream") {
+    function AddStringAttachment($string, $filename, $encoding = "base64", 
+                                 $type = "application/octet-stream") {
         // Append to $attachment array
         $cur = count($this->attachment);
         $this->attachment[$cur][0] = $string;
@@ -1418,17 +1260,23 @@
     
     /**
      * Adds an embedded attachment.  This can include images, sounds, and 
-     * just about any other document.  
-     * @param cid this is the Content Id of the attachment.  Use this to identify
+     * just about any other document.  Make sure to set the $type to an 
+     * image type.  For JPEG images use "image/jpeg" and for GIF images 
+     * use "image/gif".
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment.  Use this to identify 
      *        the Id for accessing the image in an HTML form.
-     * @access public
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.  
      * @return bool
      */
-    function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", $type = "application/octet-stream") {
+    function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", 
+                              $type = "application/octet-stream") {
     
         if(!@is_file($path))
         {
-            $this->error_handler(sprintf("Could not access [%s] file", $path));
+            $this->SetError($this->Lang("file_access") . $path);
             return false;
         }
 
@@ -1451,19 +1299,22 @@
     }
     
     /**
-     * Returns the number of embedded images in an email.
+     * Returns true if an inline attachment is present.
      * @access private
-     * @return int
+     * @return bool
      */
-    function EmbeddedImageCount() {
-        $ret = 0;
+    function InlineImageExists() {
+        $result = false;
         for($i = 0; $i < count($this->attachment); $i++)
         {
             if($this->attachment[$i][6] == "inline")
-                $ret++;
+            {
+                $result = true;
+                break;
+            }
         }
         
-        return $ret;
+        return $result;
     }
 
     /////////////////////////////////////////////////
@@ -1472,7 +1323,6 @@
 
     /**
      * Clears all recipients assigned in the TO array.  Returns void.
-     * @access public
      * @return void
      */
     function ClearAddresses() {
@@ -1481,7 +1331,6 @@
 
     /**
      * Clears all recipients assigned in the CC array.  Returns void.
-     * @access public
      * @return void
      */
     function ClearCCs() {
@@ -1490,7 +1339,6 @@
 
     /**
      * Clears all recipients assigned in the BCC array.  Returns void.
-     * @access public
      * @return void
      */
     function ClearBCCs() {
@@ -1499,7 +1347,6 @@
 
     /**
      * Clears all recipients assigned in the ReplyTo array.  Returns void.
-     * @access public
      * @return void
      */
     function ClearReplyTos() {
@@ -1509,7 +1356,6 @@
     /**
      * Clears all recipients assigned in the TO, CC and BCC
      * array.  Returns void.
-     * @access public
      * @return void
      */
     function ClearAllRecipients() {
@@ -1521,7 +1367,6 @@
     /**
      * Clears all previously set filesystem, string, and binary
      * attachments.  Returns void.
-     * @access public
      * @return void
      */
     function ClearAttachments() {
@@ -1530,7 +1375,6 @@
 
     /**
      * Clears all custom headers.  Returns void.
-     * @access public
      * @return void
      */
     function ClearCustomHeaders() {
@@ -1548,60 +1392,24 @@
      * @access private
      * @return void
      */
-    function error_handler($msg) {
+    function SetError($msg) {
+        $this->error_count++;
         $this->ErrorInfo = $msg;
     }
 
     /**
-     * Returns the proper RFC 822 formatted date. Returns string.
+     * Returns the proper RFC 822 formatted date. 
      * @access private
      * @return string
      */
-    function rfc_date() {
+    function RFCDate() {
         $tz = date("Z");
         $tzs = ($tz < 0) ? "-" : "+";
         $tz = abs($tz);
         $tz = ($tz/3600)*100 + ($tz%3600)/60;
-        $date = sprintf("%s %s%04d", date("D, j M Y H:i:s"), $tzs, $tz);
-        return $date;
-    }
-
-    /**
-     * Returns received header for message tracing. Returns string.
-     * @access private
-     * @return string
-     */
-    function received() {
-        // Check for vars because they might not exist.  Possibly
-        // write a small retrieval function (that mailer can use too!)
-
-        if ($this->get_server_var('SERVER_NAME') != '')
-	{
-            $protocol = ($this->get_server_var('HTTPS') == 'on') ? 'HTTPS' : 'HTTP';
-	    $remote = $this->get_server_var('REMOTE_HOST');
-	    if ($remote == '')
-	        $remote = 'phpmailer';
-	    $remote .= ' (['.$this->get_server_var('REMOTE_ADDR').'])';
-	}
-        else
-	{
-            $protocol = 'local';
-	    $remote = $this->get_server_var('USER');
-	    if ($remote == '')
-	        $remote = 'phpmailer';
-	}
-
-        $str = sprintf("Received: from %s %s\tby %s " .
-               "with %s (phpmailer);%s\t%s%s",
-	       $remote,
-	       $this->LE,
-               $this->get_server_hostname(),
-	       $protocol,
-               $this->LE,
-               $this->rfc_date(),
-               $this->LE);
+        $result = sprintf("%s %s%04d", date("D, j M Y H:i:s"), $tzs, $tz);
 
-        return $str;
+        return $result;
     }
     
     /**
@@ -1611,7 +1419,7 @@
      * @access private
      * @return mixed
      */
-    function get_server_var($varName) {
+    function ServerVar($varName) {
         global $HTTP_SERVER_VARS;
         global $HTTP_ENV_VARS;
 
@@ -1633,147 +1441,59 @@
      * @access private
      * @return string
      */
-    function get_server_hostname() {
-        if ($this->Hostname != '')
-	    return $this->Hostname;
-	elseif ($this->get_server_var('SERVER_NAME') != '')
-	    return $this->get_server_var('SERVER_NAME');
-	else
-	    return 'localhost.localdomain';
+    function ServerHostname() {
+        if ($this->Hostname != "")
+            $result = $this->Hostname;
+        elseif ($this->ServerVar('SERVER_NAME') != "")
+            $result = $this->ServerVar('SERVER_NAME');
+        else
+            $result = "localhost.localdomain";
+
+        return $result;
     }
 
     /**
-     * Changes every end of line from CR or LF to CRLF.  Returns string.
+     * Returns a message in the appropriate language.
      * @access private
      * @return string
      */
-    function fix_eol($str) {
-        $str = str_replace("\r\n", "\n", $str);
-        $str = str_replace("\r", "\n", $str);
-        $str = str_replace("\n", $this->LE, $str);
-        return $str;
+    function Lang($key) {
+        if(count($this->language) < 1)
+            $this->SetLanguage("en"); // set the default language
+    
+        if(isset($this->language[$key]))
+            return $this->language[$key];
+        else
+            return "Language string failed to load: " . $key;
     }
-
+    
     /**
-     * Adds a custom header.  Returns void.
-     * @access public
-     * @return void
+     * Returns true if an error occurred.
+     * @return bool
      */
-    function AddCustomHeader($custom_header) {
-        // Append to $custom_header array
-        $this->CustomHeader[] = explode(":", $custom_header, 2);
+    function IsError() {
+        return ($this->error_count > 0);
     }
 
     /**
-     * Adds all the Microsoft message headers.  Returns string.
+     * Changes every end of line from CR or LF to CRLF.  
      * @access private
      * @return string
      */
-    function AddMSMailHeaders() {
-        $MSHeader = "";
-        if($this->Priority == 1)
-            $MSPriority = "High";
-        elseif($this->Priority == 5)
-            $MSPriority = "Low";
-        else
-            $MSPriority = "Medium";
-
-        $MSHeader .= sprintf("X-MSMail-Priority: %s%s", $MSPriority, $this->LE);
-        $MSHeader .= sprintf("Importance: %s%s", $MSPriority, $this->LE);
-
-        return($MSHeader);
+    function FixEOL($str) {
+        $str = str_replace("\r\n", "\n", $str);
+        $str = str_replace("\r", "\n", $str);
+        $str = str_replace("\n", $this->LE, $str);
+        return $str;
     }
 
-}
-
-
-/**
- * Boundary - MIME message boundary class
- * @author Brent R. Matzelle
- */
-class Boundary
-{
-    /**
-     * Sets the boundary ID.
-     * @access private
-     * @var string
-     */
-    var $ID = 0;
-
     /**
-     * Sets the boundary Content Type.
-     * @access public
-     * @var string
-     */
-    var $ContentType = "text/plain";
-
-    /**
-     * Sets the Encoding.
-     * @access public
-     * @var string
-     */
-    var $Encoding = "";
-
-    /**
-     * Sets an attachment disposition.
-     * @access public
-     * @var string
-     */
-    var $Disposition = "";
-
-    /**
-     * Sets an attachment file name.
-     * @access public
-     * @var string
-     */
-    var $FileName = "";
-    
-    /**
-     * Sets the Char set.
-     * @access public
-     * @var string
-     */
-    var $CharSet = "";
-    
-    /**
-     *  Sets the line endings of the message.  Default is "\n";
-     *  @access public
-     *  @var string
-     */
-    var $LE           = "\n";
-    
-    /**
-     * Main constructor.
-     */
-    function Boundary($boundary_id) {
-        $this->ID = $boundary_id;
-    }
-    
-    /**
-     * Returns the source of the boundary.
-     * @access public
-     * @return string
+     * Adds a custom header. 
+     * @return void
      */
-    function GetSource($bLineEnding = true) {
-        $mime = array();
-        $mime[] = sprintf("--%s%s", $this->ID, $this->LE);
-        $mime[] = sprintf("Content-Type: %s; charset = \"%s\"%s", 
-                          $this->ContentType, $this->CharSet, $this->LE);
-        $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $this->Encoding, 
-                          $this->LE);
-        
-        if(strlen($this->Disposition) > 0)
-        {
-            $mime[] = sprintf("Content-Disposition: %s;");
-            if(strlen($this->FileName) > 0)
-                $mime[] = sprinf("filename=\"%s\"", $this->FileName);
-        }
-        
-        if($bLineEnding)
-            $mime[] = $this->LE;
-
-        return join("", $mime);
+    function AddCustomHeader($custom_header) {
+        $this->CustomHeader[] = explode(":", $custom_header, 2);
     }
 }
 
-?>
+?>
\ No newline at end of file
Index: xoops2jp/html/class/mail/phpmailer/class.smtp.php
diff -u xoops2jp/html/class/mail/phpmailer/class.smtp.php:1.2 xoops2jp/html/class/mail/phpmailer/class.smtp.php:1.2.6.1
--- xoops2jp/html/class/mail/phpmailer/class.smtp.php:1.2	Sat Jun 11 11:32:39 2005
+++ xoops2jp/html/class/mail/phpmailer/class.smtp.php	Tue Apr 11 22:04:03 2006
@@ -14,22 +14,40 @@
 ////////////////////////////////////////////////////
 
 /**
- * STMP is rfc 821 compliant and implements all the rfc 821 SMTP
+ * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
  * commands except TURN which will always return a not implemented
  * error. SMTP also provides some utility methods for sending mail
  * to an SMTP server.
+ * @package PHPMailer
  * @author Chris Ryan
  */
 class SMTP
 {
-    var $SMTP_PORT = 25; # the default SMTP PORT
-    var $CRLF = "\r\n";  # CRLF pair
+    /**
+     *  SMTP server port
+     *  @var int
+     */
+    var $SMTP_PORT = 25;
+    
+    /**
+     *  SMTP reply line ending
+     *  @var string
+     */
+    var $CRLF = "\r\n";
+    
+    /**
+     *  Sets whether debugging is turned on
+     *  @var bool
+     */
+    var $do_debug;       # the level of debug to perform
 
+    /**#@+
+     * @access private
+     */
     var $smtp_conn;      # the socket to the server
     var $error;          # error if any on the last call
     var $helo_rply;      # the reply the server sent to us for HELO
-
-    var $do_debug;       # the level of debug to perform
+    /**#@-*/
 
     /**
      * Initialize the class so that the data is in a known state.
@@ -101,7 +119,7 @@
         # so we will give it a longer timeout for the first read
         // Windows still does not have support for this timeout function
         if(substr(PHP_OS, 0, 3) != "WIN")
-           socket_set_timeout($this->smtp_conn, 1, 0);
+           socket_set_timeout($this->smtp_conn, $tval, 0);
 
         # get any announcement stuff
         $announce = $this->get_lines();
@@ -315,12 +333,10 @@
             while(strlen($line) > $max_line_length) {
                 $pos = strrpos(substr($line,0,$max_line_length)," ");
 
-                // fix for infinite loop bug
-                // added by onokazu, 2005/5/31
-                if (!$pos) {
+                # Patch to fix DOS attack
+                if(!$pos) {
                     $pos = $max_line_length - 1;
                 }
-                // end fix
 
                 $lines_out[] = substr($line,0,$pos);
                 $line = substr($line,$pos + 1);
@@ -454,7 +470,23 @@
             $host = "localhost";
         }
 
-        fputs($this->smtp_conn,"HELO " . $host . $this->CRLF);
+        // Send extended hello first (RFC 2821)
+        if(!$this->SendHello("EHLO", $host))
+        {
+            if(!$this->SendHello("HELO", $host))
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sends a HELO/EHLO command.
+     * @access private
+     * @return bool
+     */
+    function SendHello($hello, $host) {
+        fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
 
         $rply = $this->get_lines();
         $code = substr($rply,0,3);
@@ -465,7 +497,7 @@
 
         if($code != 250) {
             $this->error =
-                array("error" => "HELO not accepted from server",
+                array("error" => $hello . " not accepted from server",
                       "smtp_code" => $code,
                       "smtp_msg" => substr($rply,4));
             if($this->do_debug >= 1) {
@@ -476,7 +508,7 @@
         }
 
         $this->helo_rply = $rply;
-
+        
         return true;
     }
 
@@ -556,7 +588,7 @@
             return false;
         }
 
-        fputs($this->smtp_conn,"MAIL FROM:" . $from . $this->CRLF);
+        fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $this->CRLF);
 
         $rply = $this->get_lines();
         $code = substr($rply,0,3);
@@ -695,7 +727,7 @@
             return false;
         }
 
-        fputs($this->smtp_conn,"RCPT TO:" . $to . $this->CRLF);
+        fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
 
         $rply = $this->get_lines();
         $code = substr($rply,0,3);

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:04:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:04:04 +0900
Subject: [xoops-cvslog 2774] CVS update: xoops2jp/html/class/mail
Message-ID: <20060411130404.478FE2AC06B@users.sourceforge.jp>

Index: xoops2jp/html/class/mail/xoopsmultimailer.php
diff -u xoops2jp/html/class/mail/xoopsmultimailer.php:1.2 xoops2jp/html/class/mail/xoopsmultimailer.php:1.2.16.1
--- xoops2jp/html/class/mail/xoopsmultimailer.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/mail/xoopsmultimailer.php	Tue Apr 11 22:04:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmultimailer.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: xoopsmultimailer.php,v 1.2.16.1 2006/04/11 13:04:04 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -37,7 +37,7 @@
  * @author		Jochen B?nagel	<jb ＠ buennagel.com>
  * @copyright	copyright (c) 2000-2003 The XOOPS Project (http://www.xoops.org)
  *
- * @version		$Revision: 1.2 $ - $Date: 2005/03/18 12:51:55 $
+ * @version		$Revision: 1.2.16.1 $ - $Date: 2006/04/11 13:04:04 $
  */
 
 /**
@@ -61,9 +61,9 @@
  *
  * @author		Jochen Buennagel	<job ＠ buennagel.com>
  * @copyright	(c) 2000-2003 The Xoops Project - www.xoops.org
- * @version		$Revision: 1.2 $ - changed by $Author: onokazu $ on $Date: 2005/03/18 12:51:55 $
+ * @version		$Revision: 1.2.16.1 $ - changed by $Author: nobunobu $ on $Date: 2006/04/11 13:04:04 $
  */
-class XoopsMultiMailer extends phpmailer {
+class XoopsMultiMailer extends PHPMailer {
 
 	/**
 	 * "from" address
@@ -157,7 +157,7 @@
 		if ($this->From == '') {
 		    $this->From = $xoopsConfig['adminmail'];
 		}
-		
+		// $this->Sender = $xoopsConfig['adminmail']; //TODO: This line is added in OTX by Marijuana. We must verify.
 		if ($xoopsMailerConfig["mailmethod"] == "smtpauth") {
 		    $this->Mailer = "smtp";
 			$this->SMTPAuth = TRUE;
@@ -173,11 +173,14 @@
 	}
 
 	/**
-     * Formats an address correctly. This overrides the default addr_format method which does not seem to encode $FromName correctly
+     * Formats an address correctly. This overrides the default AddrFormat method
+     * which does not seem to encode $FromName correctly
+     * This method name is renamed from "addr_format", because method name in parent class is renamed.
      * @access private
      * @return string
      */
-    function addr_format($addr) {
+     //TODO: We must verify,whether we should prepare this method even now.(phpmailer is upgraded from 1.65 to 1.73)
+    function AddrFormat($addr) {
         if(empty($addr[1]))
             $formatted = $addr[0];
         else

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:04:04 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:04:04 +0900
Subject: [xoops-cvslog 2775] CVS update: xoops2jp/html/class
Message-ID: <20060411130404.6B78A2AC090@users.sourceforge.jp>

Index: xoops2jp/html/class/xoopsmailer.php
diff -u xoops2jp/html/class/xoopsmailer.php:1.2 xoops2jp/html/class/xoopsmailer.php:1.2.16.1
--- xoops2jp/html/class/xoopsmailer.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/class/xoopsmailer.php	Tue Apr 11 22:04:04 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoopsmailer.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: xoopsmailer.php,v 1.2.16.1 2006/04/11 13:04:04 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -177,14 +177,18 @@
 	// pupblic
 	function setFromEmail($value)
 	{
-		$this->fromEmail = trim($value);
-	}
+        if ($this->_checkValidEmail($value)) {
+			$this->fromEmail = trim($value);
+		}
+    }
 
 	// public
 	function setFromName($value)
 	{
-		$this->fromName = trim($value);
-	}
+        if ($this->_checkNoneContorolChar($value)) {
+			$this->fromName = trim($value);
+		}
+    }
 
 	// RMV-NOTIFY
 	// public
@@ -198,15 +202,19 @@
 	// public
 	function setPriority($value)
 	{
-		$this->priority = trim($value);
-	}
+        if ($this->_checkNoneContorolChar($value)) {
+			$this->priority = trim($value);
+		}
+    }
 
 
 	// public
 	function setSubject($value)
 	{
-		$this->subject = trim($value);
-	}
+        if ($this->_checkNoneContorolChar($value)) {
+			$this->subject = trim($value);
+		}
+    }
 
 	// public
 	function setBody($value)
@@ -251,8 +259,10 @@
 			if (!empty($this->priority)) {
 				$this->headers[] = "X-Priority: " . $this->priority;
 			}
-			$this->headers[] = "X-Mailer: PHP/".phpversion();
-			$this->headers[] = "Return-Path: ".$this->fromEmail;
+			$this->headers[] = "X-Mailer: XOOPS Cube";
+            if (!empty($this->fromEmail)) {
+				$this->headers[] = "Return-Path: ".$this->fromEmail;
+            }
 			$headers = join($this->LE, $this->headers);
 		}
 
@@ -448,14 +458,16 @@
 	// public
 	function addHeaders($value)
 	{
-		$this->headers[] = trim($value).$this->LE;
-	}
+        if ($this->_checkNoneContorolChar($value)) {
+			$this->headers[] = trim($value).$this->LE;
+		}
+    }
 
 	// public
 	function setToEmails($email)
 	{
 		if ( !is_array($email) ) {
-			if (preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$email) ) {
+            if ($this->_checkValidEmail($email)) {
 				array_push($this->toEmails, $email);
 			}
 		} else {
@@ -485,7 +497,8 @@
 		if ( !is_array($group) ) {
 			if ( strtolower(get_class($group)) == "xoopsgroup" ) {
 				$member_handler =& xoops_gethandler('member');
-				$this->setToUsers($member_handler->getUsersByGroup($group->getVar('groupid'), true));
+				$groups=&$member_handler->getUsersByGroup($group->getVar('groupid'),true);
+				$this->setToUsers($groups, true);
 			}
 		} else {
 			foreach ($group as $g) {
@@ -514,5 +527,20 @@
 	{
 
 	}
+    
+    function _checkNoneContorolChar($text) {
+        if (preg_match("/[\\0-\\31]/", $text)) {
+            $this->errors[] = "Invalid Mail Header String."; //ToDo : Use message catalog
+            return false;
+        }
+        return true;
+    }
+    function _checkValidEmail($addr) {
+        if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$addr) ) {
+            $this->errors[] = "Invalid Mail Address Format."; //ToDo : Use message catalog;
+            return false;
+        }
+        return true;
+    }
 }
 ?>
\ No newline at end of file

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:04:51 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:04:51 +0900
Subject: [xoops-cvslog 2776] CVS update: xoops2jp/html/include
Message-ID: <20060411130451.C2E132AC06B@users.sourceforge.jp>

Index: xoops2jp/html/include/comment_reply.php
diff -u xoops2jp/html/include/comment_reply.php:1.2 xoops2jp/html/include/comment_reply.php:1.2.16.1
--- xoops2jp/html/include/comment_reply.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/include/comment_reply.php	Tue Apr 11 22:04:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment_reply.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: comment_reply.php,v 1.2.16.1 2006/04/11 13:04:51 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -54,7 +54,8 @@
 $comment_handler =& xoops_gethandler('comment');
 $comment =& $comment_handler->get($com_id);
 $r_name = XoopsUser::getUnameFromId($comment->getVar('com_uid'));
-$r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');$com_title = $comment->getVar('com_title', 'E');
+$r_text = _CM_POSTER.': <b>'.$r_name.'</b>&nbsp;&nbsp;'._CM_POSTED.': <b>'.formatTimestamp($comment->getVar('com_created')).'</b><br /><br />'.$comment->getVar('com_text');
+$com_title = $comment->getVar('com_title', 'E');
 if (!preg_match("/^re:/i", $com_title)) {
 	$com_title = "Re: ".xoops_substr($com_title, 0, 56);
 }

From nobunobu ＠ users.sourceforge.jp  Tue Apr 11 22:05:15 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Tue, 11 Apr 2006 22:05:15 +0900
Subject: [xoops-cvslog 2777] CVS update:
	xoops2jp/html/modules/system/admin/preferences
Message-ID: <20060411130515.6245E2AC05A@users.sourceforge.jp>

Index: xoops2jp/html/modules/system/admin/preferences/main.php
diff -u xoops2jp/html/modules/system/admin/preferences/main.php:1.5 xoops2jp/html/modules/system/admin/preferences/main.php:1.5.4.1
--- xoops2jp/html/modules/system/admin/preferences/main.php:1.5	Mon Sep  5 05:46:11 2005
+++ xoops2jp/html/modules/system/admin/preferences/main.php	Tue Apr 11 22:05:15 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.5.4.1 2006/04/11 13:05:15 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -353,6 +353,7 @@
         $lang_updated = false;
         if ($count > 0) {
             for ($i = 0; $i < $count; $i++) {
+				$config_handler=&xoops_gethandler('config');
                 $config =& $config_handler->getConfig($conf_ids[$i]);
                 $new_value =& $_POST[$config->getVar('conf_name')];
                 if (is_array($new_value) || $new_value != $config->getVar('conf_value')) {

From onokazu ＠ users.sourceforge.jp  Tue Apr 11 23:54:06 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Tue, 11 Apr 2006 23:54:06 +0900
Subject: [xoops-cvslog 2778] CVS update: xoops2jp/html
Message-ID: <20060411145406.46E472AC07E@users.sourceforge.jp>

Index: xoops2jp/html/edituser.php
diff -u xoops2jp/html/edituser.php:1.4 xoops2jp/html/edituser.php:1.4.6.1
--- xoops2jp/html/edituser.php:1.4	Wed Aug  3 21:39:11 2005
+++ xoops2jp/html/edituser.php	Tue Apr 11 23:54:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: edituser.php,v 1.4 2005/08/03 12:39:11 onokazu Exp $
+// $Id: edituser.php,v 1.4.6.1 2006/04/11 14:54:06 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -24,7 +24,6 @@
 //  along with this program; if not, write to the Free Software              //
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
-
 $xoopsOption['pagetype'] = 'user';
 include 'mainfile.php';
 include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
@@ -344,9 +343,22 @@
         redirect_header('index.php', 3, _US_NOEDITRIGHT);
         exit();
     }
-    $user_avatar = '';
-    if (!empty($_POST['user_avatar'])) {
-        $user_avatar = trim($_POST['user_avatar']);
+    $avt_handler =& xoops_gethandler('avatar');
+    $user_avatar = 'blank.gif';
+    $user_avatar_object = false;
+    $myts =& MyTextSanitizer::getInstance();
+    if ($user_avatar_req = trim($myts->stripSlashesGPC($_POST['user_avatar']))) {
+        // allow system avatar selection only
+        if (preg_match("/^savt/", $user_avatar_req)) {
+            $criteria =& new CriteriaCompo(new Criteria('avatar_file', addslashes($user_avatar_req)));
+            $criteria->add(new Criteria('avatar_type', 'S'));
+            if ($avatars = $avt_handler->getObjects($criteria)) {
+                if (is_object($avatars[0])) {
+                    $user_avatar = $avatars[0]->getVar('avatar_file');
+                    $user_avatar_object =& $avatars[0];
+                }
+            }
+        }
     }
     $user_avatarpath = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH.'/'.$user_avatar));
     if (0 === strpos($user_avatarpath, XOOPS_UPLOAD_PATH) && is_file($user_avatarpath)) {
@@ -359,9 +371,10 @@
             include XOOPS_ROOT_PATH.'/footer.php';
             exit();
         }
-        $avt_handler =& xoops_gethandler('avatar');
-        if ($oldavatar && $oldavatar != 'blank.gif' && !preg_match("/^savt/", strtolower($oldavatar))) {
-            $avatars =& $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
+        if ($oldavatar && $oldavatar != 'blank.gif' && preg_match("/^cavt/", strtolower($oldavatar))) {
+            $criteria =& new CriteriaCompo(new Criteria('avatar_file', addslashes($oldavatar)));
+            $criteria->add(new Criteria('avatar_type', 'C'));
+            $avatars =& $avt_handler->getObjects($criteria);
             if (is_object($avatars[0])) {
                 $avt_handler->delete($avatars[0]);
             }
@@ -370,11 +383,8 @@
                 unlink($oldavatar_path);
             }
         }
-        if ($user_avatar != 'blank.gif') {
-            $avatars =& $avt_handler->getObjects(new Criteria('avatar_file', $user_avatar));
-            if (is_object($avatars[0])) {
-                $avt_handler->addUser($avatars[0]->getVar('avatar_id'), $xoopsUser->getVar('uid'));
-            }
+        if (is_object($user_avatar_object)) {
+            $avt_handler->addUser($user_avatar_object->getVar('avatar_id'), $xoopsUser->getVar('uid'));
         }
     }
     redirect_header('userinfo.php?uid='.$uid, 0, _US_PROFUPDATED);

From tom_g3x ＠ users.sourceforge.jp  Wed Apr 12 00:03:33 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed, 12 Apr 2006 00:03:33 +0900
Subject: [xoops-cvslog 2779] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060411150333.D45672AC01E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_comment.html
diff -u xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.1 xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.2
--- xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.1	Sun Apr  9 10:24:04 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment.html	Wed Apr 12 00:03:33 2006
@@ -1,50 +1,55 @@
 <!-- start comment post -->
-        <tr>
-          <td class="head"><a id="comment<{$comment.id}>"></a> <{$comment.poster.uname}></td>
-          <td class="head"><div class="comDate"><span class="comDateCaption"><{$lang_posted}>:</span> <{$comment.date_posted}>&nbsp;&nbsp;<span class="comDateCaption"><{$lang_updated}>:</span> <{$comment.date_modified}></div></td>
-        </tr>
-        <tr>
-
-          <{if $comment.poster.id != 0}>
-
-          <td class="odd"><div class="comUserRank"><div class="comUserRankText"><{$comment.poster.rank_title}></div><img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" /></div><img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" /><div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div><div class="comUserStat"><span class="comUserStatCaption"><{$lang_from}>:</span> <{$comment.poster.from}></div><div class="comUserStat"><span class="comUserStatCaption"><{$lang_posts}>:</span> <{$comment.poster.postnum}></div><div class="comUserStatus"><{$comment.poster.status}></div></td>
-
-          <{else}>
-
-          <td class="odd"> </td>
-
-          <{/if}>
-
-          <td class="odd">
-            <div class="comTitle"><{$comment.image}><{$comment.title}></div><div class="comText"><{$comment.text}></div>
-          </td>
-        </tr>
-        <tr>
-          <td class="even"></td>
-
-          <{if $xoops_iscommentadmin == true}>
-
-          <td class="even" align="right">
-            <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a><a href="<{$deletecomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" /></a><a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
-          </td>
-
-          <{elseif $xoops_isuser == true && $xoops_userid == $comment.poster.id}>
-
-          <td class="even" align="right">
-            <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a><a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
-          </td>
-
-          <{elseif $xoops_isuser == true || $anon_canpost == true}>
-
-          <td class="even" align="right">
-            <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
-          </td>
-
-          <{else}>
-
-          <td class="even"> </td>
-
-          <{/if}>
-
-        </tr>
+  <tr>
+    <td class="head"><a id="comment<{$comment.id}>"></a> <{$comment.poster.uname}></td>
+    <td class="head">
+      <div class="comDate"><span class="comDateCaption"><{$lang_posted}>:</span> <{$comment.date_posted}>&nbsp;&nbsp;<span class="comDateCaption"><{$lang_updated}>:</span> <{$comment.date_modified}></div>
+    </td>
+  </tr>
+  <tr>
+    <{if $comment.poster.id != 0}>
+      <td class="odd">
+        <div class="comUserRank">
+          <div class="comUserRankText"><{$comment.poster.rank_title}></div>
+          <img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" />
+        </div>
+        <img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" />
+        <div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div>
+        <div class="comUserStat"><span class="comUserStatCaption"><{$lang_from}>:</span> <{$comment.poster.from}></div>
+        <div class="comUserStat"><span class="comUserStatCaption"><{$lang_posts}>:</span> <{$comment.poster.postnum}></div>
+        <div class="comUserStatus"><{$comment.poster.status}></div>
+      </td>
+    <{else}>
+      <td class="odd"> </td>
+    <{/if}>
+
+    <td class="odd">
+      <div class="comTitle"><{$comment.image}><{$comment.title}></div>
+      <div class="comText"><{$comment.text}></div>
+    </td>
+  </tr>
+  <tr>
+    <{if $xoops_iscommentadmin == true}>
+      <td class="even">
+        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
+        <a href="<{$deletecomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" /></a>
+      </td>
+      <td class="even" align="right">
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+      </td>
+    <{elseif $xoops_isuser == true && $xoops_userid == $comment.poster.id}>
+      <td class="even">
+        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
+      </td>
+      <td class="even" align="right">
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+      </td>
+    <{elseif $xoops_isuser == true || $anon_canpost == true}>
+      <td class="even"></td>
+      <td class="even" align="right">
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+      </td>
+    <{else}>
+      <td class="even"> </td>
+    <{/if}>
+  </tr>
 <!-- end comment post -->
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Wed Apr 12 00:23:04 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed, 12 Apr 2006 00:23:04 +0900
Subject: [xoops-cvslog 2780] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060411152304.65E752AC0BA@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.3	Sun Apr  9 23:48:01 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Wed Apr 12 00:23:04 2006
@@ -38,9 +38,9 @@
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
-    <tr class="<{cycle values='odd,even'}>">
+    <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
       <td><{$obj->getVar('bid')}></td>
-      <td>
+      <td style="text-align:left;">
         <{if $obj->mModule}>
           <{$obj->mModule->getVar('name')}>
         <{else}>
@@ -48,11 +48,11 @@
         <{/if}>
       </td>
 <{*
-      <td><{$obj->getVar('name')}></td>
+      <td style="text-align:left;"><{$obj->getVar('name')}></td>
 *}>
-      <td><{$obj->getVar('title')}></td>
+      <td style="text-align:left;"><{$obj->getVar('title')}></td>
       <td><{$obj->getVar('c_type')}></td>
-      <td><{$obj->getVar('template')}></td>
+      <td style="text-align:left;"><{$obj->getVar('template')}></td>
       <td>
         <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
         <{if $obj->get('block_type') == 'C'}>

From tom_g3x ＠ users.sourceforge.jp  Wed Apr 12 00:23:28 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Wed, 12 Apr 2006 00:23:28 +0900
Subject: [xoops-cvslog 2781] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060411152328.926E52AC08F@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/user_search.html
diff -u xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.1 xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.2
--- xoops2jp/html/modules/user/admin/templates/user_search.html:1.1.2.1	Tue Apr 11 18:16:46 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search.html	Wed Apr 12 00:23:28 2006
@@ -1,8 +1,10 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=UserList"><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></a>
+  &raquo;&raquo; <a href="./index.php?action=UserSearch"><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></a>
 </div>
 
+<h3><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></h3>
+
 <{if $actionForm->hasError()}>
   <ul>
     <{foreach item=message from=$actionForm->getErrorMessages()}>
@@ -15,6 +17,9 @@
   <{xoops_token form=$actionForm}>
   <table class="outer">
     <tr>
+      <th colspan="2"><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></th>
+    </tr>
+    <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_UNAME}></td>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=uname value=$actionForm->get('uname') size=25 maxlength=25}>
@@ -119,16 +124,16 @@
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=mail_condition value=1}><{$smarty.const._AD_USER_LANG_MAIL_OK_USERS_ONLY}>
-        <{xoops_input type=radio name=mail_condition value=2}><{$smarty.const._AD_USER_LANG_MAIL_NG_USERS_ONLY}>
+        <{xoops_input type=radio name=mail_condition value=1}><{$smarty.const._AD_USER_LANG_MAIL_OK_USERS_ONLY}><br />
+        <{xoops_input type=radio name=mail_condition value=2}><{$smarty.const._AD_USER_LANG_MAIL_NG_USERS_ONLY}><br />
         <{xoops_input type=radio name=mail_condition value=3 default=3}><{$smarty.const._AD_USER_LANG_ALL_OF_USERS}>
       </td>
     </tr>
     <tr>
       <td class="head"><{$smarty.const._AD_USER_LANG_DISPLAY_USER_LEVEL}></td>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=radio name=user_level value=1}><{$smarty.const._AD_USER_LANG_APPROVE_USERS_ONLY}>
-        <{xoops_input type=radio name=user_level value=2}><{$smarty.const._AD_USER_LANG_PENDING_USERS_ONLY}>
+        <{xoops_input type=radio name=user_level value=1}><{$smarty.const._AD_USER_LANG_APPROVE_USERS_ONLY}><br />
+        <{xoops_input type=radio name=user_level value=2}><{$smarty.const._AD_USER_LANG_PENDING_USERS_ONLY}><br />
         <{xoops_input type=radio name=user_level value=3 default=3}><{$smarty.const._AD_USER_LANG_ALL_OF_USERS}>
       </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.1 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.2
--- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.1	Tue Apr 11 18:16:46 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Wed Apr 12 00:23:28 2006
@@ -1,6 +1,7 @@
 <div class="adminnavi">
   <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=UserList"><{$smarty.const._AD_USER_LANG_USER_LIST}></a>
+  &raquo;&raquo; <a href="./index.php?action=UserSearch"><{$smarty.const._MI_USER_ADMENU_USER_SEARCH}></a>
+  &raquo;&raquo; <{$smarty.const._AD_USER_LANG_USER_SEARCH_LIST}>
 </div>
 
 <h3><{$smarty.const._AD_USER_LANG_USER_SEARCH_LIST}></h3>

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 09:40:04 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 09:40:04 +0900
Subject: [xoops-cvslog 2782] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060412004005.A69D92AC015@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.24 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.25
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.24	Mon Apr 10 21:41:47 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Wed Apr 12 09:40:04 2006
@@ -61,7 +61,7 @@
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
 define('_AD_BASE_LANG_DOHTML', "Enable HTML tags");
-define('_AD_BASE_LANG_DOIMAGE', "doimage");
+define('_AD_BASE_LANG_DOIMAGE', "Enable [img] tag");
 define('_AD_BASE_LANG_DOSMILEY', "Use smilies");
 define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code");
 define('_AD_BASE_LANG_EDIT_FUNC', "edit func");

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 09:40:05 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 09:40:05 +0900
Subject: [xoops-cvslog 2783] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060412004005.D04D32AC060@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.29 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.30
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.29	Tue Apr 11 11:09:09 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Wed Apr 12 09:40:05 2006
@@ -61,7 +61,7 @@
 define('_AD_BASE_LANG_DISPLAY', "表示");
 define('_AD_BASE_LANG_DOBR', "改行を自動挿入する");
 define('_AD_BASE_LANG_DOHTML', "HTMLタグを有効にする");
-define('_AD_BASE_LANG_DOIMAGE', "doimage");
+define('_AD_BASE_LANG_DOIMAGE', "[img]タグを有効にする");
 define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
 define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
 define('_AD_BASE_LANG_EDIT_FUNC', "edit func");

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 09:59:41 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 09:59:41 +0900
Subject: [xoops-cvslog 2784] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060412005941.304992AC076@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/finish.php
diff -u xoops2jp/html/install/language/english/finish.php:1.2.8.2 xoops2jp/html/install/language/english/finish.php:1.2.8.3
--- xoops2jp/html/install/language/english/finish.php:1.2.8.2	Tue Apr 11 17:39:07 2006
+++ xoops2jp/html/install/language/english/finish.php	Wed Apr 12 09:59:41 2006
@@ -1,16 +1,16 @@
 <?php
-// $Id: finish.php,v 1.2.8.2 2006/04/11 08:39:07 nobunobu Exp $
+// $Id: finish.php,v 1.2.8.3 2006/04/12 00:59:41 onokazu Exp $
 $content .=
-"<h3><u>About the 2nd Stage Installation</u></h3>
-<p>The 1st stage installation of XOOPS Cube complete. You should execute the 2nd stage installation for setup system modules</p>
-<p>Click a [Next] button, and you'll see login screen. Please login with administrator's user account, that you create at the 1st stage.</p>
-<p>After login, XOOPS Cube Module list will be displayed. Then, please click a 'Install' button.</p>
-<p>Specified Modules are automatically installed, and then you can see XOOPS Cube Top Page</p>
+"<h3><u>XOOPS Cube Installer (2nd step)</u></h3>
+<p>The 1st step of XOOPS Cube installer is now complete. You should proceed to the next installation step to setup system modules.</p>
+<p>Click the [Next] button, and you will see a login screen. Please login using the administrator account created during the 1st step.</p>
+<p>After login, a list of modules to be installed will be displayed. Then, click the 'Install' button for modules you would like to be installed.</p>
+<p>Selected modules will be installed automatically, after which the top page of XOOPS Cube will be displayed and you are ready to go!</p>
 
-<u><b>Way to use</b></u>
+<u><b>Manual</b></u>
 <p>[not yet]</p>
 
 <u><b>Support</b></u>
-<p>Visit <a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a></p>
+<p>Visit <a href='http://xoopscube.org/' target='_blank'>XOOPS Cube.org</a> for more support.</p>
 ";
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 10:04:41 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 10:04:41 +0900
Subject: [xoops-cvslog 2785] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060412010441.318DD2AC076@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/finish.php
diff -u xoops2jp/html/install/language/english/finish.php:1.2.8.3 xoops2jp/html/install/language/english/finish.php:1.2.8.4
--- xoops2jp/html/install/language/english/finish.php:1.2.8.3	Wed Apr 12 09:59:41 2006
+++ xoops2jp/html/install/language/english/finish.php	Wed Apr 12 10:04:41 2006
@@ -1,11 +1,11 @@
 <?php
-// $Id: finish.php,v 1.2.8.3 2006/04/12 00:59:41 onokazu Exp $
+// $Id: finish.php,v 1.2.8.4 2006/04/12 01:04:41 onokazu Exp $
 $content .=
 "<h3><u>XOOPS Cube Installer (2nd step)</u></h3>
 <p>The 1st step of XOOPS Cube installer is now complete. You should proceed to the next installation step to setup system modules.</p>
 <p>Click the [Next] button, and you will see a login screen. Please login using the administrator account created during the 1st step.</p>
-<p>After login, a list of modules to be installed will be displayed. Then, click the 'Install' button for modules you would like to be installed.</p>
-<p>Selected modules will be installed automatically, after which the top page of XOOPS Cube will be displayed and you are ready to go!</p>
+<p>After login, a list of modules that can be installed will be displayed. Select the modules that you would like to be installed and then click the 'Install' button.</p>
+<p>Specified modules will be installed automatically, after which the top page of XOOPS Cube will be displayed and you are ready to go!</p>
 
 <u><b>Manual</b></u>
 <p>[not yet]</p>

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 23:22:55 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 23:22:55 +0900
Subject: [xoops-cvslog 2786] CVS update: xoops2jp/html
Message-ID: <20060412142255.A2D1E2AC04C@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2 xoops2jp/html/mainfile.dist.php:1.2.16.1
--- xoops2jp/html/mainfile.dist.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/mainfile.dist.php	Wed Apr 12 23:22:55 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: mainfile.dist.php,v 1.2.16.1 2006/04/12 14:22:55 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,73 +26,73 @@
 //  ------------------------------------------------------------------------ //
 
 if ( !defined("XOOPS_MAINFILE_INCLUDED") ) {
-	define("XOOPS_MAINFILE_INCLUDED",1);
+    define("XOOPS_MAINFILE_INCLUDED",1);
 
-	// XOOPS Physical Path
-	// Physical path to your main XOOPS directory WITHOUT trailing slash
-	// Example: define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
-	define('XOOPS_ROOT_PATH', '');
-
-	// XOOPS Virtual Path (URL)
-	// Virtual path to your main XOOPS directory WITHOUT trailing slash
-	// Example: define('XOOPS_URL', 'http://url_to_xoops_directory');
-	define('XOOPS_URL', 'http://');
-
-	define('XOOPS_CHECK_PATH', 0);
-	// Protect against external scripts execution if safe mode is not enabled
-	if ( XOOPS_CHECK_PATH && !@ini_get('safe_mode') ) {
-		if ( function_exists('debug_backtrace') ) {
-			$xoopsScriptPath = debug_backtrace();
-			if ( !count($xoopsScriptPath) ) {
-			 	die("XOOPS path check: this file cannot be requested directly");
-			}
-			$xoopsScriptPath = $xoopsScriptPath[0]['file'];
-		} else {
-			$xoopsScriptPath = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
-		}
-		if ( DIRECTORY_SEPARATOR != '/' ) {
-			// IIS6 may double the \ chars
-			$xoopsScriptPath = str_replace( strpos( $xoopsScriptPath, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsScriptPath);
-		}
-		if ( strcasecmp( substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace( DIRECTORY_SEPARATOR, '/', XOOPS_ROOT_PATH)) ) {
-		 	exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
-		}
-	}
-
-	// Database
-	// Choose the database to be used
-	define('XOOPS_DB_TYPE', 'mysql');
-
-	// Table Prefix
-	// This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
-	define('XOOPS_DB_PREFIX', 'xoops');
-
-	// Database Hostname
-	// Hostname of the database server. If you are unsure, 'localhost' works in most cases.
-	define('XOOPS_DB_HOST', 'localhost');
-
-	// Database Username
-	// Your database user account on the host
-	define('XOOPS_DB_USER', '');
-
-	// Database Password
-	// Password for your database user account
-	define('XOOPS_DB_PASS', '');
-
-	// Database Name
-	// The name of database on the host. The installer will attempt to create the database if not exist
-	define('XOOPS_DB_NAME', '');
-
-	// Use persistent connection? (Yes=1 No=0)
-	// Default is 'Yes'. Choose 'Yes' if you are unsure.
-	define('XOOPS_DB_PCONNECT', 0);
-
-	define("XOOPS_GROUP_ADMIN", "1");
-	define("XOOPS_GROUP_USERS", "2");
-	define("XOOPS_GROUP_ANONYMOUS", "3");
-
-	if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
-		include XOOPS_ROOT_PATH."/include/common.php";
-	}
+    // XOOPS Physical Path
+    // Physical path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
+    define('XOOPS_ROOT_PATH', '');
+
+    // XOOPS Virtual Path (URL)
+    // Virtual path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_URL', 'http://url_to_xoops_directory');
+    define('XOOPS_URL', 'http://');
+
+    define('XOOPS_CHECK_PATH', 0);
+    // Protect against external scripts execution if safe mode is not enabled
+    if ( XOOPS_CHECK_PATH && !@ini_get('safe_mode') ) {
+        if ( function_exists('debug_backtrace') ) {
+            $xoopsScriptPath = debug_backtrace();
+            if ( !count($xoopsScriptPath) ) {
+                die("XOOPS path check: this file cannot be requested directly");
+            }
+            $xoopsScriptPath = $xoopsScriptPath[0]['file'];
+        } else {
+            $xoopsScriptPath = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
+        }
+        if ( DIRECTORY_SEPARATOR != '/' ) {
+            // IIS6 may double the \ chars
+            $xoopsScriptPath = str_replace( strpos( $xoopsScriptPath, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsScriptPath);
+        }
+        if ( strcasecmp( substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace( DIRECTORY_SEPARATOR, '/', XOOPS_ROOT_PATH)) ) {
+            exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+        }
+    }
+
+    // Database
+    // Choose the database to be used
+    define('XOOPS_DB_TYPE', 'mysql');
+
+    // Table Prefix
+    // This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
+    define('XOOPS_DB_PREFIX', 'xoops');
+
+    // Database Hostname
+    // Hostname of the database server. If you are unsure, 'localhost' works in most cases.
+    define('XOOPS_DB_HOST', 'localhost');
+
+    // Database Username
+    // Your database user account on the host
+    define('XOOPS_DB_USER', '');
+
+    // Database Password
+    // Password for your database user account
+    define('XOOPS_DB_PASS', '');
+
+    // Database Name
+    // The name of database on the host. The installer will attempt to create the database if not exist
+    define('XOOPS_DB_NAME', '');
+
+    // Use persistent connection? (Yes=1 No=0)
+    // Default is 'No'. Choose 'No' if you are unsure.
+    define('XOOPS_DB_PCONNECT', 0);
+
+    define("XOOPS_GROUP_ADMIN", "1");
+    define("XOOPS_GROUP_USERS", "2");
+    define("XOOPS_GROUP_ANONYMOUS", "3");
+
+    if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
+        include XOOPS_ROOT_PATH."/include/common.php";
+    }
 }
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Wed Apr 12 23:23:42 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Wed, 12 Apr 2006 23:23:42 +0900
Subject: [xoops-cvslog 2787] CVS update: xoops2jp/html
Message-ID: <20060412142342.B63EF2AC04C@users.sourceforge.jp>

Index: xoops2jp/html/mainfile.dist.php
diff -u xoops2jp/html/mainfile.dist.php:1.2 xoops2jp/html/mainfile.dist.php:1.2.8.1
--- xoops2jp/html/mainfile.dist.php:1.2	Fri Mar 18 21:51:55 2005
+++ xoops2jp/html/mainfile.dist.php	Wed Apr 12 23:23:42 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mainfile.dist.php,v 1.2 2005/03/18 12:51:55 onokazu Exp $
+// $Id: mainfile.dist.php,v 1.2.8.1 2006/04/12 14:23:42 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -26,73 +26,73 @@
 //  ------------------------------------------------------------------------ //
 
 if ( !defined("XOOPS_MAINFILE_INCLUDED") ) {
-	define("XOOPS_MAINFILE_INCLUDED",1);
+    define("XOOPS_MAINFILE_INCLUDED",1);
 
-	// XOOPS Physical Path
-	// Physical path to your main XOOPS directory WITHOUT trailing slash
-	// Example: define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
-	define('XOOPS_ROOT_PATH', '');
-
-	// XOOPS Virtual Path (URL)
-	// Virtual path to your main XOOPS directory WITHOUT trailing slash
-	// Example: define('XOOPS_URL', 'http://url_to_xoops_directory');
-	define('XOOPS_URL', 'http://');
-
-	define('XOOPS_CHECK_PATH', 0);
-	// Protect against external scripts execution if safe mode is not enabled
-	if ( XOOPS_CHECK_PATH && !@ini_get('safe_mode') ) {
-		if ( function_exists('debug_backtrace') ) {
-			$xoopsScriptPath = debug_backtrace();
-			if ( !count($xoopsScriptPath) ) {
-			 	die("XOOPS path check: this file cannot be requested directly");
-			}
-			$xoopsScriptPath = $xoopsScriptPath[0]['file'];
-		} else {
-			$xoopsScriptPath = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
-		}
-		if ( DIRECTORY_SEPARATOR != '/' ) {
-			// IIS6 may double the \ chars
-			$xoopsScriptPath = str_replace( strpos( $xoopsScriptPath, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsScriptPath);
-		}
-		if ( strcasecmp( substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace( DIRECTORY_SEPARATOR, '/', XOOPS_ROOT_PATH)) ) {
-		 	exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
-		}
-	}
-
-	// Database
-	// Choose the database to be used
-	define('XOOPS_DB_TYPE', 'mysql');
-
-	// Table Prefix
-	// This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
-	define('XOOPS_DB_PREFIX', 'xoops');
-
-	// Database Hostname
-	// Hostname of the database server. If you are unsure, 'localhost' works in most cases.
-	define('XOOPS_DB_HOST', 'localhost');
-
-	// Database Username
-	// Your database user account on the host
-	define('XOOPS_DB_USER', '');
-
-	// Database Password
-	// Password for your database user account
-	define('XOOPS_DB_PASS', '');
-
-	// Database Name
-	// The name of database on the host. The installer will attempt to create the database if not exist
-	define('XOOPS_DB_NAME', '');
-
-	// Use persistent connection? (Yes=1 No=0)
-	// Default is 'Yes'. Choose 'Yes' if you are unsure.
-	define('XOOPS_DB_PCONNECT', 0);
-
-	define("XOOPS_GROUP_ADMIN", "1");
-	define("XOOPS_GROUP_USERS", "2");
-	define("XOOPS_GROUP_ANONYMOUS", "3");
-
-	if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
-		include XOOPS_ROOT_PATH."/include/common.php";
-	}
+    // XOOPS Physical Path
+    // Physical path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_ROOT_PATH', '/path/to/xoops/directory');
+    define('XOOPS_ROOT_PATH', '');
+
+    // XOOPS Virtual Path (URL)
+    // Virtual path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_URL', 'http://url_to_xoops_directory');
+    define('XOOPS_URL', 'http://');
+
+    define('XOOPS_CHECK_PATH', 0);
+    // Protect against external scripts execution if safe mode is not enabled
+    if ( XOOPS_CHECK_PATH && !@ini_get('safe_mode') ) {
+        if ( function_exists('debug_backtrace') ) {
+            $xoopsScriptPath = debug_backtrace();
+            if ( !count($xoopsScriptPath) ) {
+                die("XOOPS path check: this file cannot be requested directly");
+            }
+            $xoopsScriptPath = $xoopsScriptPath[0]['file'];
+        } else {
+            $xoopsScriptPath = isset($_SERVER['PATH_TRANSLATED']) ? $_SERVER['PATH_TRANSLATED'] :  $_SERVER['SCRIPT_FILENAME'];
+        }
+        if ( DIRECTORY_SEPARATOR != '/' ) {
+            // IIS6 may double the \ chars
+            $xoopsScriptPath = str_replace( strpos( $xoopsScriptPath, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $xoopsScriptPath);
+        }
+        if ( strcasecmp( substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace( DIRECTORY_SEPARATOR, '/', XOOPS_ROOT_PATH)) ) {
+            exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+        }
+    }
+
+    // Database
+    // Choose the database to be used
+    define('XOOPS_DB_TYPE', 'mysql');
+
+    // Table Prefix
+    // This prefix will be added to all new tables created to avoid name conflict in the database. If you are unsure, just use the default 'xoops'.
+    define('XOOPS_DB_PREFIX', 'xoops');
+
+    // Database Hostname
+    // Hostname of the database server. If you are unsure, 'localhost' works in most cases.
+    define('XOOPS_DB_HOST', 'localhost');
+
+    // Database Username
+    // Your database user account on the host
+    define('XOOPS_DB_USER', '');
+
+    // Database Password
+    // Password for your database user account
+    define('XOOPS_DB_PASS', '');
+
+    // Database Name
+    // The name of database on the host. The installer will attempt to create the database if not exist
+    define('XOOPS_DB_NAME', '');
+
+    // Use persistent connection? (Yes=1 No=0)
+    // Default is 'No'. Choose 'No' if you are unsure.
+    define('XOOPS_DB_PCONNECT', 0);
+
+    define("XOOPS_GROUP_ADMIN", "1");
+    define("XOOPS_GROUP_USERS", "2");
+    define("XOOPS_GROUP_ANONYMOUS", "3");
+
+    if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
+        include XOOPS_ROOT_PATH."/include/common.php";
+    }
 }
 ?>
\ No newline at end of file

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2788] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060412151120.1358D2AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/module_list.html
diff -u xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/module_list.html:1.1.2.5	Thu Feb  2 21:27:31 2006
+++ xoops2jp/html/modules/base/admin/templates/module_list.html	Thu Apr 13 00:11:19 2006
@@ -20,23 +20,23 @@
 <table classs="outer">
   <tr>
     <th><{$smarty.const._MD_A_BASE_LANG_MID}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_NAME}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_VERSION}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_VERSION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_VERSION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_VERSION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_VERSION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_LASTUPDATE}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_LASTUPDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_LASTUPDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_LASTUPDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_LASTUPDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_WEIGHT}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_ISACTIVE}><br />
-      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_ISACTIVE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>"></a>
-      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_ISACTIVE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>"></a></th>
+      <a href="index.php?action=ModuleList&amp;sort=<{$smarty.const.MODULE_SORT_KEY_ISACTIVE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>"></a>
+      <a href="index.php?action=ModuleList&amp;sort=-<{$smarty.const.MODULE_SORT_KEY_ISACTIVE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>"></a></th>
     <th><{$smarty.const._MD_A_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=module from=$moduleObjects}>
@@ -55,11 +55,11 @@
       </td>
       <td><input type="checkbox" name="isactive[<{$module->getVar('mid')}>]" value="1" <{if $module->getVar('isactive')}>checked<{/if}> /></td>
       <td>
-        <a href="index.php?action=ModuleUpdate&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/update.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /></a>
+        <a href="index.php?action=ModuleUpdate&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/update.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" title="<{$smarty.const._MD_A_BASE_LANG_UPDATE}>" /></a>
         <{if $module->getVar('isactive') == 0 }>
-          <a href="index.php?action=ModuleUninstall&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /></a>
+          <a href="index.php?action=ModuleUninstall&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_UNINSTALL}>" /></a>
         <{/if}>
-        <a href="index.php?action=ModuleInfo&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/info.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /></a>
+        <a href="index.php?action=ModuleInfo&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/info.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /></a>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/smiles_list.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/smiles_list.html:1.1.2.3	Fri Feb  3 11:58:13 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_list.html	Thu Apr 13 00:11:19 2006
@@ -10,20 +10,20 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CODE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_CODE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_CODE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_CODE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_CODE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_SMILE_URL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_SMILE_URL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_SMILE_URL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_SMILE_URL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_SMILE_URL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_EMOTION}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_EMOTION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_EMOTION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_EMOTION}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_EMOTION}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_DISPLAY}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_DISPLAY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_DISPLAY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.SMILES_SORT_KEY_DISPLAY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.SMILES_SORT_KEY_DISPLAY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -44,8 +44,8 @@
         <{/if}>
       </td>
       <td>
-        <a href="./index.php?action=SmilesEdit&amp;id=<{$obj->get('id')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
-        <a href="./index.php?action=SmilesDelete&amp;id=<{$obj->get('id')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <a href="./index.php?action=SmilesEdit&amp;id=<{$obj->get('id')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=SmilesDelete&amp;id=<{$obj->get('id')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
     </tr>
Index: xoops2jp/html/modules/base/admin/templates/comment_list.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.9 xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.10
--- xoops2jp/html/modules/base/admin/templates/comment_list.html:1.1.2.9	Thu Mar 30 23:55:51 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html	Thu Apr 13 00:11:19 2006
@@ -36,29 +36,29 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_COM_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_MODID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_MODID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_MODID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_MODID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_MODID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_CREATED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_UID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_IP}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_IP}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_IP}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_IP}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_IP}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_COM_STATUS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_STATUS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_STATUS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.COMMENT_SORT_KEY_COM_STATUS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.COMMENT_SORT_KEY_COM_STATUS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -72,8 +72,8 @@
       <td><{$obj->getVar('com_ip')}></td>
       <td><{$obj->mStatus->getVar('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}>" /></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}>" /></a>
+        <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>
       </td>
     </tr>
     </tr>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.6	Tue Apr 11 12:20:04 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Thu Apr 13 00:11:19 2006
@@ -26,35 +26,35 @@
   <table class="outer">
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_BID}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_MID}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 <{*
       <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_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.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 *}>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_SIDE}>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a><br />
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_SIDE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a><br />
         <{$smarty.const._AD_BASE_LANG_LCR}></th>
       <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_LAST_MODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
     </tr>
     <{foreach item=obj from=$objects}>
@@ -86,11 +86,11 @@
         <td style="text-align:left;"><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
         <td>
           <{if $obj->get('block_type') == 'C'}>
-            <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+            <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
           <{else}>
-            <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+            <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" title="<{$smarty.const._EDIT}>" /></a>
           <{/if}>
-          <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+          <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         </td>
       </tr>
     <{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/install_list.html
diff -u xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/install_list.html:1.1.2.2	Fri Feb  3 17:33:15 2006
+++ xoops2jp/html/modules/base/admin/templates/install_list.html	Thu Apr 13 00:11:19 2006
@@ -17,13 +17,13 @@
   <{foreach item=module from=$moduleObjects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
       <td>
-        <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getVar('name','e')}>" /><br />
+        <img src="<{$xoops_url}>/modules/<{$module->getVar('dirname')}>/<{$module->modinfo.image}>" alt="<{$module->getVar('name','e')}>" title="<{$module->getVar('name','e')}>" /><br />
         <{$module->getVar('name')}>
       </td>
       <td><{$module->getRenderedVersion()}></td>
       <td>
-        <a href="index.php?action=ModuleInstall&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
-        <a href="index.php?action=ModuleInfo&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/info.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /></a>
+        <a href="index.php?action=ModuleInstall&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+        <a href="index.php?action=ModuleInfo&dirname=<{$module->getVar('dirname')}>"><img src="<{"icons/info.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" title="<{$smarty.const._MD_A_BASE_LANG_INFORMATION}>" /></a>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.4	Wed Apr 12 00:23:04 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Thu Apr 13 00:11:19 2006
@@ -16,25 +16,25 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_MID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 <{*
     <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_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.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 *}>
     <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_TEMPLATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -54,9 +54,9 @@
       <td><{$obj->getVar('c_type')}></td>
       <td style="text-align:left;"><{$obj->getVar('template')}></td>
       <td>
-        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
         <{if $obj->get('block_type') == 'C'}>
-          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2789] CVS update: xoops2jp/html/modules/base/templates
Message-ID: <20060412151120.3D9EF2AC080@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/templates/legacy_comment.html
diff -u xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.2 xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.3
--- xoops2jp/html/modules/base/templates/legacy_comment.html:1.1.2.2	Wed Apr 12 00:03:33 2006
+++ xoops2jp/html/modules/base/templates/legacy_comment.html	Thu Apr 13 00:11:20 2006
@@ -30,23 +30,23 @@
   <tr>
     <{if $xoops_iscommentadmin == true}>
       <td class="even">
-        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
-        <a href="<{$deletecomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" /></a>
+        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" title="<{$lang_edit}>" /></a>
+        <a href="<{$deletecomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" title="<{$lang_delete}>" /></a>
       </td>
       <td class="even" align="right">
-        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
     <{elseif $xoops_isuser == true && $xoops_userid == $comment.poster.id}>
       <td class="even">
-        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
+        <a href="<{$editcomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" title="<{$lang_edit}>" /></a>
       </td>
       <td class="even" align="right">
-        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
     <{elseif $xoops_isuser == true || $anon_canpost == true}>
       <td class="even"></td>
       <td class="even" align="right">
-        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
+        <a href="<{$replycomment_link}>&amp;com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" title="<{$lang_reply}>" /></a>
       </td>
     <{else}>
       <td class="even"> </td>
Index: xoops2jp/html/modules/base/templates/legacy_misc_smilies.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.3 xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.4
--- xoops2jp/html/modules/base/templates/legacy_misc_smilies.html:1.1.2.3	Fri Feb  3 12:05:47 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_smilies.html	Thu Apr 13 00:11:20 2006
@@ -21,7 +21,7 @@
       <td><{$obj->getVar('code')}></td>
       <td><{$obj->getVar('emotion')}></td>
       <td>
-        <img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$obj->getVar('code')}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('smile_url')}>' alt='<{$obj->getVar('emotion')}>' />
+        <img onmouseover='style.cursor="hand"' onclick='doSmilie(" <{$obj->getVar('code')}> ");' src='<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('smile_url')}>' alt='<{$obj->getVar('emotion')}>' title='<{$obj->getVar('emotion')}>' />
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/base/templates/legacy_misc_avatars.html
diff -u xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.3 xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.4
--- xoops2jp/html/modules/base/templates/legacy_misc_avatars.html:1.1.2.3	Thu Feb  2 18:18:05 2006
+++ xoops2jp/html/modules/base/templates/legacy_misc_avatars.html	Thu Apr 13 00:11:20 2006
@@ -19,7 +19,7 @@
   <tr>
     <{foreach key=key item=avatar from=$avatarsList}>
       <td>
-        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$avatar.fileName}>" alt="<{$avatar.avatarName}>" style="padding:10px; vertical-align:top;" /><br />
+        <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$avatar.fileName}>" alt="<{$avatar.avatarName}>" title="<{$avatar.avatarName}>" style="padding:10px; vertical-align:top;" /><br />
         <{$avatar.avatarName}><br />
         <input name="myimage" type="button" value="<{$smarty.const._SELECT}>" onclick="myimage_onclick(<{$avatar.counter}>)" />
       </td>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2790] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060412151120.7BED72AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/avatar_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/avatar_delete.html:1.1.2.3	Wed Mar  8 19:22:17 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_delete.html	Thu Apr 13 00:11:20 2006
@@ -25,7 +25,7 @@
     <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')}>" />
+        <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')}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/group_list.html
diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.6	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_list.html	Thu Apr 13 00:11:20 2006
@@ -19,20 +19,20 @@
   </tr>
   <{foreach item=group from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><img src="<{"icons/group.gif"|theme}>" alt="group" /></td>
+      <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="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>
-        <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <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}>" /></a>
+          <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>
         <{/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}>" /></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}>" /></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}>" /></a>
+        <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>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/user/admin/templates/group_property.html
diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.5	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/group_property.html	Thu Apr 13 00:11:20 2006
@@ -17,20 +17,20 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" /></td>
+    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="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>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+      <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}>" /></a>
+        <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>
       <{/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}>" /></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}>" /></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}>" /></a>
+      <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>
     </td>
   </tr>
 </table>
@@ -52,7 +52,7 @@
   </tr>
   <{foreach from=$users item=user }>
     <tr class="<{cycle values="odd,even"}>" style="text-align:center;">
-      <td><img src="<{"icons/user.gif"|theme}>" alt="user" /></td>
+      <td><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
       <td><{$user->getVar('uid')}></td>
       <td><b><{$user->getVar('uname')}></b></td>
       <td><{$user->getVar('name')}></td>
@@ -61,9 +61,9 @@
       <td style="text-align:right;"><{$user->getVar('posts')}></td>
       <td style="text-align:right;"><{$user->getVar('level')}></td>
       <td>
-        <a href="./index.php?action=UserEdit&amp;uid=<{$user->getVar('uid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a> 
+        <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}>" /></a>
+          <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>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/ranks_list.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/ranks_list.html:1.1.2.3	Fri Feb  3 11:58:13 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_list.html	Thu Apr 13 00:11:20 2006
@@ -10,23 +10,23 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_USER_LANG_RANK_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_ID}>"><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_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_RANK_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_TITLE}>"><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_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_RANK_MIN}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_MIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_MIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_MIN}>"><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_MIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_RANK_MAX}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_MAX}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_MAX}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.RANKS_SORT_KEY_RANK_MAX}>"><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_MAX}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <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}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_SPECIAL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <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}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.RANKS_SORT_KEY_RANK_IMAGE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <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_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -36,10 +36,10 @@
       <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')}>" /></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>
-        <a href="index.php?action=RanksEdit&amp;rank_id=<{$obj->getVar('rank_id')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$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}>" /></a>
+        <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>
       </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.7 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.7	Sat Feb  4 18:07:32 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Thu Apr 13 00:11:20 2006
@@ -17,20 +17,20 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" /></td>
+    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="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>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+      <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}>" /></a>
+        <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>
       <{/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}>" /></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}>" /></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}>" /></a>
+      <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>
     </td>
   </tr>
 </table>
Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.4 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.4	Sat Feb  4 00:03:24 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Apr 13 00:11:20 2006
@@ -24,7 +24,7 @@
   <{xoops_input type=hidden name=groupid value=$object->getVar('groupid')}>
 <table class="outer">
   <tr>
-    <th colspan="2"><img src="<{"icons/group.gif"|theme}>" alt="group" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}></th>
+    <th colspan="2"><img src="<{"icons/group.gif"|theme}>" alt="group" title="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>
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.2 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.3
--- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.2	Wed Apr 12 00:23:28 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Thu Apr 13 00:11:20 2006
@@ -12,31 +12,31 @@
   <tr>
     <th>&nbsp;</th>
     <th><{$smarty.const._AD_USER_LANG_UID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_UNAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_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.USER_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_REGDATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_USER_REGDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_LASTLOGIN}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LAST_LOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_POSTS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_LEVEL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
-      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" /></td>
+      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
       <td style="text-align:center;"><{$user->getVar('uid')}></td>
       <td><{$user->getVar('uname')}></td>
       <td><{$user->getVar('name')}></td>
@@ -45,9 +45,9 @@
       <td style="text-align:right;"><{$user->getVar('posts')}></td>
       <td style="text-align:right;"><{$user->getVar('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}>" /></a>
+        <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}>" /></a>
+          <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>
         <{/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.8 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.8	Tue Jan 31 14:32:07 2006
+++ xoops2jp/html/modules/user/admin/templates/user_list.html	Thu Apr 13 00:11:20 2006
@@ -11,31 +11,31 @@
   <tr>
     <th>&nbsp;</th>
     <th><{$smarty.const._AD_USER_LANG_UID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_UNAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_UNAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_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.USER_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_REGDATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_REGDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_REGDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_REGDATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_REGDATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_LASTLOGIN}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LASTLOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_POSTS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_POSTS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_LEVEL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.USER_SORT_KEY_LEVEL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
-      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" /></td>
+      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
       <td style="text-align:center;"><{$user->getVar('uid')}></td>
       <td><{$user->getVar('uname')}></td>
       <td><{$user->getVar('name')}></td>
@@ -44,9 +44,9 @@
       <td style="text-align:right;"><{$user->getVar('posts')}></td>
       <td style="text-align:right;"><{$user->getVar('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}>" /></a>
+        <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}>" /></a>
+          <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>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.6	Sat Feb  4 18:07:11 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Thu Apr 13 00:11:20 2006
@@ -17,20 +17,20 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" /></td>
+    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="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>
-      <a href="index.php?action=GroupEdit&amp;groupid=<{$group->getVar('groupid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+      <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}>" /></a>
+        <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>
       <{/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}>" /></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}>" /></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}>" /></a>
+      <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>
     </td>
   </tr>
 </table>
@@ -71,7 +71,7 @@
   <{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;"><img src="<{"icons/user.gif"|theme}>" alt="user" /></td>
+      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
       <td style="text-align:center;"><{$user->getVar('uid')}></td>
       <td><b><{$user->getVar('uname')}></b></td>
       <td><{$user->getVar('name')}></td>
@@ -80,9 +80,9 @@
       <td style="text-align:right;"><{$user->getVar('posts')}></td>
       <td style="text-align:right;"><{$user->getVar('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}>" /></a>
+        <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}>" /></a>
+          <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>
         <{/if}>
       </td>
     </tr>
@@ -122,7 +122,7 @@
   <{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;"><img src="<{"icons/user.gif"|theme}>" alt="user" /></td>
+      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
       <td style="text-align:center;"><{$user->getVar('uid')}></td>
       <td><b><{$user->getVar('uname')}></b></td>
       <td><{$user->getVar('name')}></td>
@@ -131,9 +131,9 @@
       <td style="text-align:right;"><{$user->getVar('posts')}></td>
       <td style="text-align:right;"><{$user->getVar('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}>" /></a> 
+        <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}>" /></a>
+          <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>
         <{/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.5 xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/avatar_list.html:1.1.2.5	Wed Mar  8 19:23:15 2006
+++ xoops2jp/html/modules/user/admin/templates/avatar_list.html	Thu Apr 13 00:11:20 2006
@@ -10,36 +10,36 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_FILE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_FILE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_FILE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_FILE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_FILE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_MIMETYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_MIMETYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_MIMETYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_MIMETYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_MIMETYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_CREATED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_DISPLAY}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_DISPLAY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_DISPLAY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_DISPLAY}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_DISPLAY}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_WEIGHT}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.AVATAR_SORT_KEY_AVATAR_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.AVATAR_SORT_KEY_AVATAR_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_USER_LANG_AVATAR_USING_COUNT}></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('avatar_id')}></td>
-      <td><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" alt="<{$obj->getVar('avatar_name')}>" /></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>
@@ -48,8 +48,8 @@
       <td><{$obj->getVar('avatar_type')}></td>
       <td><{$obj->getUsingCount()}></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}>" /></a>
-        <a href="index.php?action=AvatarDelete&amp;avatar_id=<{$obj->getVar('avatar_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <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>
       </td>
     </tr>
     </tr>
Index: xoops2jp/html/modules/user/admin/templates/ranks_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.3 xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/ranks_delete.html:1.1.2.3	Thu Feb  2 23:09:17 2006
+++ xoops2jp/html/modules/user/admin/templates/ranks_delete.html	Thu Apr 13 00:11:20 2006
@@ -40,7 +40,7 @@
     <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')}>"/>
+      <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('rank_image')}>" alt="<{$object->getVar('rank_title')}>" title="<{$object->getVar('rank_title')}>" />
     </td>
     </tr>
     <tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2791] CVS update: xoops2jp/html/themes/cube_default
Message-ID: <20060412151120.A68B32AC080@users.sourceforge.jp>

Index: xoops2jp/html/themes/cube_default/theme.html
diff -u xoops2jp/html/themes/cube_default/theme.html:1.1.2.3 xoops2jp/html/themes/cube_default/theme.html:1.1.2.4
--- xoops2jp/html/themes/cube_default/theme.html:1.1.2.3	Fri Feb 17 22:47:05 2006
+++ xoops2jp/html/themes/cube_default/theme.html	Thu Apr 13 00:11:20 2006
@@ -28,7 +28,7 @@
 <div class="outline">
 <table cellspacing="0">
 <tr>
-<td class="headerlogo"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>images/logo.gif" width="200" height="100" alt="<{$xoops_sitename}>" /></a></td>
+<td class="headerlogo"><a href="<{$xoops_url}>/"><img src="<{$xoops_imageurl}>images/logo.gif" width="200" height="100" alt="<{$xoops_sitename}>" title="<{$xoops_sitename}>" /></a></td>
 <td class="headerbanner"><{$xoops_banner}></td>
 </tr>
 </table>
@@ -95,7 +95,7 @@
 </table>
 
 <div class="footerbar">
-<a href="http://xoopscube.org"><img src="<{$xoops_imageurl}>images/poweredby.gif" width="230" height="10" alt="XOOPS Cube PROJECT" /></a><br />
+<a href="http://xoopscube.org"><img src="<{$xoops_imageurl}>images/poweredby.gif" width="230" height="10" alt="XOOPS Cube PROJECT" title="XOOPS Cube PROJECT" /></a><br />
 <{if $xoops_footer != 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href="http://www.xoopscube.org/" target="_blank">The XOOPS Project</a>'}><{$xoops_footer}><{/if}>
 </div>
 

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2792] CVS update: xoops2jp/html/modules/pm/templates
Message-ID: <20060412151120.CBD342AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/pm/templates/viewpmsg.html
diff -u xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.8 xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.9
--- xoops2jp/html/modules/pm/templates/viewpmsg.html:1.1.2.8	Sat Feb  4 00:18:14 2006
+++ xoops2jp/html/modules/pm/templates/viewpmsg.html	Thu Apr 13 00:11:20 2006
@@ -34,7 +34,7 @@
         <{if $pm->isRead()}>
           &nbsp;
         <{else}>
-          <img src="<{$xoops_url}>/images/read.gif" alt="<{$smarty.const._PM_NOTREAD}>" />
+          <img src="<{$xoops_url}>/images/read.gif" alt="<{$smarty.const._PM_NOTREAD}>" title="<{$smarty.const._PM_NOTREAD}>" />
         <{/if}>
       </td>
       <td valign="top" width="5%" style="text-align:center;">
Index: xoops2jp/html/modules/pm/templates/readpmsg.html
diff -u xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.12 xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.13
--- xoops2jp/html/modules/pm/templates/readpmsg.html:1.1.2.12	Wed Dec 28 23:34:50 2005
+++ xoops2jp/html/modules/pm/templates/readpmsg.html	Thu Apr 13 00:11:20 2006
@@ -10,7 +10,7 @@
   <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')}>" /></a>
+        <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')}>
         <{/if}>
@@ -24,7 +24,7 @@
     <td><{$smarty.const._PM_SENTC}><{$privMessage->getVar("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='' />&nbsp;<b><{$privMessage->getVar('subject')}></b></td>
+    <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>
   </tr>
   <tr class="'odd">
     <td colspan="2">
@@ -34,10 +34,10 @@
   <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}>" /></a>
+      <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>
       <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}>" /></a>
+      <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>
     </td>
   </tr>
   <tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:20 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:20 +0900
Subject: [xoops-cvslog 2793] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060412151120.F303F2AC08E@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.6 xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.7
--- xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html:1.1.2.6	Tue Jan 31 17:29:38 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplfile_list.html	Thu Apr 13 00:11:20 2006
@@ -57,26 +57,26 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_MODULE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_MODULE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_MODULE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_MODULE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_MODULE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TPLSET}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_TPLSET}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_TPLSET}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_TPLSET}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_TPLSET}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_FILE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_FILE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_FILE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_FILE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_FILE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTMODIFIED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTMODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTMODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTMODIFIED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTMODIFIED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_LASTIMPORTED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTIMPORTED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTIMPORTED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTIMPORTED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_LASTIMPORTED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPL_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLFILE_SORT_KEY_TPL_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLFILE_SORT_KEY_TPL_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -95,9 +95,9 @@
       <td><{$obj->getVar('tpl_type')}></td>
       <td>
         <{if $obj->getVar('tpl_tplset') == "default"}>
-          <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->get('tpl_id')}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
+          <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')}>" title="<{$smarty.const._EDIT}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+          <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>
         <{/if}>
       </td>
     </tr>
Index: xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.11 xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.12
--- xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html:1.1.2.11	Fri Feb  3 23:55:54 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/theme_list.html	Thu Apr 13 00:11:20 2006
@@ -31,7 +31,7 @@
     <{/if}>
       <td>
         <{if $theme->mPackage.Theme.ScreenShot}>
-          <img src="<{$smarty.const.XOOPS_THEME_URL}>/<{$theme->get('name')}>/<{$theme->mPackage.Theme.ScreenShot}>" alt="<{$theme->get('name')}>" width="120" height="90" /><br/>
+          <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>
@@ -58,9 +58,9 @@
         <{if $currentThemeName!=$theme->get('name')}>
           <input name="choose[<{$theme->get('name')|escape}>]" type="submit" value="<{$smarty.const._SELECT}>" class="formButton" />
         <{else}>
-          <img src="<{"icons/active.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" />
+          <img src="<{"icons/active.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_SELECTED}>" style="vertical-align:middle;" />
         <{/if}>
-        <img src="<{'icons/info.gif'|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}>" style="vertical-align:middle;" />
+        <img src="<{'icons/info.gif'|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_INFORMATION}>" style="vertical-align:middle;" />
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.10 xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.11
--- xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html:1.1.2.10	Fri Feb  3 01:34:14 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/tplset_list.html	Thu Apr 13 00:11:20 2006
@@ -34,18 +34,18 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_ID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_NAME}><br />
       (<{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_DESC}>)<br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREDITS}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREDITS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREDITS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREDITS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREDITS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TPLSET_CREATED}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREATED}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.TPLSET_SORT_KEY_TPLSET_CREATED}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_TEMPLATE}></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
   </tr>
@@ -69,7 +69,7 @@
       </td>
       <td style="text-align:center;">
         <{if $activeTemplateSet == $obj->getVar('tplset_name')}>
-          <img src="<{"icons/active.gif"|theme}>" alt="*active*" /><br /><br />
+          <img src="<{"icons/active.gif"|theme}>" alt="*active*" title="*active*" /><br /><br />
         <{else}>
           <form action="./index.php?action=TplsetList" method="POST">
             <{xoops_token name=$actionForm->getTokenName() value=$actionForm->getToken()}>
@@ -78,13 +78,13 @@
           </form>
         <{/if}>
         
-<{*        <a href="index.php?action=TplsetDownload&amp;tplset_id=<{$obj->get('tplset_id')}>" title="*Download*"><img src="<{"icons/download.gif"|theme}>" alt="*Download*" /></a> *}>
-        <a href="index.php?action=TplsetClone&amp;tplset_id=<{$obj->get('tplset_id')}>" title="<{$smarty.const._EDIT}>"><img src="<{"icons/clone.gif"|theme}>" alt="<{$smarty.const._CLONE}>" /></a>
+<{*        <a href="index.php?action=TplsetDownload&amp;tplset_id=<{$obj->get('tplset_id')}>"><img src="<{"icons/download.gif"|theme}>" alt="*Download*" title="*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"}>
-          <a href="index.php?action=TplsetEdit&amp;tplset_id=<{$obj->get('tplset_id')}>" title="<{$smarty.const._EDIT}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+          <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')}>
-            <a href="index.php?action=TplsetDelete&amp;tplset_id=<{$obj->get('tplset_id')}>" title="<{$smarty.const._DELETE}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+            <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}>
       </td>
@@ -126,9 +126,9 @@
       <td><{$obj->getVar('tpl_type')}></td>
       <td style="text-align:center;">
         <{if $obj->getVar('tpl_tplset') == "default"}>
-          <a href="index.php?action=TplfileView&amp;tpl_id=<{$obj->get('tpl_id')}>" title="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>"><img src="<{"icons/view.gif"|theme}>" alt="<{$smarty.const._AD_LEGACYRENDER_LANG_VIEW}>" /></a>
+          <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')}>" title="<{$smarty.const._EDIT}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+          <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>
         <{/if}>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:21 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:21 +0900
Subject: [xoops-cvslog 2794] CVS update:
	xoops2jp/html/modules/legacyRender/templates/blocks
Message-ID: <20060412151121.485862AC067@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html
diff -u xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:1.1.2.1 xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html:1.1.2.1	Fri Mar 24 22:05:46 2006
+++ xoops2jp/html/modules/legacyRender/templates/blocks/legacyRender_block_themes.html	Thu Apr 13 00:11:21 2006
@@ -1,7 +1,7 @@
 <div style="text-align: center;">
 <form action="index.php" method="post">
 <{if $block.mode==1}>
-  <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" width="<{$block.width}>" /><br />
+  <img vspace="2" id="xoops_theme_img" src="<{$xoops_imageurl}>screenshot.png" alt="screenshot" title="screenshot" width="<{$block.width}>" /><br />
   <select id="xoops_theme_select" name="xoops_theme_select" onchange="showImgSelected('xoops_theme_img','xoops_theme_select','themes','/screenshot.png', '<{$xoops_url}>');">
 <{else}>
   <select id="xoops_theme_select" name="xoops_theme_select" onchange="submit();" size="3">

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:11:21 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:11:21 +0900
Subject: [xoops-cvslog 2795] CVS update: xoops2jp/html/modules/user/templates
Message-ID: <20060412151121.251662AC080@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.8 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.9
--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.8	Wed Mar  8 23:41:48 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Thu Apr 13 00:11:21 2006
@@ -30,9 +30,9 @@
         <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" />
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" title="Avatar" />
           <{else}>
-            <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="No Avatar" />
+            <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>
@@ -59,7 +59,7 @@
         <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')}>" /></a>
+          <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>
           <{$user_pmlink}>
         </td>
       </tr>
@@ -109,7 +109,7 @@
       <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')}>" /><br />
+          <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')}>
         </td>
       </tr>
@@ -142,7 +142,7 @@
 
   <!-- start results item loop -->
   <{foreach item=result from=$module.results}>
-    <img src="<{$result.image}>" alt="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br /><small>(<{$result.time|xoops_formattimestamp:l}>)</small><br />
+    <img src="<{$result.image}>" alt="<{$module.name}>" title="<{$module.name}>" /><b><a href="<{$result.link}>"><{$result.title}></a></b><br /><small>(<{$result.time|xoops_formattimestamp:l}>)</small><br />
   <{/foreach}>
   <!-- end results item loop -->
 
Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.4	Wed Mar  8 19:24:55 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Thu Apr 13 00:11:21 2006
@@ -56,7 +56,7 @@
     <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')}>" /><br />
+          <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}>" />
         <{cycle name="table" values="</td>,</td>,</td>,</td>,</td></tr><tr>"}>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:31:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:31:24 +0900
Subject: [xoops-cvslog 2796] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060412153124.1C2E62AC095@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.13 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.14
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.13	Tue Apr 11 18:17:23 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Thu Apr 13 00:31:23 2006
@@ -122,6 +122,7 @@
 define('_AD_USER_LANG_UNDER_POSTS', "under posts");
 define('_AD_USER_LANG_UORDER', "Comments Sort Order");
 define('_AD_USER_LANG_URL', "Website");
+define('_AD_USER_LANG_USER', "User");
 define('_AD_USER_LANG_USER_AIM', "AIM");
 define('_AD_USER_LANG_USER_AVATAR', "user avatar");
 define('_AD_USER_LANG_USER_DELETE', "Delete a user");

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:31:24 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:31:24 +0900
Subject: [xoops-cvslog 2797] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060412153124.448E62AC09B@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.22 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.23
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.22	Tue Apr 11 18:17:24 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Thu Apr 13 00:31:24 2006
@@ -1,150 +1,151 @@
-<?php
-
-define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
-define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
-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_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', "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_CONTROL', "操作");
-define('_AD_USER_LANG_CREATE_NEW', "新規作成");
-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_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_LAST_LOGIN', "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_LEVEL', "レベル");
-define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
-define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
-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', "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_SENDER', "送信者");
-define('_AD_USER_LANG_SUBJECT', "件名");
-define('_AD_USER_LANG_SUBMIT', "送信");
-define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
-define('_AD_USER_LANG_THEME', "theme");
-define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
-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_AIM', "AIM");
-define('_AD_USER_LANG_USER_AVATAR', "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', "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', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
-
-?>
+<?php
+
+define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
+define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
+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_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', "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_CONTROL', "操作");
+define('_AD_USER_LANG_CREATE_NEW', "新規作成");
+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_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_LAST_LOGIN', "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_LEVEL', "レベル");
+define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
+define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
+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', "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_SENDER', "送信者");
+define('_AD_USER_LANG_SUBJECT', "件名");
+define('_AD_USER_LANG_SUBMIT', "送信");
+define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
+define('_AD_USER_LANG_THEME', "theme");
+define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
+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', "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', "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', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
+
+?>

From tom_g3x ＠ users.sourceforge.jp  Thu Apr 13 00:31:39 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Thu, 13 Apr 2006 00:31:39 +0900
Subject: [xoops-cvslog 2798] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060412153139.584D12AC095@users.sourceforge.jp>

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.3 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.4
--- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.3	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Thu Apr 13 00:31:39 2006
@@ -36,7 +36,7 @@
   </tr>
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
-      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></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><{$user->getVar('uname')}></td>
       <td><{$user->getVar('name')}></td>
Index: xoops2jp/html/modules/user/admin/templates/group_member.html
diff -u xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/group_member.html:1.1.2.7	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/group_member.html	Thu Apr 13 00:31:39 2006
@@ -17,7 +17,7 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="group" /></td>
+    <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>
@@ -71,7 +71,7 @@
   <{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;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></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>
@@ -122,7 +122,7 @@
   <{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;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></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>
Index: xoops2jp/html/modules/user/admin/templates/group_perm.html
diff -u xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.8 xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.9
--- xoops2jp/html/modules/user/admin/templates/group_perm.html:1.1.2.8	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/group_perm.html	Thu Apr 13 00:31:39 2006
@@ -17,7 +17,7 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="group" /></td>
+    <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>
Index: xoops2jp/html/modules/user/admin/templates/user_list.html
diff -u xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.9 xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.10
--- xoops2jp/html/modules/user/admin/templates/user_list.html:1.1.2.9	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/user_list.html	Thu Apr 13 00:31:39 2006
@@ -35,7 +35,7 @@
   </tr>
   <{foreach item=user from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
-      <td style="text-align:center;"><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></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><{$user->getVar('uname')}></td>
       <td><{$user->getVar('name')}></td>
Index: xoops2jp/html/modules/user/admin/templates/group_list.html
diff -u xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.7 xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.8
--- xoops2jp/html/modules/user/admin/templates/group_list.html:1.1.2.7	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/group_list.html	Thu Apr 13 00:31:39 2006
@@ -19,7 +19,7 @@
   </tr>
   <{foreach item=group from=$objects}>
     <tr class="<{cycle values='odd,even'}>" style="text-align:center;">
-      <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="group" /></td>
+      <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>
Index: xoops2jp/html/modules/user/admin/templates/group_delete.html
diff -u xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.5 xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.6
--- xoops2jp/html/modules/user/admin/templates/group_delete.html:1.1.2.5	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/group_delete.html	Thu Apr 13 00:31:39 2006
@@ -24,7 +24,7 @@
   <{xoops_input type=hidden name=groupid value=$object->getVar('groupid')}>
 <table class="outer">
   <tr>
-    <th colspan="2"><img src="<{"icons/group.gif"|theme}>" alt="group" title="group" /> <{$smarty.const._AD_USER_LANG_GROUP_DELETE}></th>
+    <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>
Index: xoops2jp/html/modules/user/admin/templates/group_property.html
diff -u xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.6 xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.7
--- xoops2jp/html/modules/user/admin/templates/group_property.html:1.1.2.6	Thu Apr 13 00:11:20 2006
+++ xoops2jp/html/modules/user/admin/templates/group_property.html	Thu Apr 13 00:31:39 2006
@@ -17,7 +17,7 @@
     <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
   </tr>
   <tr class="odd" style="text-align:center;">
-    <td><img src="<{"icons/group.gif"|theme}>" alt="group" title="group" /></td>
+    <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>
@@ -52,7 +52,7 @@
   </tr>
   <{foreach from=$users item=user }>
     <tr class="<{cycle values="odd,even"}>" style="text-align:center;">
-      <td><img src="<{"icons/user.gif"|theme}>" alt="user" title="user" /></td>
+      <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>

From onokazu ＠ users.sourceforge.jp  Thu Apr 13 12:36:10 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 13 Apr 2006 12:36:10 +0900
Subject: [xoops-cvslog 2799] CVS update: xoops2jp/html/modules/mylinks
Message-ID: <20060413033610.4C0622AC027@users.sourceforge.jp>

Index: xoops2jp/html/modules/mylinks/index.php
diff -u xoops2jp/html/modules/mylinks/index.php:1.4 xoops2jp/html/modules/mylinks/index.php:1.4.6.1
--- xoops2jp/html/modules/mylinks/index.php:1.4	Wed Aug  3 21:39:13 2005
+++ xoops2jp/html/modules/mylinks/index.php	Thu Apr 13 12:36:10 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.4 2005/08/03 12:39:13 onokazu Exp $
+// $Id: index.php,v 1.4.6.1 2006/04/13 03:36:10 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -107,7 +107,7 @@
     $path = str_replace("/"," <img src='".XOOPS_URL."/modules/mylinks/images/arrow.gif' board='0' alt='' /> ",$path);
     $new = newlinkgraphic($time, $status);
     $pop = popgraphic($hits);
-    $xoopsTpl->append('links', array('id' => $lid, 'cid' => $cid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'comments' => $comments, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&amp;lid='.$lid)));
+    $xoopsTpl->append('links', array('id' => $lid, 'cid' => $cid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'votes' => $votestring, 'comments' => $comments, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&lid='.$lid)));
 }
 include XOOPS_ROOT_PATH.'/footer.php';
 ?>
Index: xoops2jp/html/modules/mylinks/myheader.php
diff -u xoops2jp/html/modules/mylinks/myheader.php:1.5 xoops2jp/html/modules/mylinks/myheader.php:1.5.4.1
--- xoops2jp/html/modules/mylinks/myheader.php:1.5	Mon Sep  5 05:46:10 2005
+++ xoops2jp/html/modules/mylinks/myheader.php	Thu Apr 13 12:36:10 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: myheader.php,v 1.5 2005/09/04 20:46:10 onokazu Exp $
+// $Id: myheader.php,v 1.5.4.1 2006/04/13 03:36:10 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -42,7 +42,7 @@
 $cid = intval($_GET['cid']);
 echo"<html><head><style><!--.bg1 {    background-color : #E3E4E0;}.bg2 {    background-color : #e5e5e5;}.bg3 {     background-color : #f6f6f6;}.bg4 {    background-color : #f0f0f0;}.bg5 {    background-color : f8f8f8;}body { margin-left: 0px;margin-top: 0px;margin-right: 0px;margin-bottom: 0px;font-family: Tahoma, taipei; color;#000000; font-size: 10px; background-color : #2F5376; color: #ffffff;}a {  font-weight: bold;font-family: Tahoma, taipei; font-size: 10px; text-decoration: none; color: #666666; font-style: normal}A:hover {  font-weight: bold;text-decoration: underline;  font-family: Tahoma, taipei; font-size: 10px; color: #FF9966; font-style: normal}td {  font-family: Tahoma, taipei; color: #000000; font-size: 10px;border-top-width : 1px; border-right-width : 1px; border-bottom-width : 1px; border-left-width : 1px;}img { border:0;}//--></style>";
 $mail_subject = rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename']));
-$mail_body = rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&amp;lid='.$lid);
+$mail_body = rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&lid='.$lid);
 ?>
 
 </head><body>
Index: xoops2jp/html/modules/mylinks/viewcat.php
diff -u xoops2jp/html/modules/mylinks/viewcat.php:1.5 xoops2jp/html/modules/mylinks/viewcat.php:1.5.4.1
--- xoops2jp/html/modules/mylinks/viewcat.php:1.5	Mon Sep  5 05:46:10 2005
+++ xoops2jp/html/modules/mylinks/viewcat.php	Thu Apr 13 12:36:10 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: viewcat.php,v 1.5 2005/09/04 20:46:10 onokazu Exp $
+// $Id: viewcat.php,v 1.5.4.1 2006/04/13 03:36:10 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -139,7 +139,7 @@
         $path = str_replace("/"," <img src='".XOOPS_URL."/modules/mylinks/images/arrow.gif' board='0' alt='' /> ",$path);
         $new = newlinkgraphic($time, $status);
         $pop = popgraphic($hits);
-        $xoopsTpl->append('links', array('id' => $lid, 'cid' => $cid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'comments' => $comments, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&amp;lid='.$lid)));
+        $xoopsTpl->append('links', array('id' => $lid, 'cid' => $cid, 'rating' => number_format($rating, 2), 'title' => $myts->makeTboxData4Show($ltitle).$new.$pop, 'category' => $path, 'logourl' => $myts->makeTboxData4Show($logourl), 'updated' => formatTimestamp($time,"m"), 'description' => $myts->makeTareaData4Show($description,0), 'adminlink' => $adminlink, 'hits' => $hits, 'comments' => $comments, 'votes' => $votestring, 'mail_subject' => rawurlencode(sprintf(_MD_INTRESTLINK,$xoopsConfig['sitename'])), 'mail_body' => rawurlencode(sprintf(_MD_INTLINKFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mylinks/singlelink.php?cid='.$cid.'&lid='.$lid)));
     }
     $orderby = convertorderbyout($orderby);
     //Calculates how many pages exist.  Which page one should be on, etc...

From onokazu ＠ users.sourceforge.jp  Thu Apr 13 12:36:48 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 13 Apr 2006 12:36:48 +0900
Subject: [xoops-cvslog 2800] CVS update: xoops2jp/html/modules/mydownloads
Message-ID: <20060413033648.32B3B2AC027@users.sourceforge.jp>

Index: xoops2jp/html/modules/mydownloads/index.php
diff -u xoops2jp/html/modules/mydownloads/index.php:1.4 xoops2jp/html/modules/mydownloads/index.php:1.4.6.1
--- xoops2jp/html/modules/mydownloads/index.php:1.4	Wed Aug  3 21:39:13 2005
+++ xoops2jp/html/modules/mydownloads/index.php	Thu Apr 13 12:36:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.4 2005/08/03 12:39:13 onokazu Exp $
+// $Id: index.php,v 1.4.6.1 2006/04/13 03:36:48 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -126,7 +126,7 @@
     } else {
         $votestring = sprintf(_MD_NUMVOTES,$votes);
     }
-        $xoopsTpl->append('file', array('id' => $lid,'cid'=>$cid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'platform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&amp;lid='.$lid)));
+        $xoopsTpl->append('file', array('id' => $lid,'cid'=>$cid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'platform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&lid='.$lid)));
 }
 
 include XOOPS_ROOT_PATH."/modules/mydownloads/footer.php";
Index: xoops2jp/html/modules/mydownloads/ratefile.php
diff -u xoops2jp/html/modules/mydownloads/ratefile.php:1.5 xoops2jp/html/modules/mydownloads/ratefile.php:1.5.4.1
--- xoops2jp/html/modules/mydownloads/ratefile.php:1.5	Mon Sep  5 05:46:09 2005
+++ xoops2jp/html/modules/mydownloads/ratefile.php	Thu Apr 13 12:36:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: ratefile.php,v 1.5 2005/09/04 20:46:09 onokazu Exp $
+// $Id: ratefile.php,v 1.5.4.1 2006/04/13 03:36:48 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -98,6 +98,7 @@
     $xoopsOption['template_main'] = 'mydownloads_ratefile.html';
     include XOOPS_ROOT_PATH."/header.php";
     $lid = intval($_GET['lid']);
+    $cid = intval($_GET['cid']);
     $result=$xoopsDB->query("SELECT title FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE lid=$lid");
     list($title) = $xoopsDB->fetchRow($result);
     $title = $myts->makeTboxData4Show($title);
@@ -111,5 +112,4 @@
     include XOOPS_ROOT_PATH.'/footer.php';
 
 }
-include "footer.php";
-?>
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/mydownloads/singlefile.php
diff -u xoops2jp/html/modules/mydownloads/singlefile.php:1.5 xoops2jp/html/modules/mydownloads/singlefile.php:1.5.4.1
--- xoops2jp/html/modules/mydownloads/singlefile.php:1.5	Mon Sep  5 05:46:09 2005
+++ xoops2jp/html/modules/mydownloads/singlefile.php	Thu Apr 13 12:36:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: singlefile.php,v 1.5 2005/09/04 20:46:09 onokazu Exp $
+// $Id: singlefile.php,v 1.5.4.1 2006/04/13 03:36:48 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -73,7 +73,7 @@
     $xoopsTpl->assign('show_screenshot', true);
     $xoopsTpl->assign('lang_noscreenshot', _MD_NOSHOTS);
 }
-$xoopsTpl->assign('file', array('id' => $lid, 'cid' => $cid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'platform' => $platform, 'comments' => $comments, 'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&amp;lid='.$lid)));
+$xoopsTpl->assign('file', array('id' => $lid, 'cid' => $cid,'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'platform' => $platform, 'comments' => $comments, 'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&lid='.$lid)));
 $xoopsTpl->assign('lang_description', _MD_DESCRIPTIONC);
 $xoopsTpl->assign('lang_lastupdate', _MD_LASTUPDATEC);
 $xoopsTpl->assign('lang_hits', _MD_HITSC);
Index: xoops2jp/html/modules/mydownloads/topten.php
diff -u xoops2jp/html/modules/mydownloads/topten.php:1.2 xoops2jp/html/modules/mydownloads/topten.php:1.2.16.1
--- xoops2jp/html/modules/mydownloads/topten.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/modules/mydownloads/topten.php	Thu Apr 13 12:36:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: topten.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: topten.php,v 1.2.16.1 2006/04/13 03:36:48 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -34,11 +34,11 @@
 include XOOPS_ROOT_PATH."/header.php";
 //generates top 10 charts by rating and hits for each main category
 if(!empty($_GET['rate'])){
-	$sort = _MD_RATING;
-	$sortDB = "rating";
+    $sort = _MD_RATING;
+    $sortDB = "rating";
 }else{
-	$sort = _MD_HITS;
-	$sortDB = "hits";
+    $sort = _MD_HITS;
+    $sortDB = "hits";
 }
 $xoopsTpl->assign('lang_sortby' ,$sort);
 $xoopsTpl->assign('lang_rank' , _MD_RANK);
@@ -52,30 +52,27 @@
 $e = 0;
 $rankings = array();
 while(list($cid,$ctitle)=$xoopsDB->fetchRow($result)){
-	$rankings[$e]['title'] = sprintf(_MD_TOP10, $myts->htmlSpecialChars($ctitle));
-	$query = "SELECT lid, cid, title, hits, rating, votes FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status>0 AND (cid=$cid";
+    $rankings[$e]['title'] = sprintf(_MD_TOP10, $myts->htmlSpecialChars($ctitle));
+    $query = "SELECT lid, cid, title, hits, rating, votes FROM ".$xoopsDB->prefix("mydownloads_downloads")." WHERE status>0 AND (cid=$cid";
 // get all child cat ids for a given cat id
-	$arr=$mytree->getAllChildId($cid);
-	$size = count($arr);
-	for($i=0;$i<$size;$i++){
-		$query .= " or cid=".$arr[$i]."";
-	}
-	$query .= ") order by ".$sortDB." DESC";
-	$result2 = $xoopsDB->query($query,10,0);
-	$rank = 1;
-	while(list($did,$dcid,$dtitle,$hits,$rating,$votes)=$xoopsDB->fetchRow($result2)){
-		$catpath = $mytree->getPathFromId($dcid, "title");
-		$catpath= substr($catpath, 1);
-		$catpath = str_replace("/"," <span class='fg2'>&raquo;&raquo;</span> ",$catpath);
-		$dtitle = $myts->makeTboxData4Show($dtitle);
-		$rankings[$e]['file'][] = array('id' => $did, 'cid' => $dcid, 'rank' => $rank, 'title' => $dtitle, 'category' => $catpath, 'hits' => $hits, 'rating' => number_format($rating, 2), 'votes' => $votes);
-		$rank++;
-	}
-	$e++;
+    $arr=$mytree->getAllChildId($cid);
+    $size = count($arr);
+    for($i=0;$i<$size;$i++){
+        $query .= " or cid=".$arr[$i]."";
+    }
+    $query .= ") order by ".$sortDB." DESC";
+    $result2 = $xoopsDB->query($query,10,0);
+    $rank = 1;
+    while(list($did,$dcid,$dtitle,$hits,$rating,$votes)=$xoopsDB->fetchRow($result2)){
+        $catpath = $mytree->getPathFromId($dcid, "title");
+        $catpath= substr($catpath, 1);
+        $catpath = str_replace("/"," <span class='fg2'>&raquo;&raquo;</span> ",$catpath);
+        $dtitle = $myts->makeTboxData4Show($dtitle);
+        $rankings[$e]['file'][] = array('id' => $did, 'cid' => $dcid, 'rank' => $rank, 'title' => $dtitle, 'category' => $catpath, 'hits' => $hits, 'rating' => number_format($rating, 2), 'votes' => $votes);
+        $rank++;
+    }
+    $e++;
 }
 $xoopsTpl->assign('rankings', $rankings);
 include XOOPS_ROOT_PATH.'/footer.php';
-
-include "footer.php";
-
-?>
+?>
\ No newline at end of file
Index: xoops2jp/html/modules/mydownloads/viewcat.php
diff -u xoops2jp/html/modules/mydownloads/viewcat.php:1.5 xoops2jp/html/modules/mydownloads/viewcat.php:1.5.4.1
--- xoops2jp/html/modules/mydownloads/viewcat.php:1.5	Mon Sep  5 05:46:09 2005
+++ xoops2jp/html/modules/mydownloads/viewcat.php	Thu Apr 13 12:36:48 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: viewcat.php,v 1.5 2005/09/04 20:46:09 onokazu Exp $
+// $Id: viewcat.php,v 1.5.4.1 2006/04/13 03:36:48 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -157,7 +157,7 @@
         } else {
             $votestring = sprintf(_MD_NUMVOTES,$votes);
         }
-        $xoopsTpl->append('file', array('id' => $lid, 'cid' => $cid, 'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'platform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&amp;lid='.$lid)));
+        $xoopsTpl->append('file', array('id' => $lid, 'cid' => $cid, 'rating' => $rating,'title' => $dtitle.$new.$pop,'logourl' => $logourl,'updated' => $datetime,'description' => $description,'adminlink' => $adminlink,'hits' => $hits,'votes' => $votestring, 'comments' => $comments, 'platform' => $platform,'size'  => $size,'homepage' => $homepage,'version'  => $version,'category'  => $path,'lang_dltimes' => sprintf(_MD_DLTIMES,$hits),'mail_subject' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename'])),'mail_body' => rawurlencode(sprintf(_MD_INTFILEFOUND,$xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/mydownloads/singlefile.php?cid='.$cid.'&lid='.$lid)));
     }
     $orderby = convertorderbyout($orderby);
 //Calculates how many pages exist.  Which page one should be on, etc...

From onokazu ＠ users.sourceforge.jp  Thu Apr 13 12:36:48 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 13 Apr 2006 12:36:48 +0900
Subject: [xoops-cvslog 2801] CVS update:
	xoops2jp/html/modules/mydownloads/templates
Message-ID: <20060413033648.5B9AD2AC089@users.sourceforge.jp>

Index: xoops2jp/html/modules/mydownloads/templates/mydownloads_modfile.html
diff -u xoops2jp/html/modules/mydownloads/templates/mydownloads_modfile.html:1.2 xoops2jp/html/modules/mydownloads/templates/mydownloads_modfile.html:1.2.6.1
--- xoops2jp/html/modules/mydownloads/templates/mydownloads_modfile.html:1.2	Sat Jun 11 11:32:43 2005
+++ xoops2jp/html/modules/mydownloads/templates/mydownloads_modfile.html	Thu Apr 13 12:36:48 2006
@@ -45,7 +45,7 @@
   </tr>
   <tr>
     <td align="right" valign="top"><{$lang_description}></td>
-    <td><textarea name=description cols=60 rows=5><{$file.description}></textarea></td>
+    <td><textarea name=description cols="60" rows="5"><{$file.description}></textarea></td>
   </tr>
   <tr>
     <td colspan="2" align="center"><br /><input type="hidden" name="logourl" value="<{$file.logourl}>" /><input type="hidden" name="lid" value="<{$file.id}>" /><input type="submit" name="submit" value="<{$lang_sendrequest}>" />&nbsp;<input type=button value="<{$lang_cancel}>" onclick="javascript:history.go(-1)" /></td>

From onokazu ＠ users.sourceforge.jp  Thu Apr 13 23:16:36 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Thu, 13 Apr 2006 23:16:36 +0900
Subject: [xoops-cvslog 2801] CVS update: xoops2jp/html/modules/newbb
Message-ID: <20060413141636.6ED542AC040@users.sourceforge.jp>

Index: xoops2jp/html/modules/newbb/viewtopic.php
diff -u xoops2jp/html/modules/newbb/viewtopic.php:1.4.2.1 xoops2jp/html/modules/newbb/viewtopic.php:1.4.2.2
--- xoops2jp/html/modules/newbb/viewtopic.php:1.4.2.1	Tue Oct 25 02:48:04 2005
+++ xoops2jp/html/modules/newbb/viewtopic.php	Thu Apr 13 23:16:36 2006
@@ -1,360 +1,360 @@
-<?php
-// $Id: viewtopic.php,v 1.4.2.1 2005/10/24 17:48:04 onokazu Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-// Author: Kazumi Ono (AKA onokazu)                                          //
-// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
-// Project: The XOOPS Project                                                //
-// ------------------------------------------------------------------------- //
-
-include 'header.php';
-$forum = isset($_GET['forum']) ? intval($_GET['forum']) : 0;
-$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
-if ( empty($forum) ) {
-    redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/index.php",2,_MD_ERRORFORUM);
-    exit();
-} elseif ( empty($topic_id) ) {
-    redirect_header('viewforum.php?forum='.$forum,2,_MD_ERRORTOPIC);
-    exit();
-}
-$topic_time = (isset($_GET['topic_time'])) ? intval($_GET['topic_time']) : 0;
-$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-
-//use users preferences
-if (is_object($xoopsUser)) {
-    $viewmode = $xoopsUser->getVar('umode');
-    $order = ($xoopsUser->getVar('uorder') == 1) ? 'DESC' : 'ASC';
-} else {
-    $viewmode = 'flat';
-    $order = 'ASC';
-}
-
-// newbb does not have nested mode
-if ($viewmode == 'nest') {
-    $viewmode = 'thread';
-}
-
-// override mode/order if any requested
-if (isset($_GET['viewmode']) && ($_GET['viewmode'] == 'flat' || $_GET['viewmode'] == 'thread')) {
-    $viewmode = $_GET['viewmode'];
-}
-if (isset($_GET['order']) && ($_GET['order'] == 'ASC' || $_GET['order'] == 'DESC')) {
-    $order = $_GET['order'];
-}
-
-if ($viewmode != 'flat') {
-    $xoopsOption['template_main'] =  'newbb_viewtopic_thread.html';
-} else {
-    $xoopsOption['template_main'] =  'newbb_viewtopic_flat.html';
-}
-
-include XOOPS_ROOT_PATH.'/header.php';
-include_once 'class/class.forumposts.php';
-
-if ( isset($_GET['move']) && 'next' == $_GET['move'] ) {
-    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time > '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time ASC LIMIT 1';
-} elseif ( isset($_GET['move']) && 'prev' == $_GET['move']) {
-    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time < '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time DESC LIMIT 1';
-} else {
-    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_id = '.$topic_id.' AND t.forum_id = '.$forum;
-}
-
-if ( !$result = $xoopsDB->query($sql) ) {
-    redirect_header('viewforum.php?forum='.$forum,2,_MD_ERROROCCURED);
-    exit();
-}
-
-if ( !$forumdata = $xoopsDB->fetchArray($result) ) {
-    redirect_header('viewforum.php?forum='.$forum,2,_MD_FORUMNOEXIST);
-    exit();
-}
-$xoopsTpl->assign('topic_id', $forumdata['topic_id']);
-$topic_id = $forumdata['topic_id'];
-$xoopsTpl->assign('forum_id', $forumdata['forum_id']);
-$forum = $forumdata['forum_id'];
-$can_post = 0;
-$show_reg = 0;
-if ( $forumdata['forum_type'] == 1 ) {
-    // this is a private forum.
-    $accesserror = 0;
-    if ( $xoopsUser ) {
-        if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
-            if ( !check_priv_forum_auth($xoopsUser->getVar('uid'), $forum, false) ) {
-                $accesserror = 1;
-            }
-        } else {
-            $isadminormod = 1;
-        }
-    } else {
-        $accesserror = 1;
-    }
-    if ( $accesserror == 1 ) {
-        redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/index.php",2,_MD_NORIGHTTOACCESS);
-        exit();
-    }
-    $can_post = 1;
-    $show_reg = 1;
-} else {
-    // this is not a priv forum
-    if ( $forumdata['forum_access'] == 1 ) {
-        // this is a reg user only forum
-        if ( $xoopsUser ) {
-            $can_post = 1;
-        } else {
-            $show_reg = 1;
-        }
-    } elseif ( $forumdata['forum_access'] == 2 ) {
-        // this is an open forum
-        $can_post = 1;
-    } else {
-        // this is an admin/moderator only forum
-        if ( $xoopsUser ) {
-            if ( $xoopsUser->isAdmin($xoopsModule->mid()) || is_moderator($forum, $xoopsUser->getVar('uid')) ) {
-                $can_post = 1;
-                $isadminormod = 1;
-            }
-        }
-    }
-}
-$myts =& MyTextSanitizer::getInstance();
-$forumdata['topic_title'] = $myts->makeTboxData4Show($forumdata['topic_title']);$forumdata['forum_name'] = $myts->makeTboxData4Show($forumdata['forum_name']);
-$xoopsTpl->assign(array('topic_title' => '<a href="'.$bbUrl['root'].'viewtopic.php?viewmode='.$viewmode.'&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'">'.$forumdata['topic_title'].'</a>', 'forum_name' => $forumdata['forum_name'], 'topic_time' => $forumdata['topic_time'], 'lang_nexttopic' => _MD_NEXTTOPIC, 'lang_prevtopic' => _MD_PREVTOPIC));
-
-// add image links to admin page if the user viewing this page is a forum admin
-if ( $xoopsUser ) {
-    $xoopsTpl->assign('viewer_userid', $xoopsUser->getVar('uid'));
-    if ( !empty($isadminormod) || $xoopsUser->isAdmin($xoopsModule->mid()) || is_moderator( $forum, $xoopsUser->getVar('uid')) ) {
-        // yup, the user is admin
-        // the forum is locked?
-        if ( $forumdata['topic_status'] != 1 ) {
-            // nope
-            $xoopsTpl->assign('topic_lock_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=lock&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['locktopic'].'" alt="'._MD_LOCKTOPIC.'" /></a>');
-        } else {
-            // yup, it is..
-            $xoopsTpl->assign('topic_lock_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=unlock&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['unlocktopic'].'" alt="'._MD_UNLOCKTOPIC.'" /></a>');
-        }
-        $xoopsTpl->assign('topic_move_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=move&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['movetopic'].'" alt="'._MD_MOVETOPIC.'" /></a>');
-        $xoopsTpl->assign('topic_delete_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=del&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['deltopic'].'" alt="'._MD_DELETETOPIC.'" /></a>');
-        // is the topic sticky?
-        if ( $forumdata['topic_sticky'] != 1 ) {
-            // nope, not yet..
-            $xoopsTpl->assign('topic_sticky_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=sticky&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['sticky'].'" alt="'._MD_STICKYTOPIC.'" /></a>');
-        } else {
-            // yup it is sticking..
-            $xoopsTpl->assign('topic_sticky_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=unsticky&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['unsticky'].'" alt="'._MD_UNSTICKYTOPIC.'" /></a>');
-        }
-        // need to set this also
-        $xoopsTpl->assign('viewer_is_admin', true);
-    } else {
-        // nope, the user is not a forum admin..
-        $xoopsTpl->assign('viewer_is_admin', false);
-    }
-} else {
-    // nope, the user is not a forum admin, not even registered
-    $xoopsTpl->assign(array('viewer_is_admin' => false, 'viewer_userid' => 0));
-}
-
-function showTree(&$arr, $current=0, $key=0, $prefix='', $foundusers=array()){
-    global $xoopsConfig;
-    if ($key != 0) {
-        if ( 0 != $arr[$key]['obj']->uid() ) {
-            if (!isset($foundusers[$arr[$key]['obj']->uid()])) {
-                $eachposter = new XoopsUser($arr[$key]['obj']->uid());
-                $foundusers[$arr[$key]['obj']->uid()] =& $eachposter;
-            } else {
-                $eachposter =& $foundusers[$arr[$key]['obj']->uid()];
-            }
-            $poster_rank = $eachposter->rank();
-            if ( $poster_rank['image'] != '' ) {
-                $poster_rank['image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$poster_rank['image'].'" alt="" />';
-            }
-            if ( $eachposter->isActive() ) {
-                $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>');
-            } else {
-                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous']);
-            }
-        } else {
-            $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous']);
-        }
-        $posticon = $arr[$key]['obj']->icon();
-        if ( isset($posticon) && $posticon != '' ) {
-            $post_image = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($posticon).'" alt="" />';
-        } else {
-            $post_image =  '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
-        }
-        if ($current != $key) {
-            $subject = '<a href="viewtopic.php?viewmode=thread&amp;topic_id='.$arr[$key]['obj']->topic().'&amp;forum='.$arr[$key]['obj']->forum().'&amp;post_id='.$arr[$key]['obj']->postid().'#'.$arr[$key]['obj']->postid().'">'.$arr[$key]['obj']->subject().'</a>';
-            $GLOBALS['xoopsTpl']->append("topic_trees", array_merge($posterarr, array("post_id" => $arr[$key]['obj']->postid(), "post_parent_id" => $arr[$key]['obj']->parent(), "post_date" => formatTimestamp($arr[$key]['obj']->posttime(), "m"), "post_image" => $post_image, "post_title" => $subject, "post_prefix" => $prefix)));
-        } else {
-            $subject = '<b>'.$arr[$key]['obj']->subject().'</b>';
-            $thisprefix = substr($prefix, 0, -6)."<b>&raquo;</b>";
-            $GLOBALS['xoopsTpl']->append("topic_trees", array_merge($posterarr, array("post_id" => $arr[$key]['obj']->postid(), "post_parent_id" => $arr[$key]['obj']->parent(), "post_date" => formatTimestamp($arr[$key]['obj']->posttime(), "m"), "post_image" => $post_image, "post_title" => $subject, "post_prefix" => $thisprefix)));
-        }
-    }
-    if ( isset($arr[$key]['replies']) && !empty($arr[$key]['replies']) ){
-        $prefix .= "&nbsp;&nbsp;";
-        foreach($arr[$key]['replies'] as $replykey) {
-            $current = ( $current == 0 ) ? $replykey : $current;
-            showTree($arr, $current, $replykey, $prefix, $foundusers);
-        }
-    }
-}
-
-if ($order == 'DESC') {
-    $xoopsTpl->assign(array('order_current' => 'DESC', 'order_other' => 'ASC', 'lang_order_other' => _OLDESTFIRST));
-} else {
-    $xoopsTpl->assign(array('order_current' => 'ASC', 'order_other' => 'DESC', 'lang_order_other' => _NEWESTFIRST));
-}
-
-// initialize the start number of select query
-$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
-
-$total_posts = get_total_posts($topic_id, 'topic');
-if ($total_posts > 50) {
-    $viewmode ="flat";
-    // hide link to theaded view
-    $xoopsTpl->assign('lang_threaded', "" );
-    $xoopsTpl->assign('lang_flat', _FLAT );
-} else {
-    $xoopsTpl->assign(array('lang_threaded' => _THREADED, 'lang_flat' => _FLAT));
-}
-
-if ( $can_post == 1 ) {
-    $xoopsTpl->assign(array('viewer_can_post' => true, 'forum_post_or_register' => "<a href=\"newtopic.php?forum=".$forum."\"><img src=\"".$bbImage['post']."\" alt=\""._MD_POSTNEW."\" /></a>"));
-} else {
-    $xoopsTpl->assign('viewer_can_post', false);
-    if ( $show_reg == 1 ) {
-        $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri).'">'._MD_REGTOPOST.'</a>');
-    } else {
-        $xoopsTpl->assign('forum_post_or_register', '');
-    }
-}
-
-if ( $viewmode == "thread" ) {
-    $start = 0;
-    $postsArray = ForumPosts::getAllPosts($topic_id, "ASC", $total_posts, $start);
-    $xoopsTpl->assign('topic_viewmode', 'thread');
-
-    $newObjArr = array();
-    foreach ( $postsArray as $eachpost ) {
-        $key1 = $eachpost->postid();
-        if ( (!empty($post_id) && $post_id == $key1) || ( empty($post_id) && $eachpost->parent() == 0 ) ) {
-            $post_text = $eachpost->text();
-            if ( 0 != $eachpost->uid() ) {
-                $eachposter = new XoopsUser($eachpost->uid());
-                $poster_rank = $eachposter->rank();
-                if ( $poster_rank['image'] != "" ) {
-                    $poster_rank['image'] = "<img src='".XOOPS_UPLOAD_URL."/".$poster_rank['image']."' alt='' />";
-                }
-                if ( $eachposter->isActive() ) {
-                    $poster_status = $eachposter->isOnline() ? _MD_ONLINE : '';
-                    $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>', 'poster_avatar' => $eachposter->getVar('user_avatar'), 'poster_from' => $eachposter->getVar('user_from'), 'poster_regdate' => formatTimestamp($eachposter->getVar('user_regdate'), 's'), 'poster_postnum' => $eachposter->getVar('posts'), 'poster_sendpmtext' => sprintf(_SENDPMTO,$eachposter->getVar('uname')), 'poster_rank_title' => $poster_rank['title'], 'poster_rank_image' => $poster_rank['image'], 'poster_status' => $poster_status);
-                    if ( 1 == $forumdata['allow_sig'] && $eachpost->attachsig() == 1 && $eachposter->attachsig() == 1 ) {
-                        $myts =& MytextSanitizer::getInstance();
-                        $post_text .= "<p><br />----------------<br />". $myts->makeTareaData4Show($eachposter->getVar("user_sig", "N"), 0, 1, 1)."</p>";
-                    }
-                } else {
-                    $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
-                }
-            } else {
-                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
-            }
-            $posticon = $eachpost->icon();
-            if ( isset($posticon) && $posticon != '' ) {
-                $post_image = '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($eachpost->icon()).'" alt="" /></a>';
-            } else {
-                $post_image =  '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/icons/posticon.gif" alt="" /></a>';
-            }
-            $xoopsTpl->append('topic_posts', array_merge($posterarr, array('post_id' => $eachpost->postid(), 'post_parent_id' => $eachpost->parent(), 'post_date' => formatTimestamp($eachpost->posttime(), 'm'), 'post_poster_ip'=> $eachpost->posterip(), 'post_image' => $post_image, 'post_title' => $eachpost->subject(), 'post_text' => $post_text)));
-        }
-        $newObjArr[$key1]['obj'] = $eachpost;
-        $key2 = $eachpost->parent();
-        $newObjArr[$key2]['replies'][] = $key1;
-        $newObjArr[$key2]['leaf'] = $key1;
-    }
-    showTree($newObjArr, $post_id);
-    $xoopsTpl->assign(array('lang_subject' => _MD_SUBJECT, 'lang_date' => _MD_DATE));
-} else {
-    $xoopsTpl->assign(array('topic_viewmode' => 'flat', 'lang_top' => _MD_TOP, 'lang_subject' => _MD_SUBJECT, 'lang_bottom' => _MD_BOTTOM));
-    $postsArray = ForumPosts::getAllPosts($topic_id, $order, $forumdata['posts_per_page'], $start, $post_id);
-    $foundusers = array();
-    foreach ( $postsArray as $eachpost ) {
-        $post_text = $eachpost->text();
-        if ( 0 != $eachpost->uid() ) {
-            if (!isset($foundusers['user'.$eachpost->uid()])) {
-                $eachposter = new XoopsUser($eachpost->uid());
-                $foundusers['user'.$eachpost->uid()] =& $eachposter;
-            } else {
-                $eachposter =& $foundusers['user'.$eachpost->uid()];
-            }
-            $poster_rank = $eachposter->rank();
-            if ( $poster_rank['image'] != '' ) {
-                $poster_rank['image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$poster_rank['image'].'" alt="" />';
-            }
-            if ( $eachposter->isActive() ) {
-                $poster_status = $eachposter->isOnline() ? _MD_ONLINE : '';
-                $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>', 'poster_avatar' => $eachposter->getVar('user_avatar'), 'poster_from' => $eachposter->getVar('user_from'), 'poster_regdate' => formatTimestamp($eachposter->getVar('user_regdate'), 's'), 'poster_postnum' => $eachposter->getVar('posts'), 'poster_sendpmtext' => sprintf(_SENDPMTO,$eachposter->getVar('uname')), 'poster_rank_title' => $poster_rank['title'], 'poster_rank_image' => $poster_rank['image'], 'poster_status' => $poster_status);
-                if ( 1 == $forumdata['allow_sig'] && $eachpost->attachsig() == 1 && $eachposter->attachsig() == 1 ) {
-                    $myts =& MytextSanitizer::getInstance();
-                    $post_text .= '<p><br />----------------<br />'. $myts->makeTareaData4Show($eachposter->getVar('user_sig', 'N'), 0, 1, 1).'</p>';
-                }
-            } else {
-                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
-            }
-        } else {
-            $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
-        }
-        $posticon = $eachpost->icon();
-        if ( isset($posticon) && $posticon != '' ) {
-            $post_image = '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($eachpost->icon()).'" alt="" /></a>';
-        } else {
-            $post_image =  '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
-        }
-        $xoopsTpl->append('topic_posts', array_merge($posterarr, array('post_id' => $eachpost->postid(), 'post_parent_id' => $eachpost->parent(), 'post_date' => formatTimestamp($eachpost->posttime(), 'm'), 'post_poster_ip'=> $eachpost->posterip(), 'post_image' => $post_image, 'post_title' => $eachpost->subject(), 'post_text' => $post_text)));
-        unset($eachposter);
-    }
-    if ( $total_posts > $forumdata['posts_per_page'] ) {
-        include XOOPS_ROOT_PATH.'/class/pagenav.php';
-        $nav = new XoopsPageNav($total_posts, $forumdata['posts_per_page'], $start, "start", 'topic_id='.$topic_id.'&amp;forum='.$forum.'&amp;viewmode='.$viewmode.'&amp;order='.$order);
-        $xoopsTpl->assign('forum_page_nav', $nav->renderNav(4));
-    } else {
-        $xoopsTpl->assign('forum_page_nav', '');
-    }
-}
-
-// create jump box
-$xoopsTpl->assign(array('forum_jumpbox' => make_jumpbox($forum), 'lang_forum_index' => sprintf(_MD_FORUMINDEX,$xoopsConfig['sitename']), 'lang_from' => _MD_FROM, 'lang_joined' => _MD_JOINED, 'lang_posts' => _MD_POSTS, 'lang_poster' => _MD_POSTER, 'lang_thread' => _MD_THREAD, 'lang_edit' => _EDIT, 'lang_delete' => _DELETE, 'lang_reply' => _REPLY, 'lang_postedon' => _MD_POSTEDON));
-
-// Read in cookie of 'lastread' times
-$topic_lastread = newbb_get_topics_viewed();
-// if cookie is not set for this topic, update view count and set cookie
-if ( empty($topic_lastread[$topic_id]) ) {
-    $sql = 'UPDATE '.$xoopsDB->prefix('bb_topics').' SET topic_views = topic_views + 1 WHERE topic_id ='. $topic_id;
-    $xoopsDB->queryF($sql);
-}
-// Update cookie
-newbb_add_topics_viewed($topic_lastread, $topic_id, time(), $bbCookie['path'], $bbCookie['domain'], $bbCookie['secure']);
-include XOOPS_ROOT_PATH.'/footer.php';
-?>
+<?php
+// $Id: viewtopic.php,v 1.4.2.2 2006/04/13 14:16:36 onokazu Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  This program is free software; you can redistribute it and/or modify     //
+//  it under the terms of the GNU General Public License as published by     //
+//  the Free Software Foundation; either version 2 of the License, or        //
+//  (at your option) any later version.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  You should have received a copy of the GNU General Public License        //
+//  along with this program; if not, write to the Free Software              //
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+// Author: Kazumi Ono (AKA onokazu)                                          //
+// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
+// Project: The XOOPS Project                                                //
+// ------------------------------------------------------------------------- //
+
+include 'header.php';
+$forum = isset($_GET['forum']) ? intval($_GET['forum']) : 0;
+$topic_id = isset($_GET['topic_id']) ? intval($_GET['topic_id']) : 0;
+if ( empty($forum) ) {
+    redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/index.php",2,_MD_ERRORFORUM);
+    exit();
+} elseif ( empty($topic_id) ) {
+    redirect_header('viewforum.php?forum='.$forum,2,_MD_ERRORTOPIC);
+    exit();
+}
+$topic_time = (isset($_GET['topic_time'])) ? intval($_GET['topic_time']) : 0;
+$post_id = !empty($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+
+//use users preferences
+if (is_object($xoopsUser)) {
+    $viewmode = $xoopsUser->getVar('umode');
+    $order = ($xoopsUser->getVar('uorder') == 1) ? 'DESC' : 'ASC';
+} else {
+    $viewmode = 'flat';
+    $order = 'ASC';
+}
+
+// newbb does not have nested mode
+if ($viewmode == 'nest') {
+    $viewmode = 'thread';
+}
+
+// override mode/order if any requested
+if (isset($_GET['viewmode']) && ($_GET['viewmode'] == 'flat' || $_GET['viewmode'] == 'thread')) {
+    $viewmode = $_GET['viewmode'];
+}
+if (isset($_GET['order']) && ($_GET['order'] == 'ASC' || $_GET['order'] == 'DESC')) {
+    $order = $_GET['order'];
+}
+
+if ($viewmode != 'flat') {
+    $xoopsOption['template_main'] =  'newbb_viewtopic_thread.html';
+} else {
+    $xoopsOption['template_main'] =  'newbb_viewtopic_flat.html';
+}
+
+include XOOPS_ROOT_PATH.'/header.php';
+include_once 'class/class.forumposts.php';
+
+if ( isset($_GET['move']) && 'next' == $_GET['move'] ) {
+    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time > '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time ASC LIMIT 1';
+} elseif ( isset($_GET['move']) && 'prev' == $_GET['move']) {
+    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_time < '.$topic_time.' AND t.forum_id = '.$forum.' ORDER BY t.topic_time DESC LIMIT 1';
+} else {
+    $sql = 'SELECT t.topic_id, t.topic_title, t.topic_time, t.topic_status, t.topic_sticky, t.topic_last_post_id, f.forum_id, f.forum_name, f.forum_access, f.forum_type, f.allow_html, f.allow_sig, f.posts_per_page, f.hot_threshold, f.topics_per_page FROM '.$xoopsDB->prefix('bb_topics').' t LEFT JOIN '.$xoopsDB->prefix('bb_forums').' f ON f.forum_id = t.forum_id WHERE t.topic_id = '.$topic_id.' AND t.forum_id = '.$forum;
+}
+
+if ( !$result = $xoopsDB->query($sql) ) {
+    redirect_header('viewforum.php?forum='.$forum,2,_MD_ERROROCCURED);
+    exit();
+}
+
+if ( !$forumdata = $xoopsDB->fetchArray($result) ) {
+    redirect_header('viewforum.php?forum='.$forum,2,_MD_FORUMNOEXIST);
+    exit();
+}
+$xoopsTpl->assign('topic_id', $forumdata['topic_id']);
+$topic_id = $forumdata['topic_id'];
+$xoopsTpl->assign('forum_id', $forumdata['forum_id']);
+$forum = $forumdata['forum_id'];
+$can_post = 0;
+$show_reg = 0;
+if ( $forumdata['forum_type'] == 1 ) {
+    // this is a private forum.
+    $accesserror = 0;
+    if ( $xoopsUser ) {
+        if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+            if ( !check_priv_forum_auth($xoopsUser->getVar('uid'), $forum, false) ) {
+                $accesserror = 1;
+            }
+        } else {
+            $isadminormod = 1;
+        }
+    } else {
+        $accesserror = 1;
+    }
+    if ( $accesserror == 1 ) {
+        redirect_header(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname')."/index.php",2,_MD_NORIGHTTOACCESS);
+        exit();
+    }
+    $can_post = 1;
+    $show_reg = 1;
+} else {
+    // this is not a priv forum
+    if ( $forumdata['forum_access'] == 1 ) {
+        // this is a reg user only forum
+        if ( $xoopsUser ) {
+            $can_post = 1;
+        } else {
+            $show_reg = 1;
+        }
+    } elseif ( $forumdata['forum_access'] == 2 ) {
+        // this is an open forum
+        $can_post = 1;
+    } else {
+        // this is an admin/moderator only forum
+        if ( $xoopsUser ) {
+            if ( $xoopsUser->isAdmin($xoopsModule->mid()) || is_moderator($forum, $xoopsUser->getVar('uid')) ) {
+                $can_post = 1;
+                $isadminormod = 1;
+            }
+        }
+    }
+}
+$myts =& MyTextSanitizer::getInstance();
+$forumdata['topic_title'] = $myts->makeTboxData4Show($forumdata['topic_title']);$forumdata['forum_name'] = $myts->makeTboxData4Show($forumdata['forum_name']);
+$xoopsTpl->assign(array('topic_title' => '<a href="'.$bbUrl['root'].'viewtopic.php?viewmode='.$viewmode.'&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'">'.$forumdata['topic_title'].'</a>', 'forum_name' => $forumdata['forum_name'], 'topic_time' => $forumdata['topic_time'], 'lang_nexttopic' => _MD_NEXTTOPIC, 'lang_prevtopic' => _MD_PREVTOPIC));
+
+// add image links to admin page if the user viewing this page is a forum admin
+if ( $xoopsUser ) {
+    $xoopsTpl->assign('viewer_userid', $xoopsUser->getVar('uid'));
+    if ( !empty($isadminormod) || $xoopsUser->isAdmin($xoopsModule->mid()) || is_moderator( $forum, $xoopsUser->getVar('uid')) ) {
+        // yup, the user is admin
+        // the forum is locked?
+        if ( $forumdata['topic_status'] != 1 ) {
+            // nope
+            $xoopsTpl->assign('topic_lock_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=lock&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['locktopic'].'" alt="'._MD_LOCKTOPIC.'" /></a>');
+        } else {
+            // yup, it is..
+            $xoopsTpl->assign('topic_lock_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=unlock&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['unlocktopic'].'" alt="'._MD_UNLOCKTOPIC.'" /></a>');
+        }
+        $xoopsTpl->assign('topic_move_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=move&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['movetopic'].'" alt="'._MD_MOVETOPIC.'" /></a>');
+        $xoopsTpl->assign('topic_delete_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=del&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['deltopic'].'" alt="'._MD_DELETETOPIC.'" /></a>');
+        // is the topic sticky?
+        if ( $forumdata['topic_sticky'] != 1 ) {
+            // nope, not yet..
+            $xoopsTpl->assign('topic_sticky_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=sticky&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['sticky'].'" alt="'._MD_STICKYTOPIC.'" /></a>');
+        } else {
+            // yup it is sticking..
+            $xoopsTpl->assign('topic_sticky_image', '<a href="'.$bbUrl['root'].'topicmanager.php?mode=unsticky&amp;topic_id='.$topic_id.'&amp;forum='.$forum.'"><img src="'.$bbImage['unsticky'].'" alt="'._MD_UNSTICKYTOPIC.'" /></a>');
+        }
+        // need to set this also
+        $xoopsTpl->assign('viewer_is_admin', true);
+    } else {
+        // nope, the user is not a forum admin..
+        $xoopsTpl->assign('viewer_is_admin', false);
+    }
+} else {
+    // nope, the user is not a forum admin, not even registered
+    $xoopsTpl->assign(array('viewer_is_admin' => false, 'viewer_userid' => 0));
+}
+
+function showTree(&$arr, $current=0, $key=0, $prefix='', $foundusers=array()){
+    global $xoopsConfig;
+    if ($key != 0) {
+        if ( 0 != $arr[$key]['obj']->uid() ) {
+            if (!isset($foundusers[$arr[$key]['obj']->uid()])) {
+                $eachposter = new XoopsUser($arr[$key]['obj']->uid());
+                $foundusers[$arr[$key]['obj']->uid()] =& $eachposter;
+            } else {
+                $eachposter =& $foundusers[$arr[$key]['obj']->uid()];
+            }
+            $poster_rank = $eachposter->rank();
+            if ( $poster_rank['image'] != '' ) {
+                $poster_rank['image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$poster_rank['image'].'" alt="" />';
+            }
+            if ( $eachposter->isActive() ) {
+                $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>');
+            } else {
+                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous']);
+            }
+        } else {
+            $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous']);
+        }
+        $posticon = $arr[$key]['obj']->icon();
+        if ( isset($posticon) && $posticon != '' ) {
+            $post_image = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($posticon).'" alt="" />';
+        } else {
+            $post_image =  '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
+        }
+        if ($current != $key) {
+            $subject = '<a href="viewtopic.php?viewmode=thread&amp;topic_id='.$arr[$key]['obj']->topic().'&amp;forum='.$arr[$key]['obj']->forum().'&amp;post_id='.$arr[$key]['obj']->postid().'#forumpost'.$arr[$key]['obj']->postid().'">'.$arr[$key]['obj']->subject().'</a>';
+            $GLOBALS['xoopsTpl']->append("topic_trees", array_merge($posterarr, array("post_id" => $arr[$key]['obj']->postid(), "post_parent_id" => $arr[$key]['obj']->parent(), "post_date" => formatTimestamp($arr[$key]['obj']->posttime(), "m"), "post_image" => $post_image, "post_title" => $subject, "post_prefix" => $prefix)));
+        } else {
+            $subject = '<b>'.$arr[$key]['obj']->subject().'</b>';
+            $thisprefix = substr($prefix, 0, -6)."<b>&raquo;</b>";
+            $GLOBALS['xoopsTpl']->append("topic_trees", array_merge($posterarr, array("post_id" => $arr[$key]['obj']->postid(), "post_parent_id" => $arr[$key]['obj']->parent(), "post_date" => formatTimestamp($arr[$key]['obj']->posttime(), "m"), "post_image" => $post_image, "post_title" => $subject, "post_prefix" => $thisprefix)));
+        }
+    }
+    if ( isset($arr[$key]['replies']) && !empty($arr[$key]['replies']) ){
+        $prefix .= "&nbsp;&nbsp;";
+        foreach($arr[$key]['replies'] as $replykey) {
+            $current = ( $current == 0 ) ? $replykey : $current;
+            showTree($arr, $current, $replykey, $prefix, $foundusers);
+        }
+    }
+}
+
+if ($order == 'DESC') {
+    $xoopsTpl->assign(array('order_current' => 'DESC', 'order_other' => 'ASC', 'lang_order_other' => _OLDESTFIRST));
+} else {
+    $xoopsTpl->assign(array('order_current' => 'ASC', 'order_other' => 'DESC', 'lang_order_other' => _NEWESTFIRST));
+}
+
+// initialize the start number of select query
+$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
+
+$total_posts = get_total_posts($topic_id, 'topic');
+if ($total_posts > 50) {
+    $viewmode ="flat";
+    // hide link to theaded view
+    $xoopsTpl->assign('lang_threaded', "" );
+    $xoopsTpl->assign('lang_flat', _FLAT );
+} else {
+    $xoopsTpl->assign(array('lang_threaded' => _THREADED, 'lang_flat' => _FLAT));
+}
+
+if ( $can_post == 1 ) {
+    $xoopsTpl->assign(array('viewer_can_post' => true, 'forum_post_or_register' => "<a href=\"newtopic.php?forum=".$forum."\"><img src=\"".$bbImage['post']."\" alt=\""._MD_POSTNEW."\" /></a>"));
+} else {
+    $xoopsTpl->assign('viewer_can_post', false);
+    if ( $show_reg == 1 ) {
+        $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri).'">'._MD_REGTOPOST.'</a>');
+    } else {
+        $xoopsTpl->assign('forum_post_or_register', '');
+    }
+}
+
+if ( $viewmode == "thread" ) {
+    $start = 0;
+    $postsArray = ForumPosts::getAllPosts($topic_id, "ASC", $total_posts, $start);
+    $xoopsTpl->assign('topic_viewmode', 'thread');
+
+    $newObjArr = array();
+    foreach ( $postsArray as $eachpost ) {
+        $key1 = $eachpost->postid();
+        if ( (!empty($post_id) && $post_id == $key1) || ( empty($post_id) && $eachpost->parent() == 0 ) ) {
+            $post_text = $eachpost->text();
+            if ( 0 != $eachpost->uid() ) {
+                $eachposter = new XoopsUser($eachpost->uid());
+                $poster_rank = $eachposter->rank();
+                if ( $poster_rank['image'] != "" ) {
+                    $poster_rank['image'] = "<img src='".XOOPS_UPLOAD_URL."/".$poster_rank['image']."' alt='' />";
+                }
+                if ( $eachposter->isActive() ) {
+                    $poster_status = $eachposter->isOnline() ? _MD_ONLINE : '';
+                    $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>', 'poster_avatar' => $eachposter->getVar('user_avatar'), 'poster_from' => $eachposter->getVar('user_from'), 'poster_regdate' => formatTimestamp($eachposter->getVar('user_regdate'), 's'), 'poster_postnum' => $eachposter->getVar('posts'), 'poster_sendpmtext' => sprintf(_SENDPMTO,$eachposter->getVar('uname')), 'poster_rank_title' => $poster_rank['title'], 'poster_rank_image' => $poster_rank['image'], 'poster_status' => $poster_status);
+                    if ( 1 == $forumdata['allow_sig'] && $eachpost->attachsig() == 1 && $eachposter->attachsig() == 1 ) {
+                        $myts =& MytextSanitizer::getInstance();
+                        $post_text .= "<p><br />----------------<br />". $myts->makeTareaData4Show($eachposter->getVar("user_sig", "N"), 0, 1, 1)."</p>";
+                    }
+                } else {
+                    $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
+                }
+            } else {
+                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
+            }
+            $posticon = $eachpost->icon();
+            if ( isset($posticon) && $posticon != '' ) {
+                $post_image = '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($eachpost->icon()).'" alt="" /></a>';
+            } else {
+                $post_image =  '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/icons/posticon.gif" alt="" /></a>';
+            }
+            $xoopsTpl->append('topic_posts', array_merge($posterarr, array('post_id' => $eachpost->postid(), 'post_parent_id' => $eachpost->parent(), 'post_date' => formatTimestamp($eachpost->posttime(), 'm'), 'post_poster_ip'=> $eachpost->posterip(), 'post_image' => $post_image, 'post_title' => $eachpost->subject(), 'post_text' => $post_text)));
+        }
+        $newObjArr[$key1]['obj'] = $eachpost;
+        $key2 = $eachpost->parent();
+        $newObjArr[$key2]['replies'][] = $key1;
+        $newObjArr[$key2]['leaf'] = $key1;
+    }
+    showTree($newObjArr, $post_id);
+    $xoopsTpl->assign(array('lang_subject' => _MD_SUBJECT, 'lang_date' => _MD_DATE));
+} else {
+    $xoopsTpl->assign(array('topic_viewmode' => 'flat', 'lang_top' => _MD_TOP, 'lang_subject' => _MD_SUBJECT, 'lang_bottom' => _MD_BOTTOM));
+    $postsArray = ForumPosts::getAllPosts($topic_id, $order, $forumdata['posts_per_page'], $start, $post_id);
+    $foundusers = array();
+    foreach ( $postsArray as $eachpost ) {
+        $post_text = $eachpost->text();
+        if ( 0 != $eachpost->uid() ) {
+            if (!isset($foundusers['user'.$eachpost->uid()])) {
+                $eachposter = new XoopsUser($eachpost->uid());
+                $foundusers['user'.$eachpost->uid()] =& $eachposter;
+            } else {
+                $eachposter =& $foundusers['user'.$eachpost->uid()];
+            }
+            $poster_rank = $eachposter->rank();
+            if ( $poster_rank['image'] != '' ) {
+                $poster_rank['image'] = '<img src="'.XOOPS_UPLOAD_URL.'/'.$poster_rank['image'].'" alt="" />';
+            }
+            if ( $eachposter->isActive() ) {
+                $poster_status = $eachposter->isOnline() ? _MD_ONLINE : '';
+                $posterarr =  array('poster_uid' => $eachposter->getVar('uid'), 'poster_uname' => '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$eachposter->getVar('uid').'">'.$eachposter->getVar('uname').'</a>', 'poster_avatar' => $eachposter->getVar('user_avatar'), 'poster_from' => $eachposter->getVar('user_from'), 'poster_regdate' => formatTimestamp($eachposter->getVar('user_regdate'), 's'), 'poster_postnum' => $eachposter->getVar('posts'), 'poster_sendpmtext' => sprintf(_SENDPMTO,$eachposter->getVar('uname')), 'poster_rank_title' => $poster_rank['title'], 'poster_rank_image' => $poster_rank['image'], 'poster_status' => $poster_status);
+                if ( 1 == $forumdata['allow_sig'] && $eachpost->attachsig() == 1 && $eachposter->attachsig() == 1 ) {
+                    $myts =& MytextSanitizer::getInstance();
+                    $post_text .= '<p><br />----------------<br />'. $myts->makeTareaData4Show($eachposter->getVar('user_sig', 'N'), 0, 1, 1).'</p>';
+                }
+            } else {
+                $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
+            }
+        } else {
+            $posterarr = array('poster_uid' =>0, 'poster_uname' => $xoopsConfig['anonymous'], 'poster_avatar' => '', 'poster_from' => '', 'poster_regdate' => '', 'poster_postnum' => '', 'poster_sendpmtext' => '', 'poster_rank_title' => '', 'poster_rank_image' => '');
+        }
+        $posticon = $eachpost->icon();
+        if ( isset($posticon) && $posticon != '' ) {
+            $post_image = '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($eachpost->icon()).'" alt="" /></a>';
+        } else {
+            $post_image =  '<a name="'.$eachpost->postid().'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
+        }
+        $xoopsTpl->append('topic_posts', array_merge($posterarr, array('post_id' => $eachpost->postid(), 'post_parent_id' => $eachpost->parent(), 'post_date' => formatTimestamp($eachpost->posttime(), 'm'), 'post_poster_ip'=> $eachpost->posterip(), 'post_image' => $post_image, 'post_title' => $eachpost->subject(), 'post_text' => $post_text)));
+        unset($eachposter);
+    }
+    if ( $total_posts > $forumdata['posts_per_page'] ) {
+        include XOOPS_ROOT_PATH.'/class/pagenav.php';
+        $nav = new XoopsPageNav($total_posts, $forumdata['posts_per_page'], $start, "start", 'topic_id='.$topic_id.'&amp;forum='.$forum.'&amp;viewmode='.$viewmode.'&amp;order='.$order);
+        $xoopsTpl->assign('forum_page_nav', $nav->renderNav(4));
+    } else {
+        $xoopsTpl->assign('forum_page_nav', '');
+    }
+}
+
+// create jump box
+$xoopsTpl->assign(array('forum_jumpbox' => make_jumpbox($forum), 'lang_forum_index' => sprintf(_MD_FORUMINDEX,$xoopsConfig['sitename']), 'lang_from' => _MD_FROM, 'lang_joined' => _MD_JOINED, 'lang_posts' => _MD_POSTS, 'lang_poster' => _MD_POSTER, 'lang_thread' => _MD_THREAD, 'lang_edit' => _EDIT, 'lang_delete' => _DELETE, 'lang_reply' => _REPLY, 'lang_postedon' => _MD_POSTEDON));
+
+// Read in cookie of 'lastread' times
+$topic_lastread = newbb_get_topics_viewed();
+// if cookie is not set for this topic, update view count and set cookie
+if ( empty($topic_lastread[$topic_id]) ) {
+    $sql = 'UPDATE '.$xoopsDB->prefix('bb_topics').' SET topic_views = topic_views + 1 WHERE topic_id ='. $topic_id;
+    $xoopsDB->queryF($sql);
+}
+// Update cookie
+newbb_add_topics_viewed($topic_lastread, $topic_id, time(), $bbCookie['path'], $bbCookie['domain'], $bbCookie['secure']);
+include XOOPS_ROOT_PATH.'/footer.php';
+?>

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:02:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:02:09 +0900
Subject: [xoops-cvslog 2802] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060414060209.4269D2AC03D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/comment.php
diff -u xoops2jp/html/modules/base/class/comment.php:1.1.2.7 xoops2jp/html/modules/base/class/comment.php:1.1.2.8
--- xoops2jp/html/modules/base/class/comment.php:1.1.2.7	Tue Apr 11 12:10:19 2006
+++ xoops2jp/html/modules/base/class/comment.php	Fri Apr 14 15:02:09 2006
@@ -26,10 +26,10 @@
 		$this->initVar('com_status', XOBJ_DTYPE_INT, '1', true);
 		$this->initVar('com_exparams', XOBJ_DTYPE_STRING, '', true, 255);
 		$this->initVar('dohtml', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('dosmiley', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('doxcode', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('doimage', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('dobr', XOBJ_DTYPE_BOOL, '0', true);
+		$this->initVar('dosmiley', XOBJ_DTYPE_BOOL, '1', true);
+		$this->initVar('doxcode', XOBJ_DTYPE_BOOL, '1', true);
+		$this->initVar('doimage', XOBJ_DTYPE_BOOL, '1', true);
+		$this->initVar('dobr', XOBJ_DTYPE_BOOL, '1', true);
 	}
 	
 	/**
@@ -55,6 +55,17 @@
 		$handler =& xoops_getmodulehandler('commentstatus', 'base');
 		$this->mStatus =& $handler->get($this->get('com_status'));
 	}
+	
+	function getVar($key)
+	{
+		if ($key == 'com_text') {
+			$ts =& MyTextSanitizer::getInstance();
+			return $ts->displayTarea($this->get($key), $this->get('dohtml'), $this->get('dosmiley'), $this->get('doxcode'), $this->get('doimage'), $this->get('dobr'));
+		}
+		else {
+			return parent::getVar($key);
+		}
+	}
 }
 
 class BaseCommentHandler extends XoopsObjectGenericHandler

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:28:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:28:00 +0900
Subject: [xoops-cvslog 2803] CVS update: xoops2jp/html/include
Message-ID: <20060414062800.ECBAA2AC03C@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.12 xoops2jp/html/include/functions.php:1.2.8.13
--- xoops2jp/html/include/functions.php:1.2.8.12	Tue Apr 11 19:27:27 2006
+++ xoops2jp/html/include/functions.php	Fri Apr 14 15:28:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.12 2006/04/11 10:27:27 minahito Exp $
+// $Id: functions.php,v 1.2.8.13 2006/04/14 06:28:00 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -29,6 +29,10 @@
 
 function xoops_getrequest($name)
 {
+	if (!isset($_REQUEST[$name])) {
+		return null;
+	}
+	
 	if (!get_magic_quotes_gpc()) {
 		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : null;
 	}

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:28:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:28:50 +0900
Subject: [xoops-cvslog 2804] CVS update: xoops2jp/html/modules/base/class/debug
Message-ID: <20060414062850.C6E312AC03C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php
diff -u xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:1.1.4.5 xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:1.1.4.6
--- xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:1.1.4.5	Tue Mar 28 22:29:54 2006
+++ xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php	Fri Apr 14 15:28:50 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: XoopsDebugManager.class.php,v 1.1.4.5 2006/03/28 13:29:54 minahito Exp $
+// $Id: XoopsDebugManager.class.php,v 1.1.4.6 2006/04/14 06:28:50 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -83,8 +83,6 @@
 
 	function setup()
 	{
-		$xoopsErrorHandler=&XoopsErrorHandler::getInstance();
-		$xoopsErrorHandler->activate(false);
 	}
 	
 	function isDebugRenderSystem()

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:29:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:29:00 +0900
Subject: [xoops-cvslog 2805] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060414062900.2FD042AC03C@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.29 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.30
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.29	Tue Apr 11 17:42:17 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Fri Apr 14 15:29:00 2006
@@ -288,11 +288,6 @@
 	
 	function _setupErrorHandler()
 	{
-		require_once XOOPS_ROOT_PATH.'/class/errorhandler.php';
-		$this->mErrorHandler=&XoopsErrorHandler::getInstance();
-		$this->mErrorHandler->activate(true);
-
-		$GLOBALS['xoopsErrorHandler']=&$this->mErrorHandler;
 	}
 
 	/**

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:36:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:36:26 +0900
Subject: [xoops-cvslog 2806] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060414063626.50A1C2AC03C@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.23 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.24
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.23	Thu Apr 13 00:31:24 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Fri Apr 14 15:36:26 2006
@@ -20,7 +20,7 @@
 define('_AD_USER_ERROR_UNAME_NO_UNIQUE', "ユーザー名が重複しています。変更して下さい。");
 define('_AD_USER_ERROR_WRONG_FORMAT', "不正なフォーマットです");
 define('_AD_USER_LANG_ACTIVEUSER', "アクティブユーザー");
-define('_AD_USER_LANG_ACTKEY', "actkey");
+define('_AD_USER_LANG_ACTKEY', "アクティベートキー");
 define('_AD_USER_LANG_ALL_OF_USERS', "すべてのユーザー");
 define('_AD_USER_LANG_APPROVE_USERS_ONLY', "承認済みユーザーのみ");
 define('_AD_USER_LANG_ATTACHSIG', "投稿に署名を必ず追加する");
@@ -67,7 +67,7 @@
 define('_AD_USER_LANG_GROUP_TYPE', "タイプ");
 define('_AD_USER_LANG_GROUPID', "グループID");
 define('_AD_USER_LANG_ID', "ID");
-define('_AD_USER_LANG_LAST_LOGIN', "last login");
+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', "最終ログイン");
@@ -84,7 +84,7 @@
 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', "Pending users only");
+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', "管理");
@@ -114,7 +114,7 @@
 define('_AD_USER_LANG_SUBJECT', "件名");
 define('_AD_USER_LANG_SUBMIT', "送信");
 define('_AD_USER_LANG_SYSTEM_AVATAR', "システムアバター");
-define('_AD_USER_LANG_THEME', "theme");
+define('_AD_USER_LANG_THEME', "テーマ");
 define('_AD_USER_LANG_TIMEZONE_OFFSET', "タイムゾーン");
 define('_AD_USER_LANG_UID', "UID");
 define('_AD_USER_LANG_UMODE', "コメント表示モード");
@@ -124,7 +124,7 @@
 define('_AD_USER_LANG_URL', "ホームページ");
 define('_AD_USER_LANG_USER', "ユーザー");
 define('_AD_USER_LANG_USER_AIM', "AIM");
-define('_AD_USER_LANG_USER_AVATAR', "user avatar");
+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', "ユーザーの編集");
@@ -136,7 +136,7 @@
 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', "user regdate");
+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', "このメールアドレスを公開する");

From minahito ＠ users.sourceforge.jp  Fri Apr 14 15:39:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 14 Apr 2006 15:39:01 +0900
Subject: [xoops-cvslog 2807] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060414063901.F18FA2AC03C@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.30 xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.31
--- xoops2jp/html/modules/base/language/japanese/admin.php:1.1.2.30	Wed Apr 12 09:40:05 2006
+++ xoops2jp/html/modules/base/language/japanese/admin.php	Fri Apr 14 15:39:01 2006
@@ -6,7 +6,7 @@
 define('_AD_BASE_ERROR_GROUPID', "最低１グループ以上にアクセス権限を与えてください");
 define('_AD_BASE_ERROR_INTRANGE', "{0}の値が不正です");
 define('_AD_BASE_ERROR_MAXLENGTH', "{0}は半角{1}文字以下で入力して下さい");
-define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
+define('_AD_BASE_ERROR_OBJECTEXIST', "{0}の値が不正です");
 define('_AD_BASE_ERROR_OPTIONS', "オプションの値が不正です");
 define('_AD_BASE_ERROR_PLEASE_AGREE', "ライセンスに同意してください");
 define('_AD_BASE_ERROR_REQUIRED', "{0}は必ず入力して下さい");
@@ -18,7 +18,7 @@
 define('_AD_BASE_LANG_BID', "BID");
 define('_AD_BASE_LANG_BLOCK_EDIT', "ブロック編集");
 define('_AD_BASE_LANG_BLOCK_INSTALL', "ブロックのインストール");
-define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
+define('_AD_BASE_LANG_BLOCK_TYPE', "ブロックタイプ");
 define('_AD_BASE_LANG_BLOCK_UNINSTALL', "ブロックのアンインストール");
 define('_AD_BASE_LANG_C_TYPE', "タイプ");
 define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "中央ブロック - 中央");
@@ -26,12 +26,12 @@
 define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "中央ブロック - 右");
 define('_AD_BASE_LANG_CODE', "コード");
 define('_AD_BASE_LANG_COM_CREATED', "作成日時");
-define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_AD_BASE_LANG_COM_EXPARAMS', "拡張パラメータ");
 define('_AD_BASE_LANG_COM_ICON', "アイコン");
 define('_AD_BASE_LANG_COM_ID', "ID");
 define('_AD_BASE_LANG_COM_IP', "IP");
-define('_AD_BASE_LANG_COM_ITEMID', "Item ID");
-define('_AD_BASE_LANG_COM_MODID', "Module ID");
+define('_AD_BASE_LANG_COM_ITEMID', "アイテムID");
+define('_AD_BASE_LANG_COM_MODID', "モジュールID");
 define('_AD_BASE_LANG_COM_MODIFIED', "編集日時");
 define('_AD_BASE_LANG_COM_PID', "PID");
 define('_AD_BASE_LANG_COM_ROOTID', "Root ID");
@@ -64,24 +64,24 @@
 define('_AD_BASE_LANG_DOIMAGE', "[img]タグを有効にする");
 define('_AD_BASE_LANG_DOSMILEY', "顔アイコンを有効にする");
 define('_AD_BASE_LANG_DOXCODE', "XOOPSコードを有効にする");
-define('_AD_BASE_LANG_EDIT_FUNC', "edit func");
+define('_AD_BASE_LANG_EDIT_FUNC', "編集用コールバック関数");
 define('_AD_BASE_LANG_EMOTION', "意味");
-define('_AD_BASE_LANG_FUNC_FILE', "func file");
-define('_AD_BASE_LANG_FUNC_NUM', "func num");
+define('_AD_BASE_LANG_FUNC_FILE', "コールバック関数定義ファイル");
+define('_AD_BASE_LANG_FUNC_NUM', "関数ナンバ");
 define('_AD_BASE_LANG_ID', "ID");
-define('_AD_BASE_LANG_ISACTIVE', "isactive");
+define('_AD_BASE_LANG_ISACTIVE', "アクティブ");
 define('_AD_BASE_LANG_LAST_MODIFIED', "最終更新日時");
 define('_AD_BASE_LANG_LCR', "右-中央-左");
 define('_AD_BASE_LANG_MID', "モジュール");
 define('_AD_BASE_LANG_NAME', "name");
-define('_AD_BASE_LANG_ONLINE_IP', "online ip");
-define('_AD_BASE_LANG_ONLINE_MODULE', "online module");
-define('_AD_BASE_LANG_ONLINE_UID', "online uid");
-define('_AD_BASE_LANG_ONLINE_UNAME', "online uname");
+define('_AD_BASE_LANG_ONLINE_IP', "IP");
+define('_AD_BASE_LANG_ONLINE_MODULE', "モジュール");
+define('_AD_BASE_LANG_ONLINE_UID', "UID");
+define('_AD_BASE_LANG_ONLINE_UNAME', "uname");
 define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated");
-define('_AD_BASE_LANG_OPTIONS', "options");
+define('_AD_BASE_LANG_OPTIONS', "オプション");
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "このコメントへのレスポンス");
-define('_AD_BASE_LANG_SHOW_FUNC', "show func");
+define('_AD_BASE_LANG_SHOW_FUNC', "表示用コールバック関数");
 define('_AD_BASE_LANG_SIDE', "表示サイド");
 define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "サイドブロック - 左");
 define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "サイドブロック - 右");

From minahito ＠ users.sourceforge.jp  Sat Apr 15 11:15:29 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 11:15:29 +0900
Subject: [xoops-cvslog 2808] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415021529.75EAE2AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/modinfo.php
diff -u xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.12 xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.13
--- xoops2jp/html/modules/base/language/english/modinfo.php:1.1.2.12	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/english/modinfo.php	Sat Apr 15 11:15:29 2006
@@ -1,40 +1,40 @@
-<?php
-
-define('_MI_BASE_BLOCK_COMMENTS_DESC', "Shows most recent comments");
-define('_MI_BASE_BLOCK_COMMENTS_NAME', "Recent Comments");
-define('_MI_BASE_BLOCK_MAINMENU_DESC', "Shows the main navigation menu of the site");
-define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu");
-define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options");
-define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options");
-define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search form block");
-define('_MI_BASE_BLOCK_SEARCH_NAME', "Search");
-define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic info about the site and a link to Recommend Us pop up window");
-define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info");
-define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block");
-define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu");
-define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval");
-define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents");
-define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new");
-define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
-define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload");
-define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new");
-define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall");
-define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
-define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
-define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list");
-define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
-define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
-define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
-define('_MI_BASE_MENU_BLOCKINSTALL', "Install block");
-define('_MI_BASE_MENU_BLOCKLIST', "BlockList");
-define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment manage");
-define('_MI_BASE_MENU_CREATE_SMILES', "Create smiles");
-define('_MI_BASE_MENU_MODULEINSTALL', "Install module");
-define('_MI_BASE_MENU_MODULELIST', "Module management");
-define('_MI_BASE_MENU_SMILES_MANAGE', "Smiles management");
-define('_MI_BASE_NAME', "Legacy system");
-define('_MI_BASE_NAME_DESC', "This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.");
-define('_MI_PROFILE_BASE_CONTROLLER', "This system attaches great importance to the compatibility with XOOPS 2.0.x.<br/>Pre-road mechanism of this module is very flexible, but it is low speed.<br/>");
-define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.<br/>This system can use themes of Xoops2.0.x rightly.");
-
-?>
+<?php
+
+define('_MI_BASE_BLOCK_COMMENTS_DESC', "Shows most recent comments");
+define('_MI_BASE_BLOCK_COMMENTS_NAME', "Recent Comments");
+define('_MI_BASE_BLOCK_MAINMENU_DESC', "Shows the main navigation menu of the site");
+define('_MI_BASE_BLOCK_MAINMENU_NAME', "Main Menu");
+define('_MI_BASE_BLOCK_NOTIFICATION_DESC', "Shows notification options");
+define('_MI_BASE_BLOCK_NOTIFICATION_NAME', "Notification Options");
+define('_MI_BASE_BLOCK_SEARCH_DESC', "Shows search form block");
+define('_MI_BASE_BLOCK_SEARCH_NAME', "Search");
+define('_MI_BASE_BLOCK_SITEINFO_DESC', "Shows basic info about the site and a link to Recommend Us pop up window");
+define('_MI_BASE_BLOCK_SITEINFO_NAME', "Site Info");
+define('_MI_BASE_BLOCK_USERMENU_DESC', "Shows user block");
+define('_MI_BASE_BLOCK_USERMENU_NAME', "User Menu");
+define('_MI_BASE_BLOCK_WAITING_DESC', "Shows contents waiting for approval");
+define('_MI_BASE_BLOCK_WAITING_NAME', "Waiting Contents");
+define('_MI_BASE_KEYWORD_BLOCKINSTALL', "block new");
+define('_MI_BASE_KEYWORD_BLOCKLIST', "BlockList");
+define('_MI_BASE_KEYWORD_CREATE_SMILES', "smilies upload");
+define('_MI_BASE_KEYWORD_MODULEINSTALL', "module new");
+define('_MI_BASE_KEYWORD_MODULELIST', "install order sort name change rename uninstall");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_KEYWORD_NEWBLOCKS_LIST', "Newblocks list");
+define('_MI_BASE_KEYWORD_SMILES_MANAGE', "smilies edit change delete list");
+define('_MI_BASE_LANG_NEWBLOCKS_CREATE', "Newblocks create");
+define('_MI_BASE_LANG_NEWBLOCKS_LIST', "Newblocks list");
+define('_MI_BASE_MENU_ACTIONSEARCH', "Action search");
+define('_MI_BASE_MENU_BLOCKINSTALL', "Install block");
+define('_MI_BASE_MENU_BLOCKLIST', "Block management");
+define('_MI_BASE_MENU_COMMENT_MANAGE', "Comment manage");
+define('_MI_BASE_MENU_CREATE_SMILES', "Create smiles");
+define('_MI_BASE_MENU_MODULEINSTALL', "Install module");
+define('_MI_BASE_MENU_MODULELIST', "Module management");
+define('_MI_BASE_MENU_SMILES_MANAGE', "Smiles management");
+define('_MI_BASE_NAME', "Legacy system");
+define('_MI_BASE_NAME_DESC', "This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.");
+define('_MI_PROFILE_BASE_CONTROLLER', "This system attaches great importance to the compatibility with XOOPS 2.0.x.<br/>Pre-road mechanism of this module is very flexible, but it is low speed.<br/>");
+define('_MI_PROFILE_BASE_LEGACY_RENDER_SYSTEM', "This system depends on Smarty engine for rendering and cache.<br/>This system can use themes of Xoops2.0.x rightly.");
+
+?>
Index: xoops2jp/html/modules/base/language/english/admin.php
diff -u xoops2jp/html/modules/base/language/english/admin.php:1.1.2.25 xoops2jp/html/modules/base/language/english/admin.php:1.1.2.26
--- xoops2jp/html/modules/base/language/english/admin.php:1.1.2.25	Wed Apr 12 09:40:04 2006
+++ xoops2jp/html/modules/base/language/english/admin.php	Sat Apr 15 11:15:29 2006
@@ -3,30 +3,30 @@
 define('_AD_BASE_ERROR_BMODULE', "bmodule");
 define('_AD_BASE_ERROR_DBUPDATE_FAILED', "Database update failed.");
 define('_AD_BASE_ERROR_EXTENSION', "Uploaded file's extension does not match any entry in the allowed list.");
-define('_AD_BASE_ERROR_GROUPID', "groupid");
+define('_AD_BASE_ERROR_GROUPID', "Group Id");
 define('_AD_BASE_ERROR_INTRANGE', "{0} is wrong.");
 define('_AD_BASE_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
-define('_AD_BASE_ERROR_OBJECTEXIST', "Objectexist");
-define('_AD_BASE_ERROR_OPTIONS', "options");
+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_LANG_ADD_CUSTOM_BLOCK', "Add custom block");
 define('_AD_BASE_LANG_ALL_MODULES', "All modules");
 define('_AD_BASE_LANG_ALL_STATUS', "All status");
-define('_AD_BASE_LANG_BCACHETIME', "bcachetime");
-define('_AD_BASE_LANG_BID', "bid");
-define('_AD_BASE_LANG_BLOCK_EDIT', "block edit");
-define('_AD_BASE_LANG_BLOCK_INSTALL', "block install");
-define('_AD_BASE_LANG_BLOCK_TYPE', "block type");
-define('_AD_BASE_LANG_BLOCK_UNINSTALL', "block uninstall");
-define('_AD_BASE_LANG_C_TYPE', "c type");
-define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block center");
-define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block left");
-define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block right");
+define('_AD_BASE_LANG_BCACHETIME', "Cache time");
+define('_AD_BASE_LANG_BID', "BID");
+define('_AD_BASE_LANG_BLOCK_EDIT', "Block edit");
+define('_AD_BASE_LANG_BLOCK_INSTALL', "Block install");
+define('_AD_BASE_LANG_BLOCK_TYPE', "Block type");
+define('_AD_BASE_LANG_BLOCK_UNINSTALL', "Block uninstall");
+define('_AD_BASE_LANG_C_TYPE', "Type");
+define('_AD_BASE_LANG_CENTER_BLOCK_CENTER', "Center block - center");
+define('_AD_BASE_LANG_CENTER_BLOCK_LEFT', "Center block - left");
+define('_AD_BASE_LANG_CENTER_BLOCK_RIGHT', "Center block - right");
 define('_AD_BASE_LANG_CODE', "Code");
 define('_AD_BASE_LANG_COM_CREATED', "Created");
-define('_AD_BASE_LANG_COM_EXPARAMS', "com exparams");
+define('_AD_BASE_LANG_COM_EXPARAMS', "Comment extra parameters");
 define('_AD_BASE_LANG_COM_ICON', "Icon");
 define('_AD_BASE_LANG_COM_ID', "ID");
 define('_AD_BASE_LANG_COM_IP', "IP");
@@ -44,64 +44,64 @@
 define('_AD_BASE_LANG_COMMENT_EDIT', "Edit a comment");
 define('_AD_BASE_LANG_COMMENT_NEW', "Add a new comment");
 define('_AD_BASE_LANG_COMMENT_VIEW', "Comment view");
-define('_AD_BASE_LANG_CONTENT', "content");
+define('_AD_BASE_LANG_CONTENT', "Content");
 define('_AD_BASE_LANG_CONTROL', "Control");
 define('_AD_BASE_LANG_CREATE_NEW', "Add a new");
-define('_AD_BASE_LANG_CTYPE_HTML', "CTYPE HTML");
-define('_AD_BASE_LANG_CTYPE_PHP', "CTYPE PHP");
-define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "CTYPE WITH SMILIES");
-define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "CTYPE WITHOUT SMILIES");
+define('_AD_BASE_LANG_CTYPE_HTML', "HTML");
+define('_AD_BASE_LANG_CTYPE_PHP', "PHP");
+define('_AD_BASE_LANG_CTYPE_WITH_SMILIES', "Auto format with smilies");
+define('_AD_BASE_LANG_CTYPE_WITHOUT_SMILIES', "Auto format without smilies");
 define('_AD_BASE_LANG_CUSTOM_HTML', "Custom HTML");
 define('_AD_BASE_LANG_CUSTOM_PHP', "Custom PHP");
 define('_AD_BASE_LANG_CUSTOM_WITH_SMILIES', "Custom with Smilies");
 define('_AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES', "Custom without Smilies");
-define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "custom block delete");
-define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "custom block edit");
-define('_AD_BASE_LANG_DIRNAME', "dirname");
+define('_AD_BASE_LANG_CUSTOMBLOCK_DELETE', "Custom block delete");
+define('_AD_BASE_LANG_CUSTOMBLOCK_EDIT', "Custom block edit");
+define('_AD_BASE_LANG_DIRNAME', "Directory name");
 define('_AD_BASE_LANG_DISPLAY', "Display");
 define('_AD_BASE_LANG_DOBR', "Insert line-break automaticall");
 define('_AD_BASE_LANG_DOHTML', "Enable HTML tags");
 define('_AD_BASE_LANG_DOIMAGE', "Enable [img] tag");
 define('_AD_BASE_LANG_DOSMILEY', "Use smilies");
 define('_AD_BASE_LANG_DOXCODE', "Enable XOOPS code");
-define('_AD_BASE_LANG_EDIT_FUNC', "edit func");
+define('_AD_BASE_LANG_EDIT_FUNC', "Callback edit function name");
 define('_AD_BASE_LANG_EMOTION', "Emotion");
-define('_AD_BASE_LANG_FUNC_FILE', "func file");
-define('_AD_BASE_LANG_FUNC_NUM', "func num");
+define('_AD_BASE_LANG_FUNC_FILE', "Callback file name");
+define('_AD_BASE_LANG_FUNC_NUM', "Function number");
 define('_AD_BASE_LANG_ID', "ID");
-define('_AD_BASE_LANG_ISACTIVE', "isactive");
-define('_AD_BASE_LANG_LAST_MODIFIED', "last modified");
+define('_AD_BASE_LANG_ISACTIVE', "Active");
+define('_AD_BASE_LANG_LAST_MODIFIED', "Last modified");
 define('_AD_BASE_LANG_LCR', "L-CTR-R");
-define('_AD_BASE_LANG_MID', "mid");
-define('_AD_BASE_LANG_NAME', "name");
-define('_AD_BASE_LANG_ONLINE_IP', "online ip");
-define('_AD_BASE_LANG_ONLINE_MODULE', "online module");
-define('_AD_BASE_LANG_ONLINE_UID', "online uid");
-define('_AD_BASE_LANG_ONLINE_UNAME', "online uname");
-define('_AD_BASE_LANG_ONLINE_UPDATED', "online updated");
-define('_AD_BASE_LANG_OPTIONS', "options");
+define('_AD_BASE_LANG_MID', "MID");
+define('_AD_BASE_LANG_NAME', "Name");
+define('_AD_BASE_LANG_ONLINE_IP', "Online ip");
+define('_AD_BASE_LANG_ONLINE_MODULE', "Online module");
+define('_AD_BASE_LANG_ONLINE_UID', "Online uid");
+define('_AD_BASE_LANG_ONLINE_UNAME', "Online uname");
+define('_AD_BASE_LANG_ONLINE_UPDATED', "Online updated");
+define('_AD_BASE_LANG_OPTIONS', "Options");
 define('_AD_BASE_LANG_RES_FOR_COMMENT', "Responses for this comment");
-define('_AD_BASE_LANG_SHOW_FUNC', "show func");
-define('_AD_BASE_LANG_SIDE', "side");
-define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block left");
-define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block right");
+define('_AD_BASE_LANG_SHOW_FUNC', "Callback show function");
+define('_AD_BASE_LANG_SIDE', "Side");
+define('_AD_BASE_LANG_SIDE_BLOCK_LEFT', "Side block - left");
+define('_AD_BASE_LANG_SIDE_BLOCK_RIGHT', "Side block - right");
 define('_AD_BASE_LANG_SMILE_URL', "Images");
 define('_AD_BASE_LANG_SMILES_DELETE', "Delete smiley");
 define('_AD_BASE_LANG_SMILES_EDIT', "Edit smiley");
-define('_AD_BASE_LANG_SMILES_NEW', "add a smiley");
+define('_AD_BASE_LANG_SMILES_NEW', "Add a smiley");
 define('_AD_BASE_LANG_SUBMIT', "Submit");
 define('_AD_BASE_LANG_TARGET_GROUPS', "Target groups");
 define('_AD_BASE_LANG_TARGET_MODULES', "Target modules");
-define('_AD_BASE_LANG_TEMPLATE', "template");
-define('_AD_BASE_LANG_TITLE', "title");
+define('_AD_BASE_LANG_TEMPLATE', "Template");
+define('_AD_BASE_LANG_TITLE', "Title");
 define('_AD_BASE_LANG_TOPPAGE', "Toppage");
-define('_AD_BASE_LANG_VISIBLE', "visible");
-define('_AD_BASE_LANG_WEIGHT', "weight");
+define('_AD_BASE_LANG_VISIBLE', "Visible");
+define('_AD_BASE_LANG_WEIGHT', "Weight");
 define('_AD_BASE_MESSAGE_CHILDREN_DELETED_TOGETHER', "Children deleted together");
-define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Confirm to delete");
-define('_AD_BASE_TIPS_ADD_CUSTOM_BLOCK', "Add custom block");
-define('_AD_BASE_TIPS_BLOCK_UNINSTALL', "block uninstall");
-define('_AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL', "Custom block uninstall");
+define('_AD_BASE_MESSAGE_CONFIRM_DELETE', "Do you really delete it?");
+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>.");
 define('_AD_BASE_TIPS_INSTALL_BLOCK', "Let's customize your site with installing your favorite blocks. You can edit the block's options when you install the block.");
 define('_MB_A_BASE_LANG_ACTIONSEARCH', "Action Search");
 define('_MB_A_BASE_LANG_ACTIONSEARCH_INFO', "what's Action Search....");

From minahito ＠ users.sourceforge.jp  Sat Apr 15 11:50:26 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 11:50:26 +0900
Subject: [xoops-cvslog 2809] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060415025026.0F69A2AC04E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php:1.1.2.5	Tue Apr 11 15:26:19 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockFilterForm.class.php	Sat Apr 15 11:50:25 2006
@@ -108,9 +108,18 @@
 		// Set sort conditions.
 		//
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
+		
+		//
+		// If the sort key is mid, set c_type to second sort key for list display.
+		//
+		if (abs($this->mSort) == NEWBLOCKS_SORT_KEY_MID) {
+			$this->_mCriteria->addSort('c_type', $this->getOrder());
+		}
+		
 		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_SIDE) {
 			$this->_mCriteria->addSort('side', $this->getOrder());
 		}
+		
 		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_WEIGHT) {
 			$this->_mCriteria->addSort('weight', $this->getOrder());
 		}

From minahito ＠ users.sourceforge.jp  Sat Apr 15 12:03:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 12:03:33 +0900
Subject: [xoops-cvslog 2810] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060415030333.837A42AC087@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.4 xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.5
--- xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php:1.1.2.4	Tue Apr 11 15:12:45 2006
+++ xoops2jp/html/modules/base/admin/forms/BlockInstallFilterForm.class.php	Sat Apr 15 12:03:33 2006
@@ -28,6 +28,9 @@
 
 define('NEWBLOCKS_SORT_KEY_DEFAULT', NEWBLOCKS_SORT_KEY_MID);
 
+//
+// TODO This class should extend Legacy_BlockFilterForm
+//
 class Legacy_BlockInstallFilterForm extends Legacy_AbstractFilterForm
 {
 	var $mSort = 0;
@@ -87,6 +90,21 @@
 		$this->_mCriteria->add(new Criteria('isactive', array(XOBJ_DTYPE_BOOL, 1)));
 
 		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
+		
+		//
+		// If the sort key is mid, set c_type to second sort key for list display.
+		//
+		if (abs($this->mSort) == NEWBLOCKS_SORT_KEY_MID) {
+			$this->_mCriteria->addSort('c_type', $this->getOrder());
+		}
+		
+		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_SIDE) {
+			$this->_mCriteria->addSort('side', $this->getOrder());
+		}
+		
+		if (abs($this->mSort) != NEWBLOCKS_SORT_KEY_WEIGHT) {
+			$this->_mCriteria->addSort('weight', $this->getOrder());
+		}
 	}
 }
 

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 13:10:46 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 13:10:46 +0900
Subject: [xoops-cvslog 2811] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415041046.1F9592AC10F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.7	Thu Apr 13 00:11:19 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Sat Apr 15 13:10:45 2006
@@ -46,9 +46,6 @@
       <th><{$smarty.const._AD_BASE_LANG_WEIGHT}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_WEIGHT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
-      <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-        <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
       <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}><br />
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
         <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BCACHETIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -62,22 +59,49 @@
         <td><{$obj->getVar('bid')}></td>
         <td style="text-align:left;">
           <{if $obj->mModule}>
-            <{$obj->mModule->getVar('name')}>
+            <b><{$obj->mModule->getVar('name')}></b>
           <{else}>
-            &nbsp;
+            <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}>
+            <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}>
+            <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}>
+            <{elseif $obj->get('c_type') == "C"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
+            <{/if}>
           <{/if}>
         </td>
 <{*
         <td><{$obj->getVar('name')}></td>
 *}>
         <td style="text-align:left;"><{$obj->getVar('title')}></td>
-        <td nowrap>
-          <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}><{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-<{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
-        </td>
+        <td nowrap><{strip}>
+          <{if $obj->get('side') == 0}>
+            <span style='background-color:#66ff66;'><{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}></span>-
+          <{else}>
+            <{xoops_input type=radio name=side key=$obj->get('bid') value=0 default=$obj->get('side')}>-
+          <{/if}>
+          <{if $obj->get('side') == 3}>
+            <span style='background-color:#66FF66;'><{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}></span>
+          <{else}>
+            <{xoops_input type=radio name=side key=$obj->get('bid') value=3 default=$obj->get('side')}>
+          <{/if}>
+          <{if $obj->get('side') == 5}>
+            <span style='background-color:#66FF66;'><{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}></span>
+          <{else}>
+            <{xoops_input type=radio name=side key=$obj->get('bid') value=5 default=$obj->get('side')}>
+          <{/if}>
+          <{if $obj->get('side') == 4}>
+            <span style='background-color:#66FF66;'><{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}></span>-
+          <{else}>
+            <{xoops_input type=radio name=side key=$obj->get('bid') value=4 default=$obj->get('side')}>-
+          <{/if}>
+          <{if $obj->get('side') == 1}>
+            <span style='background-color:#66FF66;'><{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}></span>
+          <{else}>
+            <{xoops_input type=radio name=side key=$obj->get('bid') value=1 default=$obj->get('side')}>
+          <{/if}>
+        <{/strip}></td>
         <td>
           <{xoops_input type=text name=weight size=4 key=$obj->get('bid') value=$obj->get('weight')}>
         </td>
-        <td><{$obj->getVar('c_type')}></td>
         <td>
           <select name="bcachetime[<{$obj->getVar('bid')}>]">
             <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$obj->get('bcachetime')}>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.5	Thu Apr 13 00:11:19 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Sat Apr 15 13:10:45 2006
@@ -16,25 +16,22 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_MID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
 <{*
     <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_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.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
 *}>
     <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_BASE_LANG_C_TYPE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_C_TYPE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_TEMPLATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -42,21 +39,24 @@
       <td><{$obj->getVar('bid')}></td>
       <td style="text-align:left;">
         <{if $obj->mModule}>
-          <{$obj->mModule->getVar('name')}>
+          <b><{$obj->mModule->getVar('name')}></b>
         <{else}>
-          &nbsp;
+          <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}>
+          <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}>
+          <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}>
+          <{elseif $obj->get('c_type') == "C"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
+          <{/if}>
         <{/if}>
       </td>
 <{*
       <td style="text-align:left;"><{$obj->getVar('name')}></td>
 *}>
       <td style="text-align:left;"><{$obj->getVar('title')}></td>
-      <td><{$obj->getVar('c_type')}></td>
       <td style="text-align:left;"><{$obj->getVar('template')}></td>
       <td>
-        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
         <{if $obj->get('block_type') == 'C'}>
-          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
         <{/if}>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 13:41:18 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 13:41:18 +0900
Subject: [xoops-cvslog 2812] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060415044118.20D912AC082@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.14 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.15
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.14	Thu Apr 13 00:31:23 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Sat Apr 15 13:41:17 2006
@@ -22,7 +22,7 @@
 define('_AD_USER_LANG_ACTIVEUSER', "Active user");
 define('_AD_USER_LANG_ACTKEY', "actkey");
 define('_AD_USER_LANG_ALL_OF_USERS', "All of users");
-define('_AD_USER_LANG_APPROVE_USERS_ONLY', "Approve users only");
+define('_AD_USER_LANG_APPROVE_USERS_ONLY', "Only active users");
 define('_AD_USER_LANG_ATTACHSIG', "Always attach my signature");
 define('_AD_USER_LANG_AVATAR_CREATED', "Created");
 define('_AD_USER_LANG_AVATAR_DELETE', "Delete avatar");
@@ -67,14 +67,14 @@
 define('_AD_USER_LANG_GROUP_TYPE', "Type");
 define('_AD_USER_LANG_GROUPID', "Group ID");
 define('_AD_USER_LANG_ID', "ID");
-define('_AD_USER_LANG_LAST_LOGIN', "last login");
-define('_AD_USER_LANG_LASTLOG_LESS', "Lastlog less");
-define('_AD_USER_LANG_LASTLOG_MORE', "Lastlog more");
+define('_AD_USER_LANG_LAST_LOGIN', "Last login");
+define('_AD_USER_LANG_LASTLOG_LESS', "Last login is less than <strong>X</strong> days ago");
+define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than <strong>X</strong> days ago");
 define('_AD_USER_LANG_LASTLOGIN', "Last login");
 define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
 define('_AD_USER_LANG_LEVEL', "Level");
-define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Mail NG users only");
-define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Mail OK users only");
+define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Only users that don't accept mail ");
+define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Only users that accept mail");
 define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?");
 define('_AD_USER_LANG_NAME', "Real name");
 define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
@@ -82,9 +82,9 @@
 define('_AD_USER_LANG_NOTIFY_MODE', "Default Notification Mode");
 define('_AD_USER_LANG_OFF', "Off");
 define('_AD_USER_LANG_ON', "On");
-define('_AD_USER_LANG_OVER_POSTS', "over posts");
+define('_AD_USER_LANG_OVER_POSTS', "Number of Posts is greater than <strong>X</strong>");
 define('_AD_USER_LANG_PASS', "Password");
-define('_AD_USER_LANG_PENDING_USERS_ONLY', "Pending users only");
+define('_AD_USER_LANG_PENDING_USERS_ONLY', "Only inactive users");
 define('_AD_USER_LANG_PERM_ACCESS', "Access");
 define('_AD_USER_LANG_PERM_ACCESS_ADMIN', "Privilege of access control");
 define('_AD_USER_LANG_PERM_ADMIN', "Administration");
@@ -105,8 +105,8 @@
 define('_AD_USER_LANG_RANK_SPECIAL', "Special rank");
 define('_AD_USER_LANG_RANK_TITLE', "Title");
 define('_AD_USER_LANG_REGDATE', "Registered date");
-define('_AD_USER_LANG_REGDATE_LESS', "Regdate less");
-define('_AD_USER_LANG_REGDATE_MORE', "Regdate more");
+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");
 define('_AD_USER_LANG_REGISTDATE', "Registered date");
 define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag");
 define('_AD_USER_LANG_SEARCH_AGAIN', "Search again");
@@ -119,7 +119,7 @@
 define('_AD_USER_LANG_UID', "UID");
 define('_AD_USER_LANG_UMODE', "Comments Display Mode");
 define('_AD_USER_LANG_UNAME', "User name");
-define('_AD_USER_LANG_UNDER_POSTS', "under posts");
+define('_AD_USER_LANG_UNDER_POSTS', "Number of Posts is less than <strong>X</strong>");
 define('_AD_USER_LANG_UORDER', "Comments Sort Order");
 define('_AD_USER_LANG_URL', "Website");
 define('_AD_USER_LANG_USER', "User");

From minahito ＠ users.sourceforge.jp  Sat Apr 15 13:48:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 13:48:27 +0900
Subject: [xoops-cvslog 2813] CVS update: xoops2jp/html/modules/base/admin/forms
Message-ID: <20060415044827.26DFB2AC08B@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php
diff -u xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.5 xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.6
--- xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php:1.1.2.5	Tue Apr 11 15:12:45 2006
+++ xoops2jp/html/modules/base/admin/forms/CommentFilterForm.class.php	Sat Apr 15 13:48:27 2006
@@ -92,7 +92,7 @@
 			$this->_mCriteria->add(new Criteria('com_ip', array(XOBJ_DTYPE_STRING, xoops_getrequest('com_ip'))));
 		}
 	
-		if (isset($_REQUEST['com_status'])) {
+		if (xoops_getrequest('com_status') > 0) {
 			$this->_mNavi->addExtra('com_status', xoops_getrequest('com_status'));
 			$this->_mCriteria->add(new Criteria('com_status', array(XOBJ_DTYPE_BOOL, xoops_getrequest('com_status'))));
 		}

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:20:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:20:38 +0900
Subject: [xoops-cvslog 2814] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415052038.4FA642AC0E8@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/xoops2.html
diff -u /dev/null xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.1
--- /dev/null	Sat Apr 15 14:20:38 2006
+++ xoops2jp/html/modules/base/language/english/xoops2.html	Sat Apr 15 14:20:38 2006
@@ -0,0 +1,33 @@
+<h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
+<h5>Getting first</h5>
+<p> All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p<p> These features will be ported to 'Legacy module' until stable release.</p>
+
+<h5>Module management</h5>
+<ul>
+<li>You can manage modules on 'Legacy system' module.</li>
+<li>'Install module' and 'Module management' has each control page.</li>
+<li>Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.</li>
+<li>Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.</li>
+<li>Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.</li>
+</ul>
+
+<h5>User management</h5>
+<ul>
+<li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
+<li>このうち、アバターやメール、ユーザー編集に関しては移行を終えていません。</li>
+</ul>
+
+<h5>Theme management</h5>
+<ul>
+<li>Each renderer systems (Theme engine) are used for management themes.</li>
+<li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
+</ul>
+
+<font color='red'>New!</font>
+<h5>Block management</h5>
+<ul>
+<li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>
+<li>If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.</li>
+<li>If you uninstall the block, it returns to the list of 'Install block' page.</li>
+<li>You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.
+</ul>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:21:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:21:10 +0900
Subject: [xoops-cvslog 2815] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415052110.7DF702AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/help.html
diff -u xoops2jp/html/modules/base/language/english/help.html:1.1.2.1 xoops2jp/html/modules/base/language/english/help.html:1.1.2.2
--- xoops2jp/html/modules/base/language/english/help.html:1.1.2.1	Sat Feb  4 01:36:07 2006
+++ xoops2jp/html/modules/base/language/english/help.html	Sat Apr 15 14:21:10 2006
@@ -1,35 +1,33 @@
-<h4>Outline</h4>
-<ul>
-  <li>This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.</li>
-  <li>Also, it provides module operation menu and theme engine for admin menu.</li>
-  <li>This module is incomplete in this release. It should be used together with System module.</li>
-</ul>
+<h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
+<h5>Getting first</h5>
+<p> All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p<p> These features will be ported to 'Legacy module' until stable release.</p>
 
-<h4>Action Search</h4>
+<h5>Module management</h5>
 <ul>
-  <li>Search information of typed keyword from admin menu and help files.</li>
-  <li>Please perform search when you need to know how to use the XOOPS Cube.</li>
+<li>You can manage modules on 'Legacy system' module.</li>
+<li>'Install module' and 'Module management' has each control page.</li>
+<li>Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.</li>
+<li>Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.</li>
+<li>Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.</li>
 </ul>
 
-<h4>Module administration / installation</h4>
+<h5>User management</h5>
 <ul>
-  <li>When you go to this area, you see a list of installed module in your XOOPS Cube.</li>
-  <li>To install modules, please go to 'install module'.</li>
-  <li>You can check details of modules when you click 'Information(!)' button.</li>
-  <li>Otherwise, you can operate the administration menu just like XOOPS 2.0.x.</li>
+<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to <strong>user module</strong>.</li>
+<li>However, 'Sending mail' hasn't ported yet.</li>
 </ul>
-<{*
-<h4>Transition manual (from XOOPS 2.0.x)</h4>
+
+<h5>Theme management</h5>
 <ul>
-  <li>Please refer <a href="<{'xoops2.html'|helpurl}>">here.</a></li>
+<li>Each renderer systems (Theme engine) are used for management themes.</li>
+<li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
 </ul>
-*}>
 
-<h4>TODO (What's coming?)</h4>
+<font color='red'>New!</font>
+<h5>Block management</h5>
 <ul>
-  <li>Name of this module would be changed to 'Legacy module' form 'Base module'.</li>
-  <li>Comment function (Legacy files(in 2.0.x) for comments is used in this release.)</li>
-  <li>Function of Event notify (It is disabled in this release.)</li>
-  <li>Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)</li>
-  <li>Adding some disabled function in misc.php .</li>
+<li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>
+<li>If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.</li>
+<li>If you uninstall the block, it returns to the list of 'Install block' page.</li>
+<li>You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.
 </ul>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:21:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:21:55 +0900
Subject: [xoops-cvslog 2816] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060415052155.2A5442AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/xoops2.html
diff -u xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.3 xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.4
--- xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.3	Wed Apr  5 19:59:03 2006
+++ xoops2jp/html/modules/base/language/japanese/xoops2.html	Sat Apr 15 14:21:55 2006
@@ -17,7 +17,7 @@
 <h5>ユーザーの管理</h5>
 <ul>
 <li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
-<li>このうち、アバターやメール、ユーザー編集に関しては移行を終えていません。</li>
+<li>このうち、メールに関しては移行を終えていません。</li>
 </ul>
 
 <h5>テーマの管理</h5>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:22:09 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:22:09 +0900
Subject: [xoops-cvslog 2817] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060415052209.394012AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/help.html
diff -u xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.4 xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.5
--- xoops2jp/html/modules/base/language/japanese/help.html:1.1.2.4	Sat Feb  4 15:14:07 2006
+++ xoops2jp/html/modules/base/language/japanese/help.html	Sat Apr 15 14:22:09 2006
@@ -27,9 +27,10 @@
   <li><a href="<{'xoops2.html'|helpurl}>">こちら</a>をご覧ください</li>
 </ul>
 
-<h4>Cube 2.1 alpha 1 既知の問題点・注意事項</h4>
+<h4>Cube 2.1 alpha 既知の問題点・注意事項</h4>
 <ul>
   <li>「base module」の名称（ディレクトリ名を含む）は、正式版までに「Legacy module」に変更の予定です。</li>
+  <li>「互換モジュール」のモジュールインストーラが一部のモジュールのSQLを正しく処理できないという問題があります。その場合「system module」を使ってインストールしてください。</li>
   <li>幾つかのモジュールは、XOOPS2.0.xが一時的に作成したグローバル変数に依存しているためインストール出来ないものがあります。</li>
   <li>モジュールアップデートの際には、モジュールの設定情報が初期値に戻ります。</li>
   <li>misc.phpに依存した機能の「SSLログイン」「友達に知らせる」「アバターリスト」が使えなくなっています。「アバターリスト」は、「ユーザーモジュール」内に変更となります。</li>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:23:42 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:23:42 +0900
Subject: [xoops-cvslog 2818] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415052342.E4AD62AC082@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.10 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.10	Thu Apr 13 00:11:19 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_list.html	Sat Apr 15 14:23:42 2006
@@ -30,7 +30,7 @@
     <{/foreach}>
   </select>
 
-  <input type="submit" />
+  <input type="submit" value="<{$smarty.const._SUBMIT}>" />
 </form>
 
 <table class="outer">

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:25:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:25:04 +0900
Subject: [xoops-cvslog 2819] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415052504.A2D752AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/xoops2.html
diff -u xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.1 xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.2
--- xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.1	Sat Apr 15 14:20:38 2006
+++ xoops2jp/html/modules/base/language/english/xoops2.html	Sat Apr 15 14:25:03 2006
@@ -13,8 +13,8 @@
 
 <h5>User management</h5>
 <ul>
-<li>ユーザーの管理、ユーザーパーミッションの管理、ユーザーグループの管理、アバター管理、一斉メール送信などの機能はユーザー管理モジュールへ移動する予定です。</li>
-<li>このうち、アバターやメール、ユーザー編集に関しては移行を終えていません。</li>
+<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to <strong>user module</strong>.</li>
+<li>However, 'Sending mail' hasn't ported yet.</li>
 </ul>
 
 <h5>Theme management</h5>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:25:04 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:25:04 +0900
Subject: [xoops-cvslog 2820] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415052505.01EEE2AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.2	Sun Apr  9 23:48:01 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html	Sat Apr 15 14:25:04 2006
@@ -2,7 +2,11 @@
   <a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
   &raquo;&raquo; <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
   <{if $actionForm->getVar('content')}>
-    &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+    <{if $object->getVar('visible') == 1 }>
+      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+    <{else}>
+      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
+    <{/if}>
   <{else}>
     &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
   <{/if}>
@@ -10,7 +14,11 @@
 
 <h3>
   <{if $actionForm->getVar('content')}>
-    <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+    <{if $object->getVar('visible') == 1 }>
+      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+    <{else}>
+      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
+    <{/if}>
   <{else}>
     <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
   <{/if}>
@@ -31,7 +39,11 @@
     <tr>
       <th colspan="2">
         <{if $actionForm->getVar('content')}>
-          <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+          <{if $object->getVar('visible') == 1 }>
+            &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+          <{else}>
+            &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
+          <{/if}>
         <{else}>
           <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>
         <{/if}>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:25:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:25:35 +0900
Subject: [xoops-cvslog 2821] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415052535.E720B2AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/help.html
diff -u xoops2jp/html/modules/base/language/english/help.html:1.1.2.2 xoops2jp/html/modules/base/language/english/help.html:1.1.2.3
--- xoops2jp/html/modules/base/language/english/help.html:1.1.2.2	Sat Apr 15 14:21:10 2006
+++ xoops2jp/html/modules/base/language/english/help.html	Sat Apr 15 14:25:35 2006
@@ -1,33 +1,35 @@
-<h4>Migration from XOOPS2 to XOOPS Cube 2.1 Legacy</h4>
-<h5>Getting first</h5>
-<p> All of system module's feature are active because XOOPS Cube 2.1 is development status. You'll need these old features to solve your troubles.</p<p> These features will be ported to 'Legacy module' until stable release.</p>
+<h4>Outline</h4>
+<ul>
+  <li>This module provides compatibility of XOOPS Cube with XOOPS 2.0.x.</li>
+  <li>Also, it provides module operation menu and theme engine for admin menu.</li>
+  <li>This module is incomplete in this release. It should be used together with System module.</li>
+</ul>
 
-<h5>Module management</h5>
+<h4>Action Search</h4>
 <ul>
-<li>You can manage modules on 'Legacy system' module.</li>
-<li>'Install module' and 'Module management' has each control page.</li>
-<li>Click 'Module management' menu to manage your installed modules. Click 'Install module' menu to install new modules.</li>
-<li>Legacy system's module installer keeps some bugs now. And, it doesn't implement all function of system module's installer.</li>
-<li>Old system's installer set group permission by the user who execute install. New Legacy system's installer set group permission to an administrator group only.</li>
+  <li>Search information of typed keyword from admin menu and help files.</li>
+  <li>Please perform search when you need to know how to use the XOOPS Cube.</li>
 </ul>
 
-<h5>User management</h5>
+<h4>Module administration / installation</h4>
 <ul>
-<li>'User management', 'Group management', 'Group permission', 'Avatar management' and 'Sending mail' will be ported to <strong>user module</strong>.</li>
-<li>However, 'Sending mail' hasn't ported yet.</li>
+  <li>When you go to this area, you see a list of installed module in your XOOPS Cube.</li>
+  <li>To install modules, please go to 'install module'.</li>
+  <li>You can check details of modules when you click 'Information(!)' button.</li>
+  <li>Otherwise, you can operate the administration menu just like XOOPS 2.0.x.</li>
 </ul>
 
-<h5>Theme management</h5>
+<h4>Migration guide (from XOOPS 2.0.x)</h4>
 <ul>
-<li>Each renderer systems (Theme engine) are used for management themes.</li>
-<li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
+  <li>Please refer <a href="<{'xoops2.html'|helpurl}>">here.</a></li>
 </ul>
 
-<font color='red'>New!</font>
-<h5>Block management</h5>
+<h4>TODO (What's coming?)</h4>
 <ul>
-<li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>
-<li>If you install module, the module's blocks are registered to XOOPS Cube + Legacy, but it isn't able to use. Click install icon of block which you want to install in 'Install block' page.</li>
-<li>If you uninstall the block, it returns to the list of 'Install block' page.</li>
-<li>You can't edit uninstalled blocks' group permission, target column and target module. But, uninstalled blocks keep these parameters. When you re-install the block, block installer recovers last parameters.
+  <li>'Legacy module' cann't install some modules' SQL file correctly. If you meet this problem, use old module installer of 'system'.</li>
+  <li>Name of this module would be changed to 'Legacy module' form 'Base module'.</li>
+  <li>Comment function (Legacy files(in 2.0.x) for comments is used in this release.)</li>
+  <li>Function of Event notify (It is disabled in this release.)</li>
+  <li>Update scripts from XOOPS 2.0.x (Database table is not defined in this release to enable installation)</li>
+  <li>Adding some disabled function in misc.php .</li>
 </ul>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:32:51 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:32:51 +0900
Subject: [xoops-cvslog 2822] CVS update:
	xoops2jp/html/modules/base/language/japanese
Message-ID: <20060415053251.19F9E2AC10D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/japanese/xoops2.html
diff -u xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.4 xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.5
--- xoops2jp/html/modules/base/language/japanese/xoops2.html:1.1.2.4	Sat Apr 15 14:21:55 2006
+++ xoops2jp/html/modules/base/language/japanese/xoops2.html	Sat Apr 15 14:32:50 2006
@@ -26,7 +26,7 @@
 <li>ＤＢテンプレートはレンダーシステムの特性という考え方になりますので、その管理はレンダーシステムのモジュールへ移動します。ただしこの移行作業はまだ終えていません。</li>
 </ul>
 
-<font color='red'>New!</font>
+<div style="color:red;">New!</div>
 <h5>ブロックの管理</h5>
 <ul>
 <li>XOOPS Cube 2.1 + Legacy モジュールでは、ブロックの考え方を整理し、「可視／不可視」をモジュール同様、<strong>インストール</strong>という概念で考えています。</li>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:32:51 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:32:51 +0900
Subject: [xoops-cvslog 2823] CVS update:
	xoops2jp/html/modules/base/language/english
Message-ID: <20060415053251.3AC862AC110@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/language/english/xoops2.html
diff -u xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.2 xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.3
--- xoops2jp/html/modules/base/language/english/xoops2.html:1.1.2.2	Sat Apr 15 14:25:03 2006
+++ xoops2jp/html/modules/base/language/english/xoops2.html	Sat Apr 15 14:32:51 2006
@@ -23,7 +23,7 @@
 <li>We think that DB template manager is property of the renderer. Therefore, template manager is ported to Legacy renderer which has compatibility with XOOPS2's smarty environment.</li>
 </ul>
 
-<font color='red'>New!</font>
+<div style="color:red;">New!</div>
 <h5>Block management</h5>
 <ul>
 <li>XOOPS Cube 2.1 Legacy environment changed an opinion about block feature. You need <strong>install</strong> block before you set block to your site. New Legacy system handles it by visible flag.</li>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:36:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:36:20 +0900
Subject: [xoops-cvslog 2824] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415053620.BC9C02AC10D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.8 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.9
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.8	Sat Apr 15 13:10:45 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Sat Apr 15 14:36:20 2006
@@ -64,7 +64,7 @@
             <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}>
             <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}>
             <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}>
-            <{elseif $obj->get('c_type') == "C"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
+            <{elseif $obj->get('c_type') == "T"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
             <{/if}>
           <{/if}>
         </td>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:37:04 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:37:04 +0900
Subject: [xoops-cvslog 2825] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415053704.BE2DD2AC10D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.6	Sat Apr 15 13:10:45 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Sat Apr 15 14:37:04 2006
@@ -44,7 +44,7 @@
           <{if $obj->get('c_type') == "H" }><{$smarty.const._AD_BASE_LANG_CUSTOM_HTML}>
           <{elseif $obj->get('c_type') == "P"}><{$smarty.const._AD_BASE_LANG_CUSTOM_PHP}>
           <{elseif $obj->get('c_type') == "S"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITH_SMILIES}>
-          <{elseif $obj->get('c_type') == "C"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
+          <{elseif $obj->get('c_type') == "T"}><{$smarty.const._AD_BASE_LANG_CUSTOM_WITHOUT_SMILIES}>
           <{/if}>
         <{/if}>
       </td>

From minahito ＠ users.sourceforge.jp  Sat Apr 15 14:38:20 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sat, 15 Apr 2006 14:38:20 +0900
Subject: [xoops-cvslog 2826] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415053820.088332AC10D@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.3	Sat Apr 15 14:25:04 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html	Sat Apr 15 14:38:19 2006
@@ -79,7 +79,7 @@
       <td class="head"><{$smarty.const._AD_BASE_LANG_C_TYPE}></td>
       <td class="<{cycle values="odd,even"}>">
         <select name='c_type'>
-          <{xoops_optionsArray from=$ctypeArr value=type label=label default=$actionForm->get('ctype')}>
+          <{xoops_optionsArray from=$ctypeArr value=type label=label default=$actionForm->get('c_type')}>
         </select>
       </td>
     </tr>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:51:02 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:51:02 +0900
Subject: [xoops-cvslog 2827] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415055102.92FFD2AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.4	Sat Apr 15 14:38:19 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html	Sat Apr 15 14:51:02 2006
@@ -15,9 +15,9 @@
 <h3>
   <{if $actionForm->getVar('content')}>
     <{if $object->getVar('visible') == 1 }>
-      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
+      <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
     <{else}>
-      &raquo;&raquo; <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
+      <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
     <{/if}>
   <{else}>
     <{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}>

From tom_g3x ＠ users.sourceforge.jp  Sat Apr 15 14:51:33 2006
From: tom_g3x ＠ users.sourceforge.jp (Tom Hayakawa)
Date: Sat, 15 Apr 2006 14:51:33 +0900
Subject: [xoops-cvslog 2828] CVS update:
	xoops2jp/html/modules/base/admin/templates
Message-ID: <20060415055133.107082AC082@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.7	Sat Apr 15 14:37:04 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Sat Apr 15 14:51:32 2006
@@ -16,22 +16,22 @@
 <table class="outer">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_MID}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_MID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 <{*
     <th><{$smarty.const._AD_BASE_LANG_NAME}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_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.NEWBLOCKS_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
 *}>
     <th><{$smarty.const._AD_BASE_LANG_TITLE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_TEMPLATE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" title="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.NEWBLOCKS_SORT_KEY_TEMPLATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" title="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_BASE_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -54,9 +54,11 @@
       <td style="text-align:left;"><{$obj->getVar('title')}></td>
       <td style="text-align:left;"><{$obj->getVar('template')}></td>
       <td>
-        <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
         <{if $obj->get('block_type') == 'C'}>
-          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+          <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" title="<{$smarty.const._DELETE}>" /></a>
+        <{else}>
+          <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>"title="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
         <{/if}>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Sun Apr 16 11:10:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 16 Apr 2006 11:10:50 +0900
Subject: [xoops-cvslog 2829] CVS update:
	xoops2jp/html/modules/base/admin/actions
Message-ID: <20060416021050.89D772AC010@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.6 xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.7
--- xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php:1.1.2.6	Tue Mar 28 22:28:35 2006
+++ xoops2jp/html/modules/base/admin/actions/ModuleInstallAction.class.php	Sun Apr 16 11:10:50 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: ModuleInstallAction.class.php,v 1.1.2.6 2006/03/28 13:28:35 minahito Exp $
+ * @version $Id: ModuleInstallAction.class.php,v 1.1.2.7 2006/04/16 02:10:50 minahito Exp $
  */
 
  if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -40,7 +40,7 @@
 
 		$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') ."/language/" . $language . "/" . $file;
 		if (!file_exists($path)) {
-			$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "pm/language/english/" . $file;
+			$path = XOOPS_MODULE_PATH . "/" . $this->mModuleObject->getVar('dirname') . "/language/english/" . $file;
 			if (!file_exists($path)) {
 				return;
 			}

From minahito ＠ users.sourceforge.jp  Sun Apr 16 11:35:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Sun, 16 Apr 2006 11:35:38 +0900
Subject: [xoops-cvslog 2830] CVS update: xoops2jp/html/kernel
Message-ID: <20060416023538.833A12AC0A9@users.sourceforge.jp>

Index: xoops2jp/html/kernel/block.php
diff -u xoops2jp/html/kernel/block.php:1.2.8.6 xoops2jp/html/kernel/block.php:1.2.8.7
--- xoops2jp/html/kernel/block.php:1.2.8.6	Tue Apr 11 17:42:17 2006
+++ xoops2jp/html/kernel/block.php	Sun Apr 16 11:35:38 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: block.php,v 1.2.8.6 2006/04/11 08:42:17 nobunobu Exp $
+// $Id: block.php,v 1.2.8.7 2006/04/16 02:35:38 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -441,9 +441,9 @@
         if ($block->isNew()) {
 			$isNew = true;
             $bid = $this->db->genId('newblocks_bid_seq');
-            $sql = sprintf("INSERT INTO %s (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES (%u, %u, %u, '%s', '%s', '%s', '%s', %u, %u, %u, '%s', '%s', %u, '%s', '%s', '%s', '%s', '%s', %u, %u)", $this->db->prefix('newblocks'), $bid, $mid, $func_num, $options, $name, $title, $content, $side, $weight, $visible, $block_type, $c_type, 1, $dirname, $func_file, $show_func, $edit_func, $template, $bcachetime, time());
+            $sql = sprintf("INSERT INTO %s (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES (%u, %u, %u, %s, %s, %s, %s, %u, %u, %u, %s, %s, %u, %s, %s, %s, %s, %s, %u, %u)", $this->db->prefix('newblocks'), $bid, $mid, $func_num, $this->db->quoteString($options), $this->db->quoteString($name), $this->db->quoteString($title), $this->db->quoteString($content), $side, $weight, $visible, $this->db->quoteString($block_type), $this->db->quoteString($c_type), 1, $this->db->quoteString($dirname), $this->db->quoteString($func_file), $this->db->quoteString($show_func), $this->db->quoteString($edit_func), $this->db->quoteString($template), $bcachetime, time());
         } else {
-            $sql = sprintf("UPDATE %s SET func_num = %u, options = '%s', name = '%s', title = '%s', content = '%s', side = %u, weight = %u, visible = %u, c_type = '%s', isactive = %u, func_file = '%s', show_func = '%s', edit_func = '%s', template = '%s', bcachetime = %u, last_modified = %u WHERE bid = %u", $this->db->prefix('newblocks'), $func_num, $options, $name, $title, $content, $side, $weight, $visible, $c_type, $isactive, $func_file, $show_func, $edit_func, $template, $bcachetime, time(), $bid);
+            $sql = sprintf("UPDATE %s SET func_num = %u, options = %s, name = %s, title = %s, content = %s, side = %u, weight = %u, visible = %u, c_type = %s, isactive = %u, func_file = %s, show_func = %s, edit_func = %s, template = %s, bcachetime = %u, last_modified = %u WHERE bid = %u", $this->db->prefix('newblocks'), $func_num, $this->db->quoteString($options), $this->db->quoteString($name), $this->db->quoteString($title), $this->db->quoteString($content), $side, $weight, $visible, $this->db->quoteString($c_type), $isactive, $this->db->quoteString($func_file), $this->db->quoteString($show_func), $this->db->quoteString($edit_func), $this->db->quoteString($template), $bcachetime, time(), $bid);
         }
         if (!$result = $this->db->query($sql)) {
             return false;

From nobunobu ＠ users.sourceforge.jp  Mon Apr 17 14:00:16 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 17 Apr 2006 14:00:16 +0900
Subject: [xoops-cvslog 2831] CVS update: xoops2jp/html/kernel
Message-ID: <20060417050016.E37262AC01E@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.7 xoops2jp/html/kernel/module.php:1.2.8.8
--- xoops2jp/html/kernel/module.php:1.2.8.7	Tue Apr 11 17:41:12 2006
+++ xoops2jp/html/kernel/module.php	Mon Apr 17 14:00:16 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.7 2006/04/11 08:41:12 nobunobu Exp $
+// $Id: module.php,v 1.2.8.8 2006/04/17 05:00:16 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -226,53 +226,24 @@
      **/
     function &search($term = '', $andor = 'AND', $limit = 0, $offset = 0, $userid = 0)
     {
+        $ret = false;
         if ($this->getVar('hassearch') != 1) {
-            return false;
+            return $ret;
         }
         $search =& $this->getInfo('search');
         if ($this->getVar('hassearch') != 1 || !isset($search['file']) || !isset($search['func']) || $search['func'] == '' || $search['file'] == '') {
-            return false;
+            return $ret;
         }
         if (file_exists(XOOPS_ROOT_PATH."/modules/".$this->getVar('dirname').'/'.$search['file'])) {
             include_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/'.$search['file'];
         } else {
-            return false;
+            return $ret;
         }
         if (function_exists($search['func'])) {
             $func = $search['func'];
-            return $func($term, $andor, $limit, $offset, $userid);
-        }
-        return false;
-    }
-    
-    function getRenderedVersion()
-    {
-		return $this->getVar('version') / 100;
-	}
-
-	/**
-	 * @return bool
-	 */
-	function hasHelp()
-	{
-		$info =& $this->getInfo();
-		if (isset($info['help']) && strlen($info['help']) > 0) {
-			return true;
+            $ret = $func($term, $andor, $limit, $offset, $userid);
 		}
-		
-		return false;
-	}
-
-	/**
-	 * @return string
-	 */
-	function getHelp()
-	{
-		if ($this->hasHelp()) {
-			return $this->modinfo['help'];
-		}
-
-		return null;
+        return $ret;
 	}
 
     /**#@+
@@ -294,7 +265,8 @@
     function &getByDirName($dirname)
     {
         $modhandler =& xoops_gethandler('module');
-        return $modhandler->getByDirname($dirname);
+        $ret =& $modhandler->getByDirname($dirname);
+        return $ret;
     }
     /**#@-*/
 }
@@ -337,7 +309,7 @@
      **/
     function &create($isNew = true)
     {
-        $module = new XoopsModule();
+        $module =& new XoopsModule();
         if ($isNew) {
             $module->setNew();
         }
@@ -355,27 +327,27 @@
     {
         static $_cachedModule_dirname;
         static $_cachedModule_mid;
+        $ret = false;
         $id = intval($id);
         if ($id > 0) {
             if (!empty($_cachedModule_mid[$id])) {
                 return $_cachedModule_mid[$id];
             } else {
                 $sql = 'SELECT * FROM '.$this->db->prefix('modules').' WHERE mid = '.$id;
-                if (!$result = $this->db->query($sql)) {
-                    return false;
-                }
-                $numrows = $this->db->getRowsNum($result);
-                if ($numrows == 1) {
-                    $module = new XoopsModule();
-                    $myrow = $this->db->fetchArray($result);
-                    $module->assignVars($myrow);
-                    $_cachedModule_mid[$id] =& $module;
-                    $_cachedModule_dirname[$module->getVar('dirname')] =& $module;
-                    return $module;
+                if ($result = $this->db->query($sql)) {
+                    $numrows = $this->db->getRowsNum($result);
+                    if ($numrows == 1) {
+                        $module =& new XoopsModule();
+                        $myrow = $this->db->fetchArray($result);
+                        $module->assignVars($myrow);
+                        $_cachedModule_mid[$id] =& $module;
+                        $_cachedModule_dirname[$module->getVar('dirname')] =& $module;
+                        $ret =& $module;
+                    }
                 }
             }
         }
-        return false;
+        return $ret;
     }
 
     /**
@@ -389,27 +361,26 @@
     {
         static $_cachedModule_mid;
         static $_cachedModule_dirname;
-
+        $ret = false;
         $dirname =  trim($dirname);
         
         if (!empty($_cachedModule_dirname[$dirname])) {
-            return $_cachedModule_dirname[$dirname];
+            $ret = $_cachedModule_dirname[$dirname];
         } else {
             $sql = "SELECT * FROM ".$this->db->prefix('modules')." WHERE dirname = ".$this->db->quoteString($dirname);
-            if (!$result = $this->db->query($sql)) {
-                return false;
-            }
-            $numrows = $this->db->getRowsNum($result);
-            if ($numrows == 1) {
-                $module = new XoopsModule();
-                $myrow = $this->db->fetchArray($result);
-                $module->assignVars($myrow);
-                $_cachedModule_dirname[$dirname] =& $module;
-                $_cachedModule_mid[$module->getVar('mid')] =& $module;
-                return $module;
+            if ($result = $this->db->query($sql)) {
+                $numrows = $this->db->getRowsNum($result);
+                if ($numrows == 1) {
+                    $module =& new XoopsModule();
+                    $myrow = $this->db->fetchArray($result);
+                    $module->assignVars($myrow);
+                    $_cachedModule_dirname[$dirname] =& $module;
+                    $_cachedModule_mid[$module->getVar('mid')] =& $module;
+                    $ret =& $module;
+                }
             }
-            return false;
         }
+        return $ret;
     }
 
     /**
@@ -543,7 +514,7 @@
             return $ret;
         }
         while ($myrow = $this->db->fetchArray($result)) {
-            $module = new XoopsModule();
+            $module =& new XoopsModule();
             $module->assignVars($myrow);
             if (!$id_as_key) {
                 $ret[] =& $module;

From minahito ＠ users.sourceforge.jp  Mon Apr 17 18:48:51 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 17 Apr 2006 18:48:51 +0900
Subject: [xoops-cvslog 2832] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060417094851.6F60E2AC05C@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.2 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.3
--- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.2	Tue Mar 28 22:30:15 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php	Mon Apr 17 18:48:51 2006
@@ -121,7 +121,7 @@
 		}
 		
 		$this->mSmarty->setModulePrefix("base");
-		$result=&$this->mSmarty->fetch("blocks/".$target->getTemplateName());
+		$result = $this->mSmarty->fetch("blocks/".$target->getTemplateName());
 		$target->setResult($result);
 		
 		//

From nobunobu ＠ users.sourceforge.jp  Mon Apr 17 20:20:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Mon, 17 Apr 2006 20:20:25 +0900
Subject: [xoops-cvslog 2833] CVS update: xoops2jp/html/kernel
Message-ID: <20060417112025.E25E92AC048@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.8 xoops2jp/html/kernel/module.php:1.2.8.9
--- xoops2jp/html/kernel/module.php:1.2.8.8	Mon Apr 17 14:00:16 2006
+++ xoops2jp/html/kernel/module.php	Mon Apr 17 20:20:25 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.8 2006/04/17 05:00:16 nobunobu Exp $
+// $Id: module.php,v 1.2.8.9 2006/04/17 11:20:25 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -113,8 +113,6 @@
      **/
     function &getInfo($name=null)
     {
-		$ret = false;
-		
         if ( !isset($this->modinfo) ) {
             $this->loadInfo($this->getVar('dirname'));
         }
@@ -122,6 +120,7 @@
             if ( isset($this->modinfo[$name]) ) {
                 return $this->modinfo[$name];
             }
+            $ret = false;
             return $ret;
         }
         return $this->modinfo;
@@ -246,6 +245,31 @@
         return $ret;
 	}
 
+	/**
+	 * @return bool
+	 */
+	function hasHelp()
+	{
+		$info =& $this->getInfo();
+		if (isset($info['help']) && strlen($info['help']) > 0) {
+			return true;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * @return string
+	 */
+	function getHelp()
+	{
+		if ($this->hasHelp()) {
+			return $this->modinfo['help'];
+		}
+
+		return null;
+	}
+
     /**#@+
      * For backward compatibility only!
      * @deprecated

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:00:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:00:46 +0900
Subject: [xoops-cvslog 2834] CVS update: xoops2jp/html/include
Message-ID: <20060419050046.B390F2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.13 xoops2jp/html/include/functions.php:1.2.8.14
--- xoops2jp/html/include/functions.php:1.2.8.13	Fri Apr 14 15:28:00 2006
+++ xoops2jp/html/include/functions.php	Wed Apr 19 14:00:46 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.13 2006/04/14 06:28:00 minahito Exp $
+// $Id: functions.php,v 1.2.8.14 2006/04/19 05:00:46 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -578,7 +578,9 @@
     if (!isset($handlers[$module_dir][$name]) && !$optional) {
         trigger_error('Handler does not exist<br />Module: '.$module_dir.'<br />Name: '.$name, E_USER_ERROR);
     }
-    return isset($handlers[$module_dir][$name]) ? $handlers[$module_dir][$name] : false;
+	
+	$failvalue = false;
+    return isset($handlers[$module_dir][$name]) ? $handlers[$module_dir][$name] : $failvalue;
 }
 
 function xoops_getrank($rank_id =0, $posts = 0)

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:01:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:01:13 +0900
Subject: [xoops-cvslog 2835] CVS update: xoops2jp/html/class
Message-ID: <20060419050113.95B482AC00E@users.sourceforge.jp>

Index: xoops2jp/html/class/template.php
diff -u xoops2jp/html/class/template.php:1.2.8.4 xoops2jp/html/class/template.php:1.2.8.5
--- xoops2jp/html/class/template.php:1.2.8.4	Fri Jan 27 23:38:08 2006
+++ xoops2jp/html/class/template.php	Wed Apr 19 14:01:13 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: template.php,v 1.2.8.4 2006/01/27 14:38:08 nobunobu Exp $
+// $Id: template.php,v 1.2.8.5 2006/04/19 05:01:13 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -92,7 +92,7 @@
         //  varArgs : 
         //      'xoopsTpl'     [I/O] : $this
         //
-		XCube_EventUtils::quickRaiseEvent('Legacy.XoopsTpl.New',  array('xoopsTpl' => &$this));
+		$dmy =& XCube_EventUtils::quickRaiseEvent('Legacy.XoopsTpl.New',  array('xoopsTpl' => &$this));
 	}
 
 	/**
@@ -247,7 +247,7 @@
     //      'xoopsTpl'     [I/O] : $this
     //
 	if (! $eventResult =& XCube_EventUtils::quickRaiseEvent('Legacy.XoopsTpl.TemplateTouch',
-											 array('tpl_id' => $tpl_id,'clear_old' => $clear_old,'result'=>false))) {
+											 array('tpl_id' => $tpl_id,'clear_old' => $clear_old,'result'=>false))) {
 		$tpl = new XoopsTpl();
 		$tpl->force_compile = true;
 		$tplfile_handler =& xoops_gethandler('tplfile');

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:27:59 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:27:59 +0900
Subject: [xoops-cvslog 2836] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060419052759.EF0362AC060@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.30 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.31
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.30	Fri Apr 14 15:29:00 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Wed Apr 19 14:27:59 2006
@@ -693,7 +693,8 @@
 	 */
 	function &getVirtualCurrentModule()
 	{
-		return $this->_mControllerState->getVirtualCurrentModule($this);
+		$ret =& $this->_mControllerState->getVirtualCurrentModule($this);
+		return $ret;
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:28:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:28:45 +0900
Subject: [xoops-cvslog 2837] CVS update: xoops2jp/html/class
Message-ID: <20060419052845.ED1652AC00E@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_EventManager.class.php
diff -u xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.9 xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.10
--- xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.9	Tue Mar 28 22:28:16 2006
+++ xoops2jp/html/class/XCube_EventManager.class.php	Wed Apr 19 14:28:45 2006
@@ -124,7 +124,10 @@
 		$ret =null;
 		$methodName=str_replace(".","_","create".ucfirst($name)."Delegate");
 		if(method_exists($this,$methodName)) {
-			$ret=&call_user_func(array($this,$methodName));
+			//
+			// Couldn't use user_call_func to receive reference.
+			//
+			$ret =& $this->$methodName();
 		}
 
 		return $ret;

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:30:07 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:30:07 +0900
Subject: [xoops-cvslog 2838] CVS update: xoops2jp/html/kernel
Message-ID: <20060419053007.67C972AC00E@users.sourceforge.jp>

Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.9 xoops2jp/html/kernel/module.php:1.2.8.10
--- xoops2jp/html/kernel/module.php:1.2.8.9	Mon Apr 17 20:20:25 2006
+++ xoops2jp/html/kernel/module.php	Wed Apr 19 14:30:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: module.php,v 1.2.8.9 2006/04/17 11:20:25 nobunobu Exp $
+// $Id: module.php,v 1.2.8.10 2006/04/19 05:30:07 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -246,6 +246,14 @@
 	}
 
 	/**
+	 * @return string
+	 */
+    function getRenderedVersion()
+    {
+		return $this->getVar('version') / 100;
+	}
+
+	/**
 	 * @return bool
 	 */
 	function hasHelp()
@@ -269,7 +277,7 @@
 
 		return null;
 	}
-
+	
     /**#@+
      * For backward compatibility only!
      * @deprecated

From minahito ＠ users.sourceforge.jp  Wed Apr 19 14:32:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Wed, 19 Apr 2006 14:32:23 +0900
Subject: [xoops-cvslog 2839] CVS update: xoops2jp/html/modules/user/blocks
Message-ID: <20060419053223.DEEBC2AC00E@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/blocks/user_online.php
diff -u xoops2jp/html/modules/user/blocks/user_online.php:1.1.2.2 xoops2jp/html/modules/user/blocks/user_online.php:1.1.2.3
--- xoops2jp/html/modules/user/blocks/user_online.php:1.1.2.2	Wed Mar 29 22:52:46 2006
+++ xoops2jp/html/modules/user/blocks/user_online.php	Wed Apr 19 14:32:23 2006
@@ -30,6 +30,7 @@
         $block = array();
         $guests = 0;
         $members = '';
+		$member_list = array();
         for ($i = 0; $i < $total; $i++) {
             if ($onlines[$i]['online_uid'] > 0) {
                 $member['uid'] = $onlines[$i]['online_uid'];

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:50 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:50 +0900
Subject: [xoops-cvslog 2840] CVS update: xoops2jp/html/install
Message-ID: <20060421022550.E20A52AC064@users.sourceforge.jp>

Index: xoops2jp/html/install/index.php
diff -u xoops2jp/html/install/index.php:1.4.2.1 xoops2jp/html/install/index.php:1.4.2.2
--- xoops2jp/html/install/index.php:1.4.2.1	Mon Apr 10 12:05:03 2006
+++ xoops2jp/html/install/index.php	Fri Apr 21 11:25:50 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.4.2.1 2006/04/10 03:05:03 onokazu Exp $
+// $Id: index.php,v 1.4.2.2 2006/04/21 02:25:50 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -578,11 +578,11 @@
     $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', '".addslashes($xoopsConfig['com_mode'])."', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
     $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '".intval($xoopsConfig['com_order'])."', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
     $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
-    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
+    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoopscube.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
     $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
     $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
     $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
-    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS Cube 2.0 &copy; 2005-2006 <a href=\"http://xoopscube.org/\" target=\"_blank\">The XOOPS Cube Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
     $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
     $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
     $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.5 xoops2jp/html/install/makedata.php:1.5.2.1
--- xoops2jp/html/install/makedata.php:1.5	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/install/makedata.php	Fri Apr 21 11:25:50 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.5 2005/10/24 11:44:16 onokazu Exp $
+// $Id: makedata.php,v 1.5.2.1 2006/04/21 02:25:50 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -82,9 +82,9 @@
 
     // data for table 'banner'
 
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (1, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner.gif', 'http://jp.xoops.org/', 1008813250)");
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (2, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner_2.gif', 'http://jp.xoops.org/', 1008813250)");
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (3, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/banner.swf', 'http://jp.xoops.org/', 1008813250)");
+    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (1, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner.gif', 'http://xoopscube.org/', 1008813250)");
+    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (2, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner_2.gif', 'http://xoopscube.org/', 1008813250)");
+    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (3, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/banner.swf', 'http://xoopscube.org/', 1008813250)");
 
     // default theme
 
@@ -196,11 +196,11 @@
     $dbm->insert('config', " VALUES (32, 0, 1, 'com_mode', '_MD_AM_COMMODE', 'nest', '_MD_AM_COMMODEDSC', 'select', 'text', 34)");
     $dbm->insert('config', " VALUES (33, 0, 1, 'com_order', '_MD_AM_COMORDER', '0', '_MD_AM_COMORDERDSC', 'select', 'int', 36)");
     $dbm->insert('config', " VALUES (34, 0, 2, 'bad_unames', '_MD_AM_BADUNAMES', '".addslashes(serialize(array('webmaster', '^xoops', '^admin')))."', '_MD_AM_BADUNAMESDSC', 'textarea', 'array', 24)");
-    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoops.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
+    $dbm->insert('config', " VALUES (35, 0, 2, 'bad_emails', '_MD_AM_BADEMAILS', '".addslashes(serialize(array('xoopscube.org$')))."', '_MD_AM_BADEMAILSDSC', 'textarea', 'array', 26)");
     $dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
     $dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '".addslashes(serialize(array('127.0.0.1')))."', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
     $dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_METAKEY', 'news, technology, headlines, xoops, xoop, nuke, myphpnuke, myphp-nuke, phpnuke, SE, geek, geeks, hacker, hackers, linux, software, download, downloads, free, community, mp3, forum, forums, bulletin, board, boards, bbs, php, survey, poll, polls, kernel, comment, comments, portal, odp, open, source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, weblog, guru, module, modules, theme, themes, cms, content management', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
-    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS 2.0 &copy; 2001-2003 <a href=\"http://www.xoops.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+    $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS Cube 2.0 &copy; 2005-2006 <a href=\"http://xoopscube.org/\" target=\"_blank\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
     $dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
     $dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '".addslashes(serialize(array('fuck', 'shit')))."', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
     $dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:50 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:50 +0900
Subject: [xoops-cvslog 2841] CVS update: xoops2jp/html
Message-ID: <20060421022550.935762AC019@users.sourceforge.jp>

Index: xoops2jp/html/footer.php
diff -u xoops2jp/html/footer.php:1.5 xoops2jp/html/footer.php:1.5.4.1
--- xoops2jp/html/footer.php:1.5	Mon Sep  5 05:46:08 2005
+++ xoops2jp/html/footer.php	Fri Apr 21 11:25:50 2006
@@ -1,91 +1,91 @@
-<?php
-// $Id: footer.php,v 1.5 2005/09/04 20:46:08 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 //
-//  ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) {
-    exit();
-}
-if ( !defined("XOOPS_FOOTER_INCLUDED") ) {
-    define("XOOPS_FOOTER_INCLUDED",1);
-    $xoopsLogger->stopTime();
-    if ($xoopsOption['theme_use_smarty'] == 0) {
-        // the old way
-        $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']).'<br /><div style="text-align:center">Powered by XOOPS &copy; 2001-2005 <a href="http://jp.xoops.org/" target="_blank">The XOOPS Project</a></div>';
-        if (isset($xoopsOption['template_main'])) {
-            $xoopsTpl->xoops_setCaching(0);
-            $xoopsTpl->display('db:'.$xoopsOption['template_main']);
-        }
-        if (!isset($xoopsOption['show_rblock'])) {
-            $xoopsOption['show_rblock'] = 0;
-        }
-        themefooter($xoopsOption['show_rblock'], $footer);
-        xoops_footer();
-    } else {
-        // RMV-NOTIFY
-        include_once XOOPS_ROOT_PATH . '/include/notification_select.php';
-        if (isset($xoopsOption['template_main'])) {
-            if (isset($xoopsCachedTemplateId)) {
-                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch('db:'.$xoopsOption['template_main'], $xoopsCachedTemplateId));
-            } else {
-                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch('db:'.$xoopsOption['template_main']));
-            }
-        } else {
-            if (isset($xoopsCachedTemplate)) {
-                $xoopsTpl->assign('dummy_content', ob_get_contents());
-                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsCachedTemplate, $xoopsCachedTemplateId));
-            } else {
-                $xoopsTpl->assign('xoops_contents', ob_get_contents());
-            }
-            ob_end_clean();
-        }
-        if (!headers_sent()) {
-            header('Content-Type:text/html; charset='._CHARSET);
-            header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-            header('Cache-Control: no-store, no-cache, must-revalidate');
-            header('Cache-Control: post-check=0, pre-check=0', false);
-            header('Pragma: no-cache');
-        }
-        $xoopsTpl->xoops_setCaching(0);
-        $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
-    }
-    if ($xoopsConfig['debug_mode'] == 2 && $xoopsUserIsAdmin) {
-        echo '<script type="text/javascript">
-        <!--//
-        debug_window = openWithSelfMain("", "xoops_debug", 680, 600, true);
-        ';
-        $content = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.htmlspecialchars($xoopsConfig['sitename']).'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body>'.$xoopsLogger->dumpAll().'<div style="text-align:center;"><input class="formButton" value="'._CLOSE.'" type="button" onclick="javascript:window.close();" /></div></body></html>';
-        $lines = preg_split("/(\r\n|\r|\n)( *)/", $content);
-        foreach ($lines as $line) {
-            echo 'debug_window.document.writeln("'.str_replace('"', '\"', $line).'");';
-        }
-        echo '
-        debug_window.document.close();
-        //-->
-        </script>';
-    }
-}
-?>
+<?php
+// $Id: footer.php,v 1.5.4.1 2006/04/21 02:25:50 onokazu Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2005 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  This program is free software; you can redistribute it and/or modify     //
+//  it under the terms of the GNU General Public License as published by     //
+//  the Free Software Foundation; either version 2 of the License, or        //
+//  (at your option) any later version.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  You should have received a copy of the GNU General Public License        //
+//  along with this program; if not, write to the Free Software              //
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit();
+}
+if ( !defined("XOOPS_FOOTER_INCLUDED") ) {
+    define("XOOPS_FOOTER_INCLUDED",1);
+    $xoopsLogger->stopTime();
+    if ($xoopsOption['theme_use_smarty'] == 0) {
+        // the old way
+        $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']).'<br /><div style="text-align:center">Powered by XOOPS Cube &copy; 2005-2006 <a href="http://xoopscube.org/" target="_blank">The XOOPS Cube Project</a></div>';
+        if (isset($xoopsOption['template_main'])) {
+            $xoopsTpl->xoops_setCaching(0);
+            $xoopsTpl->display('db:'.$xoopsOption['template_main']);
+        }
+        if (!isset($xoopsOption['show_rblock'])) {
+            $xoopsOption['show_rblock'] = 0;
+        }
+        themefooter($xoopsOption['show_rblock'], $footer);
+        xoops_footer();
+    } else {
+        // RMV-NOTIFY
+        include_once XOOPS_ROOT_PATH . '/include/notification_select.php';
+        if (isset($xoopsOption['template_main'])) {
+            if (isset($xoopsCachedTemplateId)) {
+                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch('db:'.$xoopsOption['template_main'], $xoopsCachedTemplateId));
+            } else {
+                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch('db:'.$xoopsOption['template_main']));
+            }
+        } else {
+            if (isset($xoopsCachedTemplate)) {
+                $xoopsTpl->assign('dummy_content', ob_get_contents());
+                $xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsCachedTemplate, $xoopsCachedTemplateId));
+            } else {
+                $xoopsTpl->assign('xoops_contents', ob_get_contents());
+            }
+            ob_end_clean();
+        }
+        if (!headers_sent()) {
+            header('Content-Type:text/html; charset='._CHARSET);
+            header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+            header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+            header('Cache-Control: no-store, no-cache, must-revalidate');
+            header('Cache-Control: post-check=0, pre-check=0', false);
+            header('Pragma: no-cache');
+        }
+        $xoopsTpl->xoops_setCaching(0);
+        $xoopsTpl->display($xoopsConfig['theme_set'].'/theme.html');
+    }
+    if ($xoopsConfig['debug_mode'] == 2 && $xoopsUserIsAdmin) {
+        echo '<script type="text/javascript">
+        <!--//
+        debug_window = openWithSelfMain("", "xoops_debug", 680, 600, true);
+        ';
+        $content = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.htmlspecialchars($xoopsConfig['sitename']).'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body>'.$xoopsLogger->dumpAll().'<div style="text-align:center;"><input class="formButton" value="'._CLOSE.'" type="button" onclick="javascript:window.close();" /></div></body></html>';
+        $lines = preg_split("/(\r\n|\r|\n)( *)/", $content);
+        foreach ($lines as $line) {
+            echo 'debug_window.document.writeln("'.str_replace('"', '\"', $line).'");';
+        }
+        echo '
+        debug_window.document.close();
+        //-->
+        </script>';
+    }
+}
+?>

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:51 +0900
Subject: [xoops-cvslog 2842] CVS update: xoops2jp/html/install/language/english
Message-ID: <20060421022551.140892AC068@users.sourceforge.jp>

Index: xoops2jp/html/install/language/english/finish.php
diff -u xoops2jp/html/install/language/english/finish.php:1.2 xoops2jp/html/install/language/english/finish.php:1.2.16.1
--- xoops2jp/html/install/language/english/finish.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/language/english/finish.php	Fri Apr 21 11:25:50 2006
@@ -1,11 +1,11 @@
 <?php
-// $Id: finish.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: finish.php,v 1.2.16.1 2006/04/21 02:25:50 onokazu Exp $
 $content .=
 "<u><b>Your site</b></u>
 <p>Click <a href='../index.php'>HERE</a> to see the home page of your site.</p>
 <u><b>Way to use</b></u>
 <p>[not yet]</p>
 <u><b>Support</b></u>
-<p>Visit <a href='http://www.xoops.org/' target='_blank'>XOOPS.org</a></p>
+<p>Visit <a href='http://xoopscube.org/' target='_blank'>XOOPSCube.org</a></p>
 ";
 ?>
\ No newline at end of file
Index: xoops2jp/html/install/language/english/install.php
diff -u xoops2jp/html/install/language/english/install.php:1.2 xoops2jp/html/install/language/english/install.php:1.2.16.1
--- xoops2jp/html/install/language/english/install.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/language/english/install.php	Fri Apr 21 11:25:50 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: install.php,v 1.2.16.1 2006/04/21 02:25:50 onokazu Exp $
 define("_INSTALL_L0","Welcome to the Install Wizard for XOOPS 2.0");
 define("_INSTALL_L70","Please change the file permission for mainfile.php so that it is writeable by the server (i.e. chmod 777 mainfile.php on a UNIX/LINUX server, or check the properties of the file and make sure the read-only flag is not set on a Windows server ). Reload this page once you have changed the permission setting.");
 //define("_INSTALL_L71","Click on the button below to begin the installation.");
@@ -51,7 +51,7 @@
 define("_INSTALL_L31","Could not create database. Contact the server administrator for details.");
 define("_INSTALL_L32","Installation Complete");
 define("_INSTALL_L33","Click <a href='../index.php'>HERE</a> to see the home page of your site.");
-define("_INSTALL_L35","If you had any errors, please contact the dev team at <a href='http://www.xoops.org/' target='_blank'>XOOPS.org</a>");
+define("_INSTALL_L35","If you had any errors, please contact the dev team at <a href='http://xoopscube.org/' target='_blank'>XOOPSCube.org</a>");
 define("_INSTALL_L36","Please choose your site admin's name and password.");
 define("_INSTALL_L37","Admin Name");
 define("_INSTALL_L38","Admin Email");

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:50 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:50 +0900
Subject: [xoops-cvslog 2843] CVS update: xoops2jp/html/include
Message-ID: <20060421022550.B888A2AC039@users.sourceforge.jp>

Index: xoops2jp/html/include/cp_functions.php
diff -u xoops2jp/html/include/cp_functions.php:1.4.6.1 xoops2jp/html/include/cp_functions.php:1.4.6.2
--- xoops2jp/html/include/cp_functions.php:1.4.6.1	Sun Feb  5 14:19:52 2006
+++ xoops2jp/html/include/cp_functions.php	Fri Apr 21 11:25:50 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: cp_functions.php,v 1.4.6.1 2006/02/05 05:19:52 onokazu Exp $
+// $Id: cp_functions.php,v 1.4.6.2 2006/04/21 02:25:50 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -109,7 +109,7 @@
         <body>
         <table border='0' width='100%' cellspacing='0' cellpadding='0'>
           <tr>
-            <td bgcolor='#2F5376'><a href='http://www.xoops.org/' target='_blank'><img src='".XOOPS_URL."/modules/system/images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' /></a></td>
+            <td bgcolor='#2F5376'><a href='http://xoopscube.org/' target='_blank'><img src='".XOOPS_URL."/modules/system/images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' /></a></td>
             <td align='right' bgcolor='#2F5376' colspan='2'><img src='".XOOPS_URL."/modules/system/images/xoops2.gif' alt='' /></td>
           </tr>
           <tr>
@@ -156,7 +156,7 @@
               <table border='0' width='100%' cellspacing='0' cellpadding='0'>
                 <tr>
                   <td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_left.gif' width='10' height='23' /></td>
-                  <td width='98%' background='".XOOPS_URL."/modules/system/images/hbar_middle.gif' align='center'><div class='fontSmall'>Powered by&nbsp;".XOOPS_VERSION." &copy; 2001-2005 <a href='http://jp.xoops.org/' target='_blank'>The XOOPS Project</a></div></td><td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_right.gif' width='10' height='23' /></td>
+                  <td width='98%' background='".XOOPS_URL."/modules/system/images/hbar_middle.gif' align='center'><div class='fontSmall'>Powered by&nbsp;".XOOPS_VERSION." &copy; 2001-2005 <a href='http://xoopscube.org/' target='_blank'>The XOOPS Cube Project</a></div></td><td width='1%'><img src='".XOOPS_URL."/modules/system/images/hbar_right.gif' width='10' height='23' /></td>
                 </tr>
               </table>
             </td>

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:51 +0900
Subject: [xoops-cvslog 2844] CVS update:
	xoops2jp/html/install/language/japanese
Message-ID: <20060421022551.374C92AC019@users.sourceforge.jp>

Index: xoops2jp/html/install/language/japanese/finish.php
diff -u xoops2jp/html/install/language/japanese/finish.php:1.1 xoops2jp/html/install/language/japanese/finish.php:1.1.16.1
--- xoops2jp/html/install/language/japanese/finish.php:1.1	Thu Sep  9 14:15:04 2004
+++ xoops2jp/html/install/language/japanese/finish.php	Fri Apr 21 11:25:51 2006
@@ -5,7 +5,7 @@
 <u><b>XOOPSの使い方について</b></u>
 <p>[未記述]</p>
 <u><b>サポート</b></u>
-<p><a href='http://www.xoops.org/' target='_blank'>XOOPS.org</a>サイト（英語）か、<a href='http://jp.xoops.org/'>XOOPS日本語公式サイト</a>に訪問ください。
+<p><a href='http://xoopscube.org/' target='_blank'>XOOPSCube.org</a>XOOPS Cube公式サイト（英語）か、<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>へとご訪問ください。
 </p>
 ";
 ?>
\ No newline at end of file
Index: xoops2jp/html/install/language/japanese/install.php
diff -u xoops2jp/html/install/language/japanese/install.php:1.2 xoops2jp/html/install/language/japanese/install.php:1.2.16.1
--- xoops2jp/html/install/language/japanese/install.php:1.2	Fri Mar 18 22:00:58 2005
+++ xoops2jp/html/install/language/japanese/install.php	Fri Apr 21 11:25:51 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: install.php,v 1.2 2005/03/18 13:00:58 onokazu Exp $
+// $Id: install.php,v 1.2.16.1 2006/04/21 02:25:51 onokazu Exp $
 define("_INSTALL_L0","XOOPS 2.0 インストールウィザードへようこそ");
 define("_INSTALL_L70","サーバ上のmainfile.php への書き込み権限を与えてください。<br />（例：UNIX/LINUXサーバの場合はchmod 777 mainfile.php、Windowsサーバの場合は読み取り専用プロパティがセットされていないかチェックする。）<br />権限の設定完了後、ブラウザの「更新」ボタンを押してこのページを再度読み込んでください。");
 //define("_INSTALL_L71","下記のボタンをクリックするとインストールを開始します。");
@@ -51,7 +51,7 @@
 define("_INSTALL_L31","データベースの作成に失敗しました。<br /><br />設定されたユーザアカウントの権限ではデータベースの作成ができない場合は、別途作成し、インストールを続けてください。<br />または、はじめからやり直してください。<br />よくわからない場合は、サーバ管理者にお問い合わせください。");
 define("_INSTALL_L32","インストール完了");
 define("_INSTALL_L33","インストールされたホームページを見るには<a href='../index.php'> ここ </a>をクリックしてください。");
-define("_INSTALL_L35","インストール中にエラーが発生した場合は<a href='http://jp.xoops.org/'>XOOPS日本語公式サイト</a>のサポートフォーラムをご利用ください。");
+define("_INSTALL_L35","インストール中にエラーが発生した場合は<a href='http://xoopscube.jp/'>XOOPS Cube日本語公式サイト</a>のサポートフォーラムをご利用ください。");
 define("_INSTALL_L36","サイト管理者のユーザ名、ユーザパスワード、およびメールアドレスを入力してください。");
 define("_INSTALL_L37","管理者ユーザ名");
 define("_INSTALL_L38","管理者メールアドレス");

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:51 +0900
Subject: [xoops-cvslog 2845] CVS update: xoops2jp/html/install/sql
Message-ID: <20060421022551.592B32AC039@users.sourceforge.jp>

Index: xoops2jp/html/install/sql/mysql.data.sql
diff -u xoops2jp/html/install/sql/mysql.data.sql:1.1 xoops2jp/html/install/sql/mysql.data.sql:1.1.16.1
--- xoops2jp/html/install/sql/mysql.data.sql:1.1	Thu Sep  9 14:15:04 2004
+++ xoops2jp/html/install/sql/mysql.data.sql	Fri Apr 21 11:25:51 2006
@@ -13,7 +13,7 @@
 # Dumping data for table `bannerclient`
 #
 
-INSERT INTO bannerclient VALUES (0, 'XOOPS', 'XOOPS Dev Team', 'webmaster ＠ xoops.org', '', '', '');
+INSERT INTO bannerclient VALUES (0, 'XOOPS', 'XOOPS Dev Team', 'webmaster ＠ xoopscube.org', '', '', '');
 
 #
 # Dumping data for table `bannerfinish`

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:51 +0900
Subject: [xoops-cvslog 2846] CVS update: xoops2jp/html/themes/x2t
Message-ID: <20060421022551.A1A362AC019@users.sourceforge.jp>

Index: xoops2jp/html/themes/x2t/theme.html
diff -u xoops2jp/html/themes/x2t/theme.html:1.1 xoops2jp/html/themes/x2t/theme.html:1.1.16.1
--- xoops2jp/html/themes/x2t/theme.html:1.1	Thu Sep  9 21:08:13 2004
+++ xoops2jp/html/themes/x2t/theme.html	Fri Apr 21 11:25:51 2006
@@ -35,8 +35,8 @@
 	<table border="0" cellpadding="1" cellspacing="0">
 	   <tr>
          <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="<{$xoops_url}>">Home</a></td>
-         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/newbb/">XOOPS Support</a></td>
-         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://www.xoops.org/modules/xoopsfaq/">XOOPS FAQ</a></td>
+         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://xoopscube.org/modules/xhnewbb/">XOOPS Cube Forums</a></td>
+         <td class="tabOff" onmouseover="this.className='tabOn';" onmouseout="this.className='tabOff';"><a href="http://xoopscube.org/">XOOPS Cube Support</a></td>
 	   </tr>
 	</table>
      </td>

From onokazu ＠ users.sourceforge.jp  Fri Apr 21 11:25:51 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 21 Apr 2006 11:25:51 +0900
Subject: [xoops-cvslog 2847] CVS update: xoops2jp/html/themes/default
Message-ID: <20060421022551.7DAFB2AC064@users.sourceforge.jp>

Index: xoops2jp/html/themes/default/theme.html
diff -u xoops2jp/html/themes/default/theme.html:1.4 xoops2jp/html/themes/default/theme.html:1.4.6.1
--- xoops2jp/html/themes/default/theme.html:1.4	Sat Jun 11 11:32:58 2005
+++ xoops2jp/html/themes/default/theme.html	Fri Apr 21 11:25:51 2006
@@ -107,7 +107,7 @@
 
   <table cellspacing="0">
     <tr id="footerbar">
-      <td><a href="http://jp.xoops.org/" target="_blank"><img src="<{$xoops_imageurl}>poweredby.gif" alt="" /></a></td>
+      <td><a href="http://xoopscube.org/" target="_blank"><img src="<{$xoops_imageurl}>poweredby.gif" alt="" /></a></td>
     </tr>
   </table>
 </body>

From minahito ＠ users.sourceforge.jp  Fri Apr 21 12:02:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 21 Apr 2006 12:02:06 +0900
Subject: [xoops-cvslog 2848] CVS update: xoops2jp/html/kernel
Message-ID: <20060421030206.E3EDE2AC010@users.sourceforge.jp>

Index: xoops2jp/html/kernel/user.php
diff -u xoops2jp/html/kernel/user.php:1.2.8.3 xoops2jp/html/kernel/user.php:1.2.8.4
--- xoops2jp/html/kernel/user.php:1.2.8.3	Sun Nov 13 17:27:20 2005
+++ xoops2jp/html/kernel/user.php	Fri Apr 21 12:02:06 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.php,v 1.2.8.3 2005/11/13 08:27:20 minahito Exp $
+// $Id: user.php,v 1.2.8.4 2006/04/21 03:02:06 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -183,7 +183,7 @@
     {
         if (empty($this->_groups)) {
             $member_handler =& xoops_gethandler('member');
-            $this->_groups =& $member_handler->getGroupsByUser($this->getVar('uid'));
+            $this->_groups = $member_handler->getGroupsByUser($this->getVar('uid'));
         }
         return $this->_groups;
     }

From minahito ＠ users.sourceforge.jp  Fri Apr 21 12:03:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 21 Apr 2006 12:03:19 +0900
Subject: [xoops-cvslog 2849] CVS update: xoops2jp/html/class/database
Message-ID: <20060421030319.342A12AC010@users.sourceforge.jp>

Index: xoops2jp/html/class/database/mysqldatabase.php
diff -u xoops2jp/html/class/database/mysqldatabase.php:1.2.8.4 xoops2jp/html/class/database/mysqldatabase.php:1.2.8.5
--- xoops2jp/html/class/database/mysqldatabase.php:1.2.8.4	Tue Feb 28 23:36:04 2006
+++ xoops2jp/html/class/database/mysqldatabase.php	Fri Apr 21 12:03:19 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysqldatabase.php,v 1.2.8.4 2006/02/28 14:36:04 nobunobu Exp $
+// $Id: mysqldatabase.php,v 1.2.8.5 2006/04/21 03:03:19 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -417,7 +417,8 @@
      */
 	function &query($sql, $limit=0, $start=0)
 	{
-		return $this->queryF($sql, $limit, $start);
+		$result =& $this->queryF($sql, $limit, $start);
+		return $result;
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Fri Apr 21 12:03:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 21 Apr 2006 12:03:57 +0900
Subject: [xoops-cvslog 2850] CVS update: xoops2jp/html/modules/user/kernel
Message-ID: <20060421030357.3D4532AC010@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/kernel/UserEventFunction.class.php
diff -u xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.10 xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.11
--- xoops2jp/html/modules/user/kernel/UserEventFunction.class.php:1.1.2.10	Tue Apr 11 18:38:14 2006
+++ xoops2jp/html/modules/user/kernel/UserEventFunction.class.php	Fri Apr 21 12:03:57 2006
@@ -97,13 +97,13 @@
 
 		$controller->mRoot->mLanguageManager->loadModuleLanguage('user');
 
-		$memberHandler=&xoops_gethandler('member');
+		$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 =& $memberHandler->getUsers($criteria);
+		$userArr =& $userHandler->getObjects($criteria);
 		
 		if (count($userArr) != 1) {
 			$eventArgs->setRedirectUrl(XOOPS_URL."/user.php");

From minahito ＠ users.sourceforge.jp  Fri Apr 21 12:15:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 21 Apr 2006 12:15:00 +0900
Subject: [xoops-cvslog 2851] CVS update: xoops2jp/html/include
Message-ID: <20060421031500.E626C2AC010@users.sourceforge.jp>

Index: xoops2jp/html/include/functions.php
diff -u xoops2jp/html/include/functions.php:1.2.8.14 xoops2jp/html/include/functions.php:1.2.8.15
--- xoops2jp/html/include/functions.php:1.2.8.14	Wed Apr 19 14:00:46 2006
+++ xoops2jp/html/include/functions.php	Fri Apr 21 12:15:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: functions.php,v 1.2.8.14 2006/04/19 05:00:46 minahito Exp $
+// $Id: functions.php,v 1.2.8.15 2006/04/21 03:15:00 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -579,8 +579,7 @@
         trigger_error('Handler does not exist<br />Module: '.$module_dir.'<br />Name: '.$name, E_USER_ERROR);
     }
 	
-	$failvalue = false;
-    return isset($handlers[$module_dir][$name]) ? $handlers[$module_dir][$name] : $failvalue;
+    return $handlers[$module_dir][$name];
 }
 
 function xoops_getrank($rank_id =0, $posts = 0)

From minahito ＠ users.sourceforge.jp  Fri Apr 21 12:15:31 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 21 Apr 2006 12:15:31 +0900
Subject: [xoops-cvslog 2852] CVS update: xoops2jp/html/class
Message-ID: <20060421031531.260282AC010@users.sourceforge.jp>

Index: xoops2jp/html/class/XCube_EventManager.class.php
diff -u xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.10 xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.11
--- xoops2jp/html/class/XCube_EventManager.class.php:1.1.2.10	Wed Apr 19 14:28:45 2006
+++ xoops2jp/html/class/XCube_EventManager.class.php	Fri Apr 21 12:15:31 2006
@@ -150,7 +150,7 @@
         if ($root->mEventManager->raiseEvent($event, $root->mController, $eventArgs)) {
             return $eventArgs;
         } else {
-			$ret = false;
+			$ret = null;
             return $ret;
         }
     }

From onokazu ＠ users.sourceforge.jp  Sat Apr 22 12:59:44 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 22 Apr 2006 12:59:44 +0900
Subject: [xoops-cvslog 2853] CVS update: xoops2jp/html/include
Message-ID: <20060422035944.0929D2AC011@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.11 xoops2jp/html/include/version.php:1.11.2.1
--- xoops2jp/html/include/version.php:1.11	Mon Oct 24 20:44:16 2005
+++ xoops2jp/html/include/version.php	Sat Apr 22 12:59:43 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.11 2005/10/24 11:44:16 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.13 JP");
+// $Id: version.php,v 1.11.2.1 2006/04/22 03:59:43 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.14 JP");
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Sat Apr 22 13:08:18 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 22 Apr 2006 13:08:18 +0900
Subject: [xoops-cvslog 2854] CVS update: xoops2jp/html/include
Message-ID: <20060422040818.42D502AC043@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.11.2.1 xoops2jp/html/include/version.php:1.11.2.2
--- xoops2jp/html/include/version.php:1.11.2.1	Sat Apr 22 12:59:43 2006
+++ xoops2jp/html/include/version.php	Sat Apr 22 13:08:18 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.11.2.1 2006/04/22 03:59:43 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.14 JP");
+// $Id: version.php,v 1.11.2.2 2006/04/22 04:08:18 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.14 JP RC1");
 ?>
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Sat Apr 22 13:21:13 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 22 Apr 2006 13:21:13 +0900
Subject: [xoops-cvslog 2855] CVS update: xoops2jp/docs
Message-ID: <20060422042113.744812AC011@users.sourceforge.jp>

Index: xoops2jp/docs/CHANGES.txt
diff -u xoops2jp/docs/CHANGES.txt:1.10 xoops2jp/docs/CHANGES.txt:1.10.2.1
--- xoops2jp/docs/CHANGES.txt:1.10	Mon Oct 24 20:44:16 2005
+++ xoops2jp/docs/CHANGES.txt	Sat Apr 22 13:21:13 2006
@@ -1,483 +1,508 @@
-XOOPS v2 Changelog
-============================
-
-2005/10/24: Version 2.0.13 JP
-===============================
-- Added several fixes for XSS vulnerabilities found in the core and newbb.
-- Added fix to prevent Spams via misc.php and contact module using PHPMailer
-- Added fix to prevent arbitrary code execution vulnerability in uploader.php
-
-
-2005/ 9/ 5: Version 2.0.12 JP
-===============================
-- Fixed display problem in system config preferences when conf_valuetype and conf_formtype are of textarea type
-
-
-2005/ 8/31: Version 2.0.12 JP Beta
-===============================
-- Changed $HTTP_XXX_VARS to $_XXX
-- Limit send to friend feature in siteinfo block to registered users only
-- Fixed bug in duplicate user name checking
-- Added sanitization to PHP_SELF variable
-- Fixed invalid usages of HTML
-- Fixed some bugs sending japanese mails
-- Fixed regex bug in module.textsanitizer.php
-
-
-2005/ 8/14: Version 2.0.11.1 JP
-===============================
-- Fixed full path disclosure vulnerability in several files
-
-
-2005/ 7/31: Version 2.0.11 JP
-===============================
-- Fixed infinite refresh of page in visit.php of mydownloads/mylinks
-
-
-2005/ 7/21: Version 2.0.11 JP RC2
-===============================
-- Added security patch to prevent SQL injection in xmlrpcapi.php
-- Added security patch for XSS vulnerability in comment post
-- Fixed minor display bugs in search result URLs
-- Fixed incorrect Smarty tag name being assigned in header.php
-- Fixed PHP notice errors in several parts
-
-
-2005/ 6/30: Version 2.0.10.2 JP
-===============================
-- Added security patch to prevent SQL injection in xmlrpcapi.php
-- Added security patch for XSS vulnerability in comment post
-
-
-2005/ 6/29: Version 2.0.11 JP RC1
-===============================
-- Merged CriteriaString with the original Cirteria class
-- Fixed bug in image admin section when register_globals off.
-- Code cleanup in headlinerender.php
-- Added missing language constant in the news module
-- Fixed bug in xoopspartners admin section when register_globals off.
-- Fixed smarty variable typo in common.php
-- Fixed invalid template path in template set admin section
-- Fixed comment delete button bug
-- Changed & to &amp; in some files
-- Added missing parameter to redirect URL of newbb/mydownload modules
-- Fixed invalid cache header in footer.php
-- Fixed bug not being able to send mails when over 200 registered users
-
-
-2005/ 6/28: Version 2.0.10.1 JP
-===============================
-- Added security patch to prevent login spoofing
-- Added several patches to fix some important bugs present in 2.0.10 JP
-  - Fixed bug not being able to add user from user admin page
-  - Fixed fatal error in admin page of sections module
-  - Fixed bug not being able to delete forum posts in newbb module
-  - Fixed typo: $xoopsConfig -> $xoopsModuleConfig in news module
-
-
-2005/ 6/15: Version 2.0.11 JP Beta
-===============================
-- Fixed parse error in the sections module
-- Fixed incorrect use of anonpost option variable in the news module
-- Fixed bug not being able to add users to group when active users over 200
-- Fixed bug not being able to add user from the user admin page
-- Fixed bug not being able to delete posts in the newbb module
-
-
-2005/ 6/10: Version 2.0.10 JP
-===============================
-- Added fix for better module version number handling
-- Fixed possible fatal error when using the template manager
-- Fixed more invalid usages of HTML
-- Fixed bug not being able to change password in user admin area
-- Changed <{$xoops_moduledir}> to <{$xoops_dirname}> for xoops.org 2.0.10 compatibility
-- Fixed <{$show_lblock}> not being assigned when no left blocks
-
-
-2005/ 6/2: Version 2.0.10 JP RC2
-===============================
-- Fixed Invalid usages of HTML
-- More fix to popup calendar bug fix added in beta
-- Fixed file/folder names starting with a . being listed as modules, themes, etc.
-- Added missing post_id variable in newbb search results
-- Fixed minor problem with IIS
-- Fixed phpmailer inifinite loop DOS vulnerability
-- Fixed module icons in admin menu and modulesadmin page to be displayed in order by weight
-- Fixed ticket system for improved compatibility with xoops.org 2.0.10
-
-
-2005/ 5/28: Version 2.0.10 JP RC1
-===============================
-- Temporarily disabled showing XOOPS News on admin top page
-- Changed the name of XoopsMediaUploader::checkFileType() to its original XoopsMediaUploader::checkFileType() to maintain compatibility
-- Fixed group name not showing in group admin error message
-- Fixed typo in /kernel/object.php, modules/system/admin/smiles/main.php, include/xoopscodes.php, class/xoopsform/dhtmltextarea.php
-- Changed token lifetime from 900 seconds to unlimited
-- Fixed invalid timestamp format in RSS news feed
-- Removed invalid links to unpublished news article
-- Fixed link to preference settings not being displayed in newbb admin menu
-- Fixed error messages being displayed when pointing to non-existent image file in image.php
-- Fixed ticket error in group admin page when users over 200 in a group
-- Fixed new user being added to all groups when created from the admin page
-- Fixed fatal error message being displayed when trying to browse uninstalled modules
-- Fixed file not found error in zipdownloader.php
-- Added support for 'NOT IN' type queries in Criteria class
-- Added <{$xoops_modulename}> <{$xoops_moduledir}> template vars
-- Added block weight value to each block template var
-
-
-2005/ 5/18: Version 2.0.10 JP Beta
-===============================
-- Implemented new token system for validating form origination and increased protection against CSRF
-- Security fix to avoid the usage of fopen and unlink when preview/debug
-- Fixed bug in header.php, assign $xoops_lblocks
-- Fixed bug #1157029 - Bug in include/checklogin.php
-- Fixed bug #1060061 - renderValidationJS showing htmlentities instead of intended characters
-- Removed <code>foreach ($_POST as $k => $v) {${$k} = $v;}</code> and similar ones which can be insecure under certain circumstances
-- Fixed CSRF vulnerability in block/template preview
-- Fixed CSRF vulnerability in news/newbb preview
-- Fixed arbitrary file deletion vulerability when custom avatar upload enabled
-- Security fix to prevent uploading of executable files
-- Fixed XSS vulerability in redirect_header() function
-- Fixed XSS vulerability in findusers section of system module
-- Fixed XSS vuleratility when displaying smiley popup window
-- Removed old autologin hack codes which can be insecure
-- Fixed arbitrary PHP code execution vulnerability in saxparser class
-- Fixed XOOPS news not being displayed when allow_url_fopen set to off
-- Fixed new user not being added to specified groups when creating new user from the admin section
-- Fixed many typos
-- Fixed many HTML misusages
-- Added more PHP5 compatibility fixes
-- Added fix for duplicated blocks created in 2.0.9
-- Added custom XoopsSecurity class for xoops.org 2.0.10 compatibility
-
-
-2004/12/30: Version 2.0.9.2
-===============================
-- Security fix to prevent session hijacking (thanks goes to GIJOE and the JP XOOPS community)
-- Fixed duplicated blocks bug on module update
-- phpmailer back to the version included in 2.0.7.3, as it is more stable (onokazu)
-
-
-2004/12/25: Version 2.0.9
-===============================
-- Security fix in the newbb module for PHP version < 4.3.10 (GIJOE & onokazu)
-- Security fix in the newbb module to prevent XSS attacks (minahito)
-- Fixed various problems related to XoopsUser::isAdmin() and $xoops_isadmin patch in 2.0.7.1 (bugs #1014203/#1014403) (onokazu)
-- Fixed incorrect parameters being passed to CriteriaCompo in modulesadmin.php (onokazu)
-- Fixed incorrect parameters being passed to XoopsXmlRpcStruct::add() in BloggerApi::getUserInfo() (onokazu)
-- Fixed Bug #1023022 - XoopsFormDhtmlTextArea and array_push() error (Mithrandir)
-- Fixed Bug #1013989 - Inbox title shoud be plural "Private Messages" (Mithrandir)
-- Fixed Bug #1004998 - readpmsg.php typo:</th> html tag of subject is nothing (Mithrandir)
-- Fixed Bug #1035707 - Enable array type options in blocks (Mithrandir)
-- Fixed a typo in include/comment_form.php, patch #1041993 (Dave_l)
-- Fixed Bug #1044957 - xoopsmultimailer.php Username typo when SMTP-Auth (Mithrandir)
-- Fixed RFE #900348 - Sort user list alphabetically in System -> Groups. Also changed the way it fetches the users in the group so it fetches all of them with 2 queries instead of 1 + (1 per user in the group) (Mithrandir
-)
-- Added patch #1048384 - mysql_field_name and others, added (Mithrandir)
-- Fixed bug #1049017 - Blocks sharing a template are cached wrong (Mithrandir)
-- Added patch #1048382 - Module onUpdate function (Mithrandir)
-- Fixed bug #989462 - Handler object caching not working (Mithrandir)
-- Added RFE #900345 - View/Edit group membership in Admin -> System -> Edit User (Mithrandir)
-- Fixed Bug #1055901 - group.php(IN phrase is used ,query) (Mithrandir)
-- Fixed bug #1052403 - block update in module update (Mithrandir)
-- More fixes for register_globals off in the top 10 page of mylinks/mydownloads modules
-- Fixed a typo in modules/xoopsheadline/admin/index.php (onokazu)
-- Fixed bug where 2 headline forms were using the same form name/id, causing JS error (onokazu)
-- Fixed some html problems in mylinks/mydownloads admin page (onokazu)
-- Secured mainfile.dist.php from disclosing paths (Mithrandir)
-- Fixed bug #1073029 (onokazu)
-- Fixed bug #1073532 (onokazu)
-- Fixed bug #1080791 (onokazu)
-- Fixed lang phrase _NOT_ACTIVENOTIFICATIONS not being assing to template (onokazu)
-- Some PHP5 fixes (Mithrandir)
-- Updated Smarty to version 2.6.5
-- Updated PHPMailer to version 1.72
-
-
-2004/09/11: Version 2.0.7.3
-===============================
-!! SECURITY FIX !! fixed more bugs that allowed session hijacking under a certain circumstance (onokazu)
-
-
-2004/09/10: Version 2.0.7.2
-===============================
-!! SECURITY FIX !! fixed bugs that allowed session hijacking under a certain circumstance (onokazu)
-
-
-2004/08/21: Version 2.0.7.1
-===============================
-Fixed bug #1006511 about $xoops_isadmin misuse (skalpa/the jp.xoops.org community):
-- Changed XoopsUser::isAdmin() behavior to prevent problems with modules that misuse this function
-- Fixed permission checking in user profile page, to only show admin links to people who are supposed to see them
-- Fixed permission checking in the comments system, to only show admin links to people who are supposed to see them
-Fixed incorrect escaping of configuration values in 2.0.7 (skalpa)
-Changed db proxy class error message from "Action not allowed" to "Database update not allowed during a GET request" (skalpa)
-Fixed bug #964084: if comment title is long multi-byte character.last byte loss (Mithrandir/domifara)
-Fixed bug #977360: Wrong icon in comment bloc (Mithrandir/zoullou)
-Fixed bug #976534: modules incompatibilities in 2.0.7 (Mithrandir/gijoe_peak)
-Fixed bug #975803: Typo in class/pagenav.php (Mithrandir/Dave_l)
-Fixed bug #974655: slogan variable with Xoops 2.0.7 (Mithrandir/brashquido)
-Fixed bug #987171: typo in edituser.php (Mithrandir)
-Applied patch #928503: Search results for modules with granted permissions optimised (Mithrandir/malanciault)
-Applied patch #988715: cp_header.php language (Mithrandir/phppp)
-Fixed MyTextSanitizer PHP notices (Mithrandir)
-Fixed XoopsForm PHP Notices about an unset _extra property (Mithrandir)
-
-
-2004/06/14: Version 2.0.7
-===============================
-!! SECURITY FIX !! preventing code injection in media uploader (skalpa)
-!! SECURITY FIX !! preventing execution of external scripts in shared environments (skalpa/ackbarr)
-
-Fixed bug #963937: Typo in modules/system/admin/findusers/main.php (mithrandir/tom_g3x)
-Fixed typo in x2t theme css colteaser class definition (w4z004)
-Set formButton class to Xoops popups buttons (w4z004)
-Fixed bug #960970: Incorrect display of the graphical pagenav (w4z004)
-Modified the Word Censoring fix (#962025) for MySQL 4.x compat (skalpa + quick thx 2 hervet 4 help)
-Ensured page title and slogan are escaped for HTML (onokazu)
-Fixed bug #961565: Search form keywords not checked by JS (mithrandir/tom_g3x)
-Fixed bug #961118 in XoopsFormElementTray::getElements() (mithrandir/luckec)
-Fixed bug #961311: Incorrect definition of headers var in XoopsMailer class (mithrandir/tom_g3x)
-XoopsForm::assign() now indexes elements by name if possible (mithrandir/kerkness)
-Fixed bug #963197: xoopsHiddenText is hardcoded in formdhtmlarea (mithrandir/tom_g3x)
-Fixed bug #963301: XoopsMediaUploader checkMaxHeight() doesn't work (skalpa/onokazu)
-Fixed bug #963327: XoopsImageHandler delete() keeps rows in imagebody table (skalpa/tom_g3x)
-Fixed bug #962025: Word censoring can mess db config options up (skalpa/tom_g3x)
-Fixed bug #961313: XoopsMailer custom headers are duplicated (skalpa/tom_g3x)
-Fixed bug #960683: [code] wrong translation (skalpa/ryuji+gi_joe)
-Fixed snoopy bug due to language specific characters (onokazu)
-Fixed a bug preventing deletion of users from the admin user search results (onokazu)
-Fixed a bug preventing deletion of admin users (onokazu)
-Fixed bug #915976: module onInstall feature doesn't display module messages correctly (skalpa/feugy+dave_l)
-Fixed bug #898776: Xoops module resolution for www.host.com and host.com (wulff_dk)
-Fixed bug #906282: XoopsGroupPermForm::render() - throws Undefined variable (mithrandir)
-Fixed bug #946621: Comments system extra_param not working with register_globals off (mithrandir/gstarrett)
-Fixed bug #932200: Admin > Edit user shows wrong username :-(mithrandir)
-Fixed bug #936753: $xoops_module_header not in all themes (w4z004)
-Fixed bug #921930: SQL queries with leading whitespace don't work (mithrandir)
-Fixed bug #920480: xoops_substr always adds three dots (skalpa)
-Fixed bug #921448: Undefined variable in xoopscodes.php (skalpa/dave_l)
-Applied patch #953063: js Calendar first popup date bug fix (mithrandir/venezia)
-Applied patch #953060: xoopstree.php selbox - subcategories not ordered (mithrandir/venezia)
-Applied patch #928503: Only show search results for modules with granted permissions (mithrandir/malanciault)
-Fixed bug #922152 preventing notifications to work with some Windows configurations (skalpa/robekras)
-Fixed bug #930351 preventing XoopsThemeForm::insertBreak() to work
-Corrected the content of $xoopsRequestUri on IIS fixing bug #895984 (skalpa)
-
-2/6/2004: Version 2.0.6
-===============================
-- Removed calls to XoopsHandlerRegistry class (onokazu)
-- Fixed loop problem after retrieving a lost password (onokazu)
-- Changed all include() calls to include_once() for xoopscodes.php (onokazu)
-- Added routines to remove users from the online member list when a user is deleted (onokazu)
-- Added parameters to the Critreria class constructor to allow the use of DB functions in SQL criteria (skalpa)
-- Added fetchBoth() method to the XoopsDatabase class (skalpa)
-- Fixed typos in class/smarty/plugins/resource.db.php (skalpa)
-- Refactoring in /class/xoopsform/form.php (skalpa)
-- Added some methods to /class/xoopsform/formelement.php to allow the use of accesskey and class attributes in form element tags (skalpa)
-- Fixed extra HTML tags not being displayed when using the XoopsThemeForm::insertBreak() method (Catzwolf)
-- Changed the default HTTP method of the search form to GET (onokazu)
-- Fixed notification constants not being included during installation (onokazu)
-- Fixed session data not being properly escaped before inserting to the database (onokazu)
-- Some useful changes to the group permission form (onokazu)
-- Fixed the block cachetime selection being reset after preview (onokazu)
-- Fixed invalid regex patterns used for username filtering, also added fix to allow the safe use of multi-byte characters in username (contributed by GIJOE)
-- Fixed bug where some blocks were not being displayed in block admin page on certain occasions (onokazu)
-- Fixed the problem of system admin icon disappearing on certain occasions (onokazu)
-- Fixed the errorhandler class to check the current error_reporting level before handleing errors (onokazu)
-- Re-activated the errorhandler class (onokazu)
-- Updated class/Snoopy.php to the latest version, v1.01 (onokazu)
-- Fixed a typo in kernel/online.php (onokazu)
-- Added some useful functions to include/xoops.js (skalpa)
-- Fix for Opera in include/xoops.js (onokazu)
-- Fixed user bio and signature values causing corruption in the edit profile form on certain occasions (onokazu)
-- Fixed the module name being reset to the default value after module update (onokazu)
-- Fixed invalid regex patterns in xoopslists.php (onokazu)
-- Fixed a few issues with register_globals setting
-- Fix for the auto-login feature (not activated)
-- Fixed image categories not being displayed in the order set by admin (onokazu)- Fixed a typo in kernel/config.php (onokazu)
-- Fixed comments not being displayed in the order as requested (onokazu)
-- Fixed the mailer class not setting some header values (onokazu)
-- Fixed chmod problem in class/uploader.php
-- Fixed magic_quotes related problems in class/uploader.php
-- Fixed notification routines causing a fatal error while trying to notify non-existent users (onokazu)
-- Added fix to convert &amp; to & within mail messages (onokazu)
-- Fixed html special characters causing problem when submitting a new module name (onokazu)
-- Fixed javascript error in mailuser form (onokazu)
-- Fixed javascript error in calendar date select form
-- Added a new Smarty function <{xoops_link}> (skalpa)
-- Added check to prevent webmaster user/group from being removed completely (contributed by Ryuji)
-
-newbb
-- Security fix in modules/newbb/viewtopic.php (onokazu)
-- Security fix in modules/newbb/viewforum.php (onokazu)
-- Added register_globals related fix to topicmanager.php (onokazu)
-- Fixed topic moderation icons not being displayed for moderators in templates/newbb_thread.html (onokazu)
-- Fixed topic time not being displayed in recent posts block on certain occasions in blocks/newbb_new.php (onokazu)
-- Added fix to correctly navigate to the requested post even when the post is not on the first page of flat view (contrib by GIJOE in class/forumpost.php, viewtopic.php, viewforum.php)
-
-sections
-- Added missing global variable declarations to index.php (onokazu)
-
-mydownloads
-- Added register_globals related fix to modfile.php (onokazu)
-
-news
-- Added fix to always display published date in each article (onokazu)
-- Added missing ?> at the end of file in xoops_version.php (onokazu)
-- Some fixes in admin/index.php
-
-xoopspolls
-- Fixed color bar selections not working when creating/editing a new poll (onokazu)
-
-xoopsmembers
-- Fixed 'more than X posts' not working when set to 0 (onokazu)
-- Added a new language constant to language/english/main.php (Catzwolf)
-- Removed invalid HTML tags in templates/xoopsmembers_searchresults.html (Catzwolf)
-
-
-1/5/2004: Version 2.0.5.2
-===============================
-- Security fix in modules/mylinks/myheader.php
-- Security fix in modules/mylinks/visit.php
-- Security fix in modules/mylinks/admin/index.php
-
-
-11/22/2003: Version 2.0.5.1
-===============================
-- Added $option parameter to xoops_gethandler function (skalpa)
-- Security fix in banners.php (onokazu)
-- Security fix in modules/newss/include/forumform.inc.php (onokazu)
-- Security fix in include/common.php (onokazu)
-- Temporarily disabled XoopsErrorHandler class (onokazu)
-- Security fix in include/functions.php (onokazu)
-- Removed XoopsHandlerRegistry class (onokazu)
-- Added fix for preventing users entering infinite loop when recovering a lost password (onokazu)
-
-
-10/8/2003: Version 2.0.5
-===============================
-- Fixed template files not being updated even when the 'allow update from themes directory' option was enabled in preferences
-- Fixed RSS channel title being cutoff at special characters
-- Minor bug fix in pagenav.php
-- Fixed blocks disappearing from the block admin page on certain occasion
-- Additional fixes to work with register_globals off
-- Fixed problem with XoopsCode Img button not working on certain occasion
-- Added missing SQL query in kernel/avatar.php
-- Fixed problem with the newbb module where users could post without a thread title on certain occasion
-- Fixed problem in banner admin page where banner edit form not being displayed on certain occasion
-- Fixed group selection option in the blocks admin page not being selected on certain occasion
-- Fixed poll option textbox forms not displaying the correct values
-- Fixed show all link in user profile page not working in 2.0.5RC
-- Additional phrases in language/english/global.php(_NOTITLE), language/english/search.php(_SR_IGNOREDWORDS), install/language/english/install.php(_INSTALL_L128, _INSTALL_L200)
-- Added check in install/index.php to read $HTTP_ACCEPT_LANGUAGE on initial load
-
-
-9/30/2003: Version 2.0.5 RC
-===============================
-- Fixed email checking bug mentioned in http://www.xoops.org/modules/newbb/viewtopic.php?topic_id=12288&forum=2 (mvandam)
-- Fixed a number of bugs in blocks admin page (onokazu)
-- More usability fix in blocks admin page (onokazu)
-- Fixed forum topic links to correctly use the # feature in url (onokazu)
-- Fixed password checking bug mentioned in http://www.xoops.org/modules/newbb/viewtopic.php?topic_id=12301&post_id=49369&order=0&viewmode=flat&pid=49203&forum=21#forumpost49369
-- Fixed database connection error when creating database during install (onokazu)
-- Fixed mb_output_handler causing problems in backend.php/image.php/downloader (onokazu)
-- Fixed search feature to use GET requests for prev/next/showall links (onokazu)
-- Register_globals related fix in /include/comment_post.php (contrib by gstarrett)
-- Added $xoopsUserIsAdmin global variable (onokazu)
-- Added xoops_getLinkedUnameById function to /include/functions.php (Catzwolf)
-- Fixed invalid Smarty tags in /modules/system/templates/system_siteclosed.html, /modules/system/templates/system_redirect.html, /modules/system/templates/system_imagemanager2.html (onokazu)
-
-
-9/19/2003: Version 2.0.4
-===============================
-- XOOPS_CACHE_PATH, XOOPS_UPLOAD_PATH, XOOPS_THEME_PATH", XOOPS_COMPILE_PATH, XOOPS_THEME_URL, XOOPS_UPLOAD_URL are now set in include/common.php (onokazu)
-- Added [siteurl][/siteurl] tag to XoopsCode (mvandam)
-- Fixed a typo in class/uploader.php (onokazu)
-- Fixed some redirect problems after login (onokazu)
-- registre_globals fix in include/comment_view.php (onokazu)
-- Xoops.org news is disabled by default in the admin section (onokazu)
-- Added a new error handler class (class/errorhandler.php) (mvandam)
-- Fixed XoopsGroupPermHandler returning duplicate permissions (onokazu)
-- Fixed block-disappearing problem in blocks admin (onokazu)
-- Fixed typo in kernel/notification.php (mvandam)
-- Added XoopsGuestUser class in kernel/user.php (onokazu)
-- Fixed newbb module to correctly use the # feature in URL (onokazu)
-- Improved usability in blocks admin section
-- Reduced number of users to display in group/edituser page to max 200 users (onokazu)
-- Fixed bug where admins could add users with a existing username (onokazu)
-- Added files for module developers to easily add group permisson feature (modules/system/groupperm.php, class/xoopsform/groupperm.php) (onokazu)
-- Fixed typo in register.php (onokazu)
-
-
-6/17/2003: Version 2.0.3
-===============================
-- fixed CSS related bug in global search page
-- register_globals bug fix in comments
-- Smarty updated to 2.5.0
-- fixed typo in kernel/object.php
-- fixed group permission bug
-- fixed bug where image categories were deleted after group permission update
-- fixed bug where user votes could not be deleted in the mylinks module
-- fixed some language typos
-- changed XoopsGroupPermHandler::getItemIds to accept an array fot the second parameter (gperm_groupid), which was required in certain places..
-- removed avatar image files
-
-
-4/25/2003: Version 2.0.2
-===============================
-- security fix to prevent malicious cross site scripting attacks (onokazu)
-- fixed character encoding problem for some languages when using the mailer class (onokazu)
-- fixed some major bugs in the xoopsheadline module (onokazu)
-- fixed some cookie related problems in the forums module (mvandam)
-
-
-4/18/2003: Version 2.0.1
-===============================
-- fixed bug where notification feature could not be turned on
-- fixed character encoding problem for some languages when using the mailer class (onokazu)
-- fixed the theme selection block to work again
-- fixed typo in kernel/module.php
-- fixed incorrect table name in xoops_version.php of the new headline module
-- changed max limit size of some columns in the configoption table
-- fixed image manager bug when using db store method
-- xoops.org can now be disabled by adding nonews=1
-
-
-4/16/2003: Version 2.0.0
-===============================
-- xoopsheadlines module replaced with xoopsheadline module to fix character encoding problems
-- numerous bug fixes
-
-
-3/19/2003: Version 2.0.0 RC3
-===============================
-- a major change in the handling of theme files, the detail of which you can read in this [url=http://www.xoops.org/modules/news/article.php?storyid=677]article[/url] (onokazu)
-- a new global notification feature that can easily be incorporated into modules (that use Smarty) by only modifying xoops_version.php and template files (mvandam)
-- SMTP support using phpMailer (bunny)
-- group permission tables merged into one table (onokazu)
-- code refactoring
-
-
-2/9/2003: Version 2.0.0 RC2
-===============================
-A bug fix release..
-- avatar upload bug
-- themeset image upload bug
-- register_globals fix
-- recommend us block error
-- error message displayed upon submit of news article
-- page navigation bug in some modules
-- blank page bug on some servers
-- SQL displayed in blocks admin
-
-
-1/31/2003: Version 2.0.0 RC1
-===============================
-The first public release of 2.0 series.
-For new features that have been added from 1.3.x, please refer to
-the articles listed below:
-http://www.xoops.org/modules/news/article.php?storyid=486
-http://www.xoops.org/modules/news/article.php?storyid=549
+XOOPS v2 Changelog
+============================
+
+2006/ 4/21: Version 2.0.14 JP RC1
+===============================
+- Added fix for 4.4.x variable reference PHP notice errors
+- Updated 3rd party libraries
+   Snoopy v1.2.3
+   PHPMailer Ver 1.73
+   Smarty Ver 2.6.12
+- Fixed comment post URL in newbb/viewtopic.php
+- Fixed additional slashes in user password being md5()'d.
+- Fixed &amp; -> & in some mail template files
+- Bug Fix #7393: Fixed Smarty Template cycle plugin parameters
+- Added comment icon sanitization
+- $HTTP_*_VARS to $_*
+- Added input validity checks for system avatar selection
+- Fixed many typo
+- Modified xoops.org links to xoopscube.org ;-)
+- Removed duplicate footer include()'s in mydownloads
+
+
+2005/10/25: Version 2.0.13a JP
+===============================
+- Re-applied the $HTTP_*_VARS to $_* fix to some files in newbb
+- Added fix for comment XSS vulnerability that was missing in the previous release
+
+
+2005/10/24: Version 2.0.13 JP
+===============================
+- Added several fixes for XSS vulnerabilities found in the core and newbb.
+- Added fix to prevent Spams via misc.php and contact module using PHPMailer
+- Added fix to prevent arbitrary code execution vulnerability in uploader.php
+
+
+2005/ 9/ 5: Version 2.0.12 JP
+===============================
+- Fixed display problem in system config preferences when conf_valuetype and conf_formtype are of textarea type
+
+
+2005/ 8/31: Version 2.0.12 JP Beta
+===============================
+- Changed $HTTP_XXX_VARS to $_XXX
+- Limit send to friend feature in siteinfo block to registered users only
+- Fixed bug in duplicate user name checking
+- Added sanitization to PHP_SELF variable
+- Fixed invalid usages of HTML
+- Fixed some bugs sending japanese mails
+- Fixed regex bug in module.textsanitizer.php
+
+
+2005/ 8/14: Version 2.0.11.1 JP
+===============================
+- Fixed full path disclosure vulnerability in several files
+
+
+2005/ 7/31: Version 2.0.11 JP
+===============================
+- Fixed infinite refresh of page in visit.php of mydownloads/mylinks
+
+
+2005/ 7/21: Version 2.0.11 JP RC2
+===============================
+- Added security patch to prevent SQL injection in xmlrpcapi.php
+- Added security patch for XSS vulnerability in comment post
+- Fixed minor display bugs in search result URLs
+- Fixed incorrect Smarty tag name being assigned in header.php
+- Fixed PHP notice errors in several parts
+
+
+2005/ 6/30: Version 2.0.10.2 JP
+===============================
+- Added security patch to prevent SQL injection in xmlrpcapi.php
+- Added security patch for XSS vulnerability in comment post
+
+
+2005/ 6/29: Version 2.0.11 JP RC1
+===============================
+- Merged CriteriaString with the original Cirteria class
+- Fixed bug in image admin section when register_globals off.
+- Code cleanup in headlinerender.php
+- Added missing language constant in the news module
+- Fixed bug in xoopspartners admin section when register_globals off.
+- Fixed smarty variable typo in common.php
+- Fixed invalid template path in template set admin section
+- Fixed comment delete button bug
+- Changed & to &amp; in some files
+- Added missing parameter to redirect URL of newbb/mydownload modules
+- Fixed invalid cache header in footer.php
+- Fixed bug not being able to send mails when over 200 registered users
+
+
+2005/ 6/28: Version 2.0.10.1 JP
+===============================
+- Added security patch to prevent login spoofing
+- Added several patches to fix some important bugs present in 2.0.10 JP
+  - Fixed bug not being able to add user from user admin page
+  - Fixed fatal error in admin page of sections module
+  - Fixed bug not being able to delete forum posts in newbb module
+  - Fixed typo: $xoopsConfig -> $xoopsModuleConfig in news module
+
+
+2005/ 6/15: Version 2.0.11 JP Beta
+===============================
+- Fixed parse error in the sections module
+- Fixed incorrect use of anonpost option variable in the news module
+- Fixed bug not being able to add users to group when active users over 200
+- Fixed bug not being able to add user from the user admin page
+- Fixed bug not being able to delete posts in the newbb module
+
+
+2005/ 6/10: Version 2.0.10 JP
+===============================
+- Added fix for better module version number handling
+- Fixed possible fatal error when using the template manager
+- Fixed more invalid usages of HTML
+- Fixed bug not being able to change password in user admin area
+- Changed <{$xoops_moduledir}> to <{$xoops_dirname}> for xoops.org 2.0.10 compatibility
+- Fixed <{$show_lblock}> not being assigned when no left blocks
+
+
+2005/ 6/2: Version 2.0.10 JP RC2
+===============================
+- Fixed Invalid usages of HTML
+- More fix to popup calendar bug fix added in beta
+- Fixed file/folder names starting with a . being listed as modules, themes, etc.
+- Added missing post_id variable in newbb search results
+- Fixed minor problem with IIS
+- Fixed phpmailer inifinite loop DOS vulnerability
+- Fixed module icons in admin menu and modulesadmin page to be displayed in order by weight
+- Fixed ticket system for improved compatibility with xoops.org 2.0.10
+
+
+2005/ 5/28: Version 2.0.10 JP RC1
+===============================
+- Temporarily disabled showing XOOPS News on admin top page
+- Changed the name of XoopsMediaUploader::checkFileType() to its original XoopsMediaUploader::checkFileType() to maintain compatibility
+- Fixed group name not showing in group admin error message
+- Fixed typo in /kernel/object.php, modules/system/admin/smiles/main.php, include/xoopscodes.php, class/xoopsform/dhtmltextarea.php
+- Changed token lifetime from 900 seconds to unlimited
+- Fixed invalid timestamp format in RSS news feed
+- Removed invalid links to unpublished news article
+- Fixed link to preference settings not being displayed in newbb admin menu
+- Fixed error messages being displayed when pointing to non-existent image file in image.php
+- Fixed ticket error in group admin page when users over 200 in a group
+- Fixed new user being added to all groups when created from the admin page
+- Fixed fatal error message being displayed when trying to browse uninstalled modules
+- Fixed file not found error in zipdownloader.php
+- Added support for 'NOT IN' type queries in Criteria class
+- Added <{$xoops_modulename}> <{$xoops_moduledir}> template vars
+- Added block weight value to each block template var
+
+
+2005/ 5/18: Version 2.0.10 JP Beta
+===============================
+- Implemented new token system for validating form origination and increased protection against CSRF
+- Security fix to avoid the usage of fopen and unlink when preview/debug
+- Fixed bug in header.php, assign $xoops_lblocks
+- Fixed bug #1157029 - Bug in include/checklogin.php
+- Fixed bug #1060061 - renderValidationJS showing htmlentities instead of intended characters
+- Removed <code>foreach ($_POST as $k => $v) {${$k} = $v;}</code> and similar ones which can be insecure under certain circumstances
+- Fixed CSRF vulnerability in block/template preview
+- Fixed CSRF vulnerability in news/newbb preview
+- Fixed arbitrary file deletion vulerability when custom avatar upload enabled
+- Security fix to prevent uploading of executable files
+- Fixed XSS vulerability in redirect_header() function
+- Fixed XSS vulerability in findusers section of system module
+- Fixed XSS vuleratility when displaying smiley popup window
+- Removed old autologin hack codes which can be insecure
+- Fixed arbitrary PHP code execution vulnerability in saxparser class
+- Fixed XOOPS news not being displayed when allow_url_fopen set to off
+- Fixed new user not being added to specified groups when creating new user from the admin section
+- Fixed many typos
+- Fixed many HTML misusages
+- Added more PHP5 compatibility fixes
+- Added fix for duplicated blocks created in 2.0.9
+- Added custom XoopsSecurity class for xoops.org 2.0.10 compatibility
+
+
+2004/12/30: Version 2.0.9.2
+===============================
+- Security fix to prevent session hijacking (thanks goes to GIJOE and the JP XOOPS community)
+- Fixed duplicated blocks bug on module update
+- phpmailer back to the version included in 2.0.7.3, as it is more stable (onokazu)
+
+
+2004/12/25: Version 2.0.9
+===============================
+- Security fix in the newbb module for PHP version < 4.3.10 (GIJOE & onokazu)
+- Security fix in the newbb module to prevent XSS attacks (minahito)
+- Fixed various problems related to XoopsUser::isAdmin() and $xoops_isadmin patch in 2.0.7.1 (bugs #1014203/#1014403) (onokazu)
+- Fixed incorrect parameters being passed to CriteriaCompo in modulesadmin.php (onokazu)
+- Fixed incorrect parameters being passed to XoopsXmlRpcStruct::add() in BloggerApi::getUserInfo() (onokazu)
+- Fixed Bug #1023022 - XoopsFormDhtmlTextArea and array_push() error (Mithrandir)
+- Fixed Bug #1013989 - Inbox title shoud be plural "Private Messages" (Mithrandir)
+- Fixed Bug #1004998 - readpmsg.php typo:</th> html tag of subject is nothing (Mithrandir)
+- Fixed Bug #1035707 - Enable array type options in blocks (Mithrandir)
+- Fixed a typo in include/comment_form.php, patch #1041993 (Dave_l)
+- Fixed Bug #1044957 - xoopsmultimailer.php Username typo when SMTP-Auth (Mithrandir)
+- Fixed RFE #900348 - Sort user list alphabetically in System -> Groups. Also changed the way it fetches the users in the group so it fetches all of them with 2 queries instead of 1 + (1 per user in the group) (Mithrandir
+)
+- Added patch #1048384 - mysql_field_name and others, added (Mithrandir)
+- Fixed bug #1049017 - Blocks sharing a template are cached wrong (Mithrandir)
+- Added patch #1048382 - Module onUpdate function (Mithrandir)
+- Fixed bug #989462 - Handler object caching not working (Mithrandir)
+- Added RFE #900345 - View/Edit group membership in Admin -> System -> Edit User (Mithrandir)
+- Fixed Bug #1055901 - group.php(IN phrase is used ,query) (Mithrandir)
+- Fixed bug #1052403 - block update in module update (Mithrandir)
+- More fixes for register_globals off in the top 10 page of mylinks/mydownloads modules
+- Fixed a typo in modules/xoopsheadline/admin/index.php (onokazu)
+- Fixed bug where 2 headline forms were using the same form name/id, causing JS error (onokazu)
+- Fixed some html problems in mylinks/mydownloads admin page (onokazu)
+- Secured mainfile.dist.php from disclosing paths (Mithrandir)
+- Fixed bug #1073029 (onokazu)
+- Fixed bug #1073532 (onokazu)
+- Fixed bug #1080791 (onokazu)
+- Fixed lang phrase _NOT_ACTIVENOTIFICATIONS not being assing to template (onokazu)
+- Some PHP5 fixes (Mithrandir)
+- Updated Smarty to version 2.6.5
+- Updated PHPMailer to version 1.72
+
+
+2004/09/11: Version 2.0.7.3
+===============================
+!! SECURITY FIX !! fixed more bugs that allowed session hijacking under a certain circumstance (onokazu)
+
+
+2004/09/10: Version 2.0.7.2
+===============================
+!! SECURITY FIX !! fixed bugs that allowed session hijacking under a certain circumstance (onokazu)
+
+
+2004/08/21: Version 2.0.7.1
+===============================
+Fixed bug #1006511 about $xoops_isadmin misuse (skalpa/the jp.xoops.org community):
+- Changed XoopsUser::isAdmin() behavior to prevent problems with modules that misuse this function
+- Fixed permission checking in user profile page, to only show admin links to people who are supposed to see them
+- Fixed permission checking in the comments system, to only show admin links to people who are supposed to see them
+Fixed incorrect escaping of configuration values in 2.0.7 (skalpa)
+Changed db proxy class error message from "Action not allowed" to "Database update not allowed during a GET request" (skalpa)
+Fixed bug #964084: if comment title is long multi-byte character.last byte loss (Mithrandir/domifara)
+Fixed bug #977360: Wrong icon in comment bloc (Mithrandir/zoullou)
+Fixed bug #976534: modules incompatibilities in 2.0.7 (Mithrandir/gijoe_peak)
+Fixed bug #975803: Typo in class/pagenav.php (Mithrandir/Dave_l)
+Fixed bug #974655: slogan variable with Xoops 2.0.7 (Mithrandir/brashquido)
+Fixed bug #987171: typo in edituser.php (Mithrandir)
+Applied patch #928503: Search results for modules with granted permissions optimised (Mithrandir/malanciault)
+Applied patch #988715: cp_header.php language (Mithrandir/phppp)
+Fixed MyTextSanitizer PHP notices (Mithrandir)
+Fixed XoopsForm PHP Notices about an unset _extra property (Mithrandir)
+
+
+2004/06/14: Version 2.0.7
+===============================
+!! SECURITY FIX !! preventing code injection in media uploader (skalpa)
+!! SECURITY FIX !! preventing execution of external scripts in shared environments (skalpa/ackbarr)
+
+Fixed bug #963937: Typo in modules/system/admin/findusers/main.php (mithrandir/tom_g3x)
+Fixed typo in x2t theme css colteaser class definition (w4z004)
+Set formButton class to Xoops popups buttons (w4z004)
+Fixed bug #960970: Incorrect display of the graphical pagenav (w4z004)
+Modified the Word Censoring fix (#962025) for MySQL 4.x compat (skalpa + quick thx 2 hervet 4 help)
+Ensured page title and slogan are escaped for HTML (onokazu)
+Fixed bug #961565: Search form keywords not checked by JS (mithrandir/tom_g3x)
+Fixed bug #961118 in XoopsFormElementTray::getElements() (mithrandir/luckec)
+Fixed bug #961311: Incorrect definition of headers var in XoopsMailer class (mithrandir/tom_g3x)
+XoopsForm::assign() now indexes elements by name if possible (mithrandir/kerkness)
+Fixed bug #963197: xoopsHiddenText is hardcoded in formdhtmlarea (mithrandir/tom_g3x)
+Fixed bug #963301: XoopsMediaUploader checkMaxHeight() doesn't work (skalpa/onokazu)
+Fixed bug #963327: XoopsImageHandler delete() keeps rows in imagebody table (skalpa/tom_g3x)
+Fixed bug #962025: Word censoring can mess db config options up (skalpa/tom_g3x)
+Fixed bug #961313: XoopsMailer custom headers are duplicated (skalpa/tom_g3x)
+Fixed bug #960683: [code] wrong translation (skalpa/ryuji+gi_joe)
+Fixed snoopy bug due to language specific characters (onokazu)
+Fixed a bug preventing deletion of users from the admin user search results (onokazu)
+Fixed a bug preventing deletion of admin users (onokazu)
+Fixed bug #915976: module onInstall feature doesn't display module messages correctly (skalpa/feugy+dave_l)
+Fixed bug #898776: Xoops module resolution for www.host.com and host.com (wulff_dk)
+Fixed bug #906282: XoopsGroupPermForm::render() - throws Undefined variable (mithrandir)
+Fixed bug #946621: Comments system extra_param not working with register_globals off (mithrandir/gstarrett)
+Fixed bug #932200: Admin > Edit user shows wrong username :-(mithrandir)
+Fixed bug #936753: $xoops_module_header not in all themes (w4z004)
+Fixed bug #921930: SQL queries with leading whitespace don't work (mithrandir)
+Fixed bug #920480: xoops_substr always adds three dots (skalpa)
+Fixed bug #921448: Undefined variable in xoopscodes.php (skalpa/dave_l)
+Applied patch #953063: js Calendar first popup date bug fix (mithrandir/venezia)
+Applied patch #953060: xoopstree.php selbox - subcategories not ordered (mithrandir/venezia)
+Applied patch #928503: Only show search results for modules with granted permissions (mithrandir/malanciault)
+Fixed bug #922152 preventing notifications to work with some Windows configurations (skalpa/robekras)
+Fixed bug #930351 preventing XoopsThemeForm::insertBreak() to work
+Corrected the content of $xoopsRequestUri on IIS fixing bug #895984 (skalpa)
+
+2/6/2004: Version 2.0.6
+===============================
+- Removed calls to XoopsHandlerRegistry class (onokazu)
+- Fixed loop problem after retrieving a lost password (onokazu)
+- Changed all include() calls to include_once() for xoopscodes.php (onokazu)
+- Added routines to remove users from the online member list when a user is deleted (onokazu)
+- Added parameters to the Critreria class constructor to allow the use of DB functions in SQL criteria (skalpa)
+- Added fetchBoth() method to the XoopsDatabase class (skalpa)
+- Fixed typos in class/smarty/plugins/resource.db.php (skalpa)
+- Refactoring in /class/xoopsform/form.php (skalpa)
+- Added some methods to /class/xoopsform/formelement.php to allow the use of accesskey and class attributes in form element tags (skalpa)
+- Fixed extra HTML tags not being displayed when using the XoopsThemeForm::insertBreak() method (Catzwolf)
+- Changed the default HTTP method of the search form to GET (onokazu)
+- Fixed notification constants not being included during installation (onokazu)
+- Fixed session data not being properly escaped before inserting to the database (onokazu)
+- Some useful changes to the group permission form (onokazu)
+- Fixed the block cachetime selection being reset after preview (onokazu)
+- Fixed invalid regex patterns used for username filtering, also added fix to allow the safe use of multi-byte characters in username (contributed by GIJOE)
+- Fixed bug where some blocks were not being displayed in block admin page on certain occasions (onokazu)
+- Fixed the problem of system admin icon disappearing on certain occasions (onokazu)
+- Fixed the errorhandler class to check the current error_reporting level before handleing errors (onokazu)
+- Re-activated the errorhandler class (onokazu)
+- Updated class/Snoopy.php to the latest version, v1.01 (onokazu)
+- Fixed a typo in kernel/online.php (onokazu)
+- Added some useful functions to include/xoops.js (skalpa)
+- Fix for Opera in include/xoops.js (onokazu)
+- Fixed user bio and signature values causing corruption in the edit profile form on certain occasions (onokazu)
+- Fixed the module name being reset to the default value after module update (onokazu)
+- Fixed invalid regex patterns in xoopslists.php (onokazu)
+- Fixed a few issues with register_globals setting
+- Fix for the auto-login feature (not activated)
+- Fixed image categories not being displayed in the order set by admin (onokazu)- Fixed a typo in kernel/config.php (onokazu)
+- Fixed comments not being displayed in the order as requested (onokazu)
+- Fixed the mailer class not setting some header values (onokazu)
+- Fixed chmod problem in class/uploader.php
+- Fixed magic_quotes related problems in class/uploader.php
+- Fixed notification routines causing a fatal error while trying to notify non-existent users (onokazu)
+- Added fix to convert &amp; to & within mail messages (onokazu)
+- Fixed html special characters causing problem when submitting a new module name (onokazu)
+- Fixed javascript error in mailuser form (onokazu)
+- Fixed javascript error in calendar date select form
+- Added a new Smarty function <{xoops_link}> (skalpa)
+- Added check to prevent webmaster user/group from being removed completely (contributed by Ryuji)
+
+newbb
+- Security fix in modules/newbb/viewtopic.php (onokazu)
+- Security fix in modules/newbb/viewforum.php (onokazu)
+- Added register_globals related fix to topicmanager.php (onokazu)
+- Fixed topic moderation icons not being displayed for moderators in templates/newbb_thread.html (onokazu)
+- Fixed topic time not being displayed in recent posts block on certain occasions in blocks/newbb_new.php (onokazu)
+- Added fix to correctly navigate to the requested post even when the post is not on the first page of flat view (contrib by GIJOE in class/forumpost.php, viewtopic.php, viewforum.php)
+
+sections
+- Added missing global variable declarations to index.php (onokazu)
+
+mydownloads
+- Added register_globals related fix to modfile.php (onokazu)
+
+news
+- Added fix to always display published date in each article (onokazu)
+- Added missing ?> at the end of file in xoops_version.php (onokazu)
+- Some fixes in admin/index.php
+
+xoopspolls
+- Fixed color bar selections not working when creating/editing a new poll (onokazu)
+
+xoopsmembers
+- Fixed 'more than X posts' not working when set to 0 (onokazu)
+- Added a new language constant to language/english/main.php (Catzwolf)
+- Removed invalid HTML tags in templates/xoopsmembers_searchresults.html (Catzwolf)
+
+
+1/5/2004: Version 2.0.5.2
+===============================
+- Security fix in modules/mylinks/myheader.php
+- Security fix in modules/mylinks/visit.php
+- Security fix in modules/mylinks/admin/index.php
+
+
+11/22/2003: Version 2.0.5.1
+===============================
+- Added $option parameter to xoops_gethandler function (skalpa)
+- Security fix in banners.php (onokazu)
+- Security fix in modules/newss/include/forumform.inc.php (onokazu)
+- Security fix in include/common.php (onokazu)
+- Temporarily disabled XoopsErrorHandler class (onokazu)
+- Security fix in include/functions.php (onokazu)
+- Removed XoopsHandlerRegistry class (onokazu)
+- Added fix for preventing users entering infinite loop when recovering a lost password (onokazu)
+
+
+10/8/2003: Version 2.0.5
+===============================
+- Fixed template files not being updated even when the 'allow update from themes directory' option was enabled in preferences
+- Fixed RSS channel title being cutoff at special characters
+- Minor bug fix in pagenav.php
+- Fixed blocks disappearing from the block admin page on certain occasion
+- Additional fixes to work with register_globals off
+- Fixed problem with XoopsCode Img button not working on certain occasion
+- Added missing SQL query in kernel/avatar.php
+- Fixed problem with the newbb module where users could post without a thread title on certain occasion
+- Fixed problem in banner admin page where banner edit form not being displayed on certain occasion
+- Fixed group selection option in the blocks admin page not being selected on certain occasion
+- Fixed poll option textbox forms not displaying the correct values
+- Fixed show all link in user profile page not working in 2.0.5RC
+- Additional phrases in language/english/global.php(_NOTITLE), language/english/search.php(_SR_IGNOREDWORDS), install/language/english/install.php(_INSTALL_L128, _INSTALL_L200)
+- Added check in install/index.php to read $HTTP_ACCEPT_LANGUAGE on initial load
+
+
+9/30/2003: Version 2.0.5 RC
+===============================
+- Fixed email checking bug mentioned in http://www.xoops.org/modules/newbb/viewtopic.php?topic_id=12288&forum=2 (mvandam)
+- Fixed a number of bugs in blocks admin page (onokazu)
+- More usability fix in blocks admin page (onokazu)
+- Fixed forum topic links to correctly use the # feature in url (onokazu)
+- Fixed password checking bug mentioned in http://www.xoops.org/modules/newbb/viewtopic.php?topic_id=12301&post_id=49369&order=0&viewmode=flat&pid=49203&forum=21#forumpost49369
+- Fixed database connection error when creating database during install (onokazu)
+- Fixed mb_output_handler causing problems in backend.php/image.php/downloader (onokazu)
+- Fixed search feature to use GET requests for prev/next/showall links (onokazu)
+- Register_globals related fix in /include/comment_post.php (contrib by gstarrett)
+- Added $xoopsUserIsAdmin global variable (onokazu)
+- Added xoops_getLinkedUnameById function to /include/functions.php (Catzwolf)
+- Fixed invalid Smarty tags in /modules/system/templates/system_siteclosed.html, /modules/system/templates/system_redirect.html, /modules/system/templates/system_imagemanager2.html (onokazu)
+
+
+9/19/2003: Version 2.0.4
+===============================
+- XOOPS_CACHE_PATH, XOOPS_UPLOAD_PATH, XOOPS_THEME_PATH", XOOPS_COMPILE_PATH, XOOPS_THEME_URL, XOOPS_UPLOAD_URL are now set in include/common.php (onokazu)
+- Added [siteurl][/siteurl] tag to XoopsCode (mvandam)
+- Fixed a typo in class/uploader.php (onokazu)
+- Fixed some redirect problems after login (onokazu)
+- registre_globals fix in include/comment_view.php (onokazu)
+- Xoops.org news is disabled by default in the admin section (onokazu)
+- Added a new error handler class (class/errorhandler.php) (mvandam)
+- Fixed XoopsGroupPermHandler returning duplicate permissions (onokazu)
+- Fixed block-disappearing problem in blocks admin (onokazu)
+- Fixed typo in kernel/notification.php (mvandam)
+- Added XoopsGuestUser class in kernel/user.php (onokazu)
+- Fixed newbb module to correctly use the # feature in URL (onokazu)
+- Improved usability in blocks admin section
+- Reduced number of users to display in group/edituser page to max 200 users (onokazu)
+- Fixed bug where admins could add users with a existing username (onokazu)
+- Added files for module developers to easily add group permisson feature (modules/system/groupperm.php, class/xoopsform/groupperm.php) (onokazu)
+- Fixed typo in register.php (onokazu)
+
+
+6/17/2003: Version 2.0.3
+===============================
+- fixed CSS related bug in global search page
+- register_globals bug fix in comments
+- Smarty updated to 2.5.0
+- fixed typo in kernel/object.php
+- fixed group permission bug
+- fixed bug where image categories were deleted after group permission update
+- fixed bug where user votes could not be deleted in the mylinks module
+- fixed some language typos
+- changed XoopsGroupPermHandler::getItemIds to accept an array fot the second parameter (gperm_groupid), which was required in certain places..
+- removed avatar image files
+
+
+4/25/2003: Version 2.0.2
+===============================
+- security fix to prevent malicious cross site scripting attacks (onokazu)
+- fixed character encoding problem for some languages when using the mailer class (onokazu)
+- fixed some major bugs in the xoopsheadline module (onokazu)
+- fixed some cookie related problems in the forums module (mvandam)
+
+
+4/18/2003: Version 2.0.1
+===============================
+- fixed bug where notification feature could not be turned on
+- fixed character encoding problem for some languages when using the mailer class (onokazu)
+- fixed the theme selection block to work again
+- fixed typo in kernel/module.php
+- fixed incorrect table name in xoops_version.php of the new headline module
+- changed max limit size of some columns in the configoption table
+- fixed image manager bug when using db store method
+- xoops.org can now be disabled by adding nonews=1
+
+
+4/16/2003: Version 2.0.0
+===============================
+- xoopsheadlines module replaced with xoopsheadline module to fix character encoding problems
+- numerous bug fixes
+
+
+3/19/2003: Version 2.0.0 RC3
+===============================
+- a major change in the handling of theme files, the detail of which you can read in this [url=http://www.xoops.org/modules/news/article.php?storyid=677]article[/url] (onokazu)
+- a new global notification feature that can easily be incorporated into modules (that use Smarty) by only modifying xoops_version.php and template files (mvandam)
+- SMTP support using phpMailer (bunny)
+- group permission tables merged into one table (onokazu)
+- code refactoring
+
+
+2/9/2003: Version 2.0.0 RC2
+===============================
+A bug fix release..
+- avatar upload bug
+- themeset image upload bug
+- register_globals fix
+- recommend us block error
+- error message displayed upon submit of news article
+- page navigation bug in some modules
+- blank page bug on some servers
+- SQL displayed in blocks admin
+
+
+1/31/2003: Version 2.0.0 RC1
+===============================
+The first public release of 2.0 series.
+For new features that have been added from 1.3.x, please refer to
+the articles listed below:
+http://www.xoops.org/modules/news/article.php?storyid=486
+http://www.xoops.org/modules/news/article.php?storyid=549
 http://www.xoops.org/modules/xoopsdocs/index.php?cat_id=6
\ No newline at end of file

From onokazu ＠ users.sourceforge.jp  Sat Apr 22 13:32:45 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 22 Apr 2006 13:32:45 +0900
Subject: [xoops-cvslog 2856] CVS update: xoops2jp/docs
Message-ID: <20060422043245.A0AEB2AC033@users.sourceforge.jp>

Index: xoops2jp/docs/CHANGES.txt
diff -u xoops2jp/docs/CHANGES.txt:1.10.2.1 xoops2jp/docs/CHANGES.txt:1.10.2.2
--- xoops2jp/docs/CHANGES.txt:1.10.2.1	Sat Apr 22 13:21:13 2006
+++ xoops2jp/docs/CHANGES.txt	Sat Apr 22 13:32:45 2006
@@ -12,8 +12,6 @@
 - Fixed additional slashes in user password being md5()'d.
 - Fixed &amp; -> & in some mail template files
 - Bug Fix #7393: Fixed Smarty Template cycle plugin parameters
-- Added comment icon sanitization
-- $HTTP_*_VARS to $_*
 - Added input validity checks for system avatar selection
 - Fixed many typo
 - Modified xoops.org links to xoopscube.org ;-)

From nobunobu ＠ users.sourceforge.jp  Sun Apr 23 00:53:00 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 23 Apr 2006 00:53:00 +0900
Subject: [xoops-cvslog 2857] CVS update: xoops2jp/html/kernel
Message-ID: <20060422155300.80C592AC0F2@users.sourceforge.jp>

Index: xoops2jp/html/kernel/config.php
diff -u xoops2jp/html/kernel/config.php:1.2.8.1 xoops2jp/html/kernel/config.php:1.2.8.2
--- xoops2jp/html/kernel/config.php:1.2.8.1	Mon Jan  2 21:40:26 2006
+++ xoops2jp/html/kernel/config.php	Sun Apr 23 00:53:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: config.php,v 1.2.8.1 2006/01/02 12:40:26 minahito Exp $
+// $Id: config.php,v 1.2.8.2 2006/04/22 15:53:00 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -91,8 +91,8 @@
      */
     function XoopsConfigHandler(&$db)
     {
-        $this->_cHandler = new XoopsConfigItemHandler($db);
-        $this->_oHandler = new XoopsConfigOptionHandler($db);
+        $this->_cHandler =& new XoopsConfigItemHandler($db);
+        $this->_oHandler =& new XoopsConfigOptionHandler($db);
     }
 
     /**
@@ -103,7 +103,8 @@
      */
     function &createConfig()
     {
-        return $this->_cHandler->create();
+        $ret =& $this->_cHandler->create();
+        return $ret;
     }
 
     /**
@@ -235,7 +236,8 @@
      * @return	object  {@link XoopsConfigOption} 
      */
     function &createConfigOption(){
-        return $this->_oHandler->create();
+        $ret =& $this->_oHandler->create();
+        return $ret;
     }
 
     /**
@@ -247,7 +249,8 @@
      */
     function &getConfigOption($id)
     {
-        return $this->_oHandler->get($id);
+        $ret =& $this->_oHandler->get($id);
+        return $ret;
     }
 
     /**
@@ -260,7 +263,8 @@
      */
     function &getConfigOptions($criteria = null, $id_as_key = false)
     {
-        return $this->_oHandler->getObjects($criteria, $id_as_key);
+        $ret =& $this->_oHandler->getObjects($criteria, $id_as_key);
+        return $ret;
     }
 
     /**
Index: xoops2jp/html/kernel/member.php
diff -u xoops2jp/html/kernel/member.php:1.2.8.6 xoops2jp/html/kernel/member.php:1.2.8.7
--- xoops2jp/html/kernel/member.php:1.2.8.6	Tue Jan 17 19:28:15 2006
+++ xoops2jp/html/kernel/member.php	Sun Apr 23 00:53:00 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: member.php,v 1.2.8.6 2006/01/17 10:28:15 minahito Exp $
+// $Id: member.php,v 1.2.8.7 2006/04/22 15:53:00 nobunobu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -76,9 +76,9 @@
      */
     function XoopsMemberHandler(&$db)
     {
-        $this->_gHandler = new XoopsGroupHandler($db);
-        $this->_uHandler = new XoopsUserHandler($db);
-        $this->_mHandler = new XoopsMembershipHandler($db);
+        $this->_gHandler =& new XoopsGroupHandler($db);
+        $this->_uHandler =& new XoopsUserHandler($db);
+        $this->_mHandler =& new XoopsMembershipHandler($db);
     }
 
     /**
@@ -88,7 +88,8 @@
      */
     function &createGroup()
     {
-        return $this->_gHandler->create();
+        $ret =& $this->_gHandler->create();
+        return $ret;
     }
 
     /**
@@ -98,7 +99,8 @@
      */
     function &createUser()
     {
-        return $this->_uHandler->create();
+        $ret =& $this->_uHandler->create();
+        return $ret;
     }
 
     /**
@@ -107,9 +109,10 @@
      * @param int $id ID for the group
      * @return object XoopsGroup reference to the group
      */
-    function getGroup($id)
+    function &getGroup($id)
     {
-        return $this->_gHandler->get($id);
+        $ret =& $this->_gHandler->get($id);
+        return $ret;
     }
 
     /**
@@ -214,9 +217,10 @@
      * @param bool $id_as_key use the group's ID as key for the array?
      * @return array array of {@link XoopsGroup} objects
      */
-    function getGroups($criteria = null, $id_as_key = false)
+    function &getGroups($criteria = null, $id_as_key = false)
     {
-        return $this->_gHandler->getObjects($criteria, $id_as_key);
+        $groups =& $this->_gHandler->getObjects($criteria, $id_as_key);
+        return $groups;
     }
 
     /**
@@ -226,9 +230,10 @@
      * @param bool $id_as_key use the group's ID as key for the array?
      * @return array array of {@link XoopsUser} objects
      */
-    function getUsers($criteria = null, $id_as_key = false)
+    function &getUsers($criteria = null, $id_as_key = false)
     {
-        return $this->_uHandler->getObjects($criteria, $id_as_key);
+        $users =& $this->_uHandler->getObjects($criteria, $id_as_key);
+        return $users;
     }
 
     /**
@@ -272,7 +277,7 @@
      */
     function addUserToGroup($group_id, $user_id)
     {
-        $group_ids = $this->getGroupsByUser($user_id);
+        $group_ids =& $this->getGroupsByUser($user_id);
         if (!in_array($group_id, $group_ids)) {
             $mship =& $this->_mHandler->create();
             $mship->setVar('groupid', $group_id);
@@ -371,12 +376,13 @@
      * @param bool $asobject return groups as {@link XoopsGroup} objects or arrays?
      * @return array array of objects or arrays
      */
-    function getGroupsByUser($user_id, $asobject = false)
+    function &getGroupsByUser($user_id, $asobject = false)
     {
         $group_ids =& $this->_mHandler->getGroupsByUser($user_id);
         if (!$asobject) {
            return $group_ids;
         } else {
+		   $ret = array();
            foreach ($group_ids as $g_id) {
                $ret[] =& $this->getGroup($g_id);
            }
@@ -397,7 +403,8 @@
         $criteria->add(new Criteria('pass', md5($pwd)));
         $user =& $this->_uHandler->getObjects($criteria, false);
         if (!$user || count($user) != 1) {
-            return false;
+			$ret = false;
+            return $ret;
         }
         return $user[0];
     }
@@ -415,7 +422,8 @@
         $criteria->add(new Criteria('pass', $md5pwd));
         $user =& $this->_uHandler->getObjects($criteria, false);
         if (!$user || count($user) != 1) {
-            return false;
+            $ret = false;
+            return $ret;
         }
         return $user[0];
     }

From nobunobu ＠ users.sourceforge.jp  Sun Apr 23 00:57:25 2006
From: nobunobu ＠ users.sourceforge.jp (NobuNobu)
Date: Sun, 23 Apr 2006 00:57:25 +0900
Subject: [xoops-cvslog 2858] CVS update: xoops2jp/html/modules/base/admin/class
Message-ID: <20060422155725.0FE282AC09D@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.15 xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.16
--- xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php:1.1.2.15	Tue Apr 11 17:39:07 2006
+++ xoops2jp/html/modules/base/admin/class/ModuleUtils.class.php	Sun Apr 23 00:57:24 2006
@@ -301,7 +301,7 @@
         				}
         			}
 				} else {
-				    $root = $root=&XCube_Root::getSingleton();
+				    $root =& XCube_Root::getSingleton();
                     $groups = $root->mController->mXoopsUser->getGroups();
                     foreach ($groups as $mygroup) {
         				$bperm->setVar('gperm_groupid', $mygroup);

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:29:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:29:36 +0900
Subject: [xoops-cvslog 2859] CVS update:
	xoops2jp/html/modules/legacyRender/.xml
Message-ID: <20060424072936.8AEBA2AC14D@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:29:36 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:29:36 +0900
Subject: [xoops-cvslog 2860] CVS update:
	xoops2jp/html/modules/legacyRender/.xml/data
Message-ID: <20060424072936.B428F2AC14F@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:29:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:29:39 +0900
Subject: [xoops-cvslog 2861] CVS update:
	xoops2jp/html/modules/legacyRender/.xml/data
Message-ID: <20060424072939.B8AE62AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/.xml/data/bannerfinish.cbs.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/.xml/data/bannerfinish.cbs.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:39 2006
+++ xoops2jp/html/modules/legacyRender/.xml/data/bannerfinish.cbs.xml	Mon Apr 24 16:29:39 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cubson-mapping>
+  <class name="bannerfinish">
+    <id name="bid" type="XOBJ_DTYPE_INT" column="bid">
+      <generator type="increment" />
+    </id>
+    <property name="cid" type="XOBJ_DTYPE_INT" column="cid" not-null="true" default="0" />
+    <property name="impressions" type="XOBJ_DTYPE_INT" column="impressions" not-null="true" default="0" />
+    <property name="clicks" type="XOBJ_DTYPE_INT" column="clicks" not-null="true" default="0" />
+    <property name="datestart" type="XOBJ_DTYPE_INT" column="datestart" not-null="true" default="0" />
+    <property name="dateend" type="XOBJ_DTYPE_INT" column="dateend" not-null="true" default="0" />
+    <many-to-one name="mClient" column="cid" class="Entity.bannerclient" />
+  </class>
+</cubson-mapping>
\ No newline at end of file
Index: xoops2jp/html/modules/legacyRender/.xml/data/banner.cbs.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/.xml/data/banner.cbs.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:39 2006
+++ xoops2jp/html/modules/legacyRender/.xml/data/banner.cbs.xml	Mon Apr 24 16:29:39 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cubson-mapping>
+  <class name="banner">
+    <id name="bid" type="XOBJ_DTYPE_INT" column="bid">
+      <generator type="increment" />
+    </id>
+    <property name="cid" type="XOBJ_DTYPE_INT" column="cid" not-null="true" default="0" />
+    <property name="imptotal" type="XOBJ_DTYPE_INT" column="imptotal" not-null="true" default="0" />
+    <property name="impmade" type="XOBJ_DTYPE_INT" column="impmade" not-null="true" default="0" />
+    <property name="clicks" type="XOBJ_DTYPE_INT" column="clicks" not-null="true" default="0" />
+    <property name="imageurl" type="XOBJ_DTYPE_STRING" column="imageurl" not-null="true" length="255" />
+    <property name="clickurl" type="XOBJ_DTYPE_STRING" column="clickurl" not-null="true" length="255" />
+    <property name="date" type="XOBJ_DTYPE_INT" column="date" not-null="true" default="0" />
+    <property name="htmlbanner" type="XOBJ_DTYPE_BOOL" column="htmlbanner" not-null="true" default="0" />
+    <property name="htmlcode" type="XOBJ_DTYPE_TEXT" column="htmlcode" not-null="true" />
+    <many-to-one name="mClient" column="cid" class="Entity.bannerclient" />
+  </class>
+</cubson-mapping>
\ No newline at end of file
Index: xoops2jp/html/modules/legacyRender/.xml/data/bannerclient.cbs.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/.xml/data/bannerclient.cbs.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:39 2006
+++ xoops2jp/html/modules/legacyRender/.xml/data/bannerclient.cbs.xml	Mon Apr 24 16:29:39 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cubson-mapping>
+  <class name="bannerclient">
+    <id name="cid" type="XOBJ_DTYPE_INT" column="cid">
+      <generator type="increment" />
+    </id>
+    <property name="name" type="XOBJ_DTYPE_STRING" column="name" not-null="true" length="60" />
+    <property name="contact" type="XOBJ_DTYPE_STRING" column="contact" not-null="true" length="60" />
+    <property name="email" type="XOBJ_DTYPE_STRING" column="email" not-null="true" length="60" />
+    <property name="login" type="XOBJ_DTYPE_STRING" column="login" not-null="true" length="10" />
+    <property name="passwd" type="XOBJ_DTYPE_STRING" column="passwd" not-null="true" length="10" />
+    <property name="extrainfo" type="XOBJ_DTYPE_TEXT" column="extrainfo" not-null="true" />
+    <set name="mBanners">
+      <key>
+        <column name="cid" />
+      </key>
+      <one-to-many class="Entity.banner" />
+    </set>
+    <set name="mFinishBanners">
+      <key>
+        <column name="cid" />
+      </key>
+      <one-to-many class="Entity.bannerfinish" />
+    </set>
+  </class>
+</cubson-mapping>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:29:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:29:58 +0900
Subject: [xoops-cvslog 2861] CVS update:
	xoops2jp/html/modules/legacyRender/admin/.xml
Message-ID: <20060424072958.A24B42AC14D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerclientAdminEditForm" type="XCube_ActionForm">
+		<form-property name="cid" type="Int" />
+		<form-property name="name" type="String" />
+		<form-property name="contact" type="String" />
+		<form-property name="email" type="String" />
+		<form-property name="login" type="String" />
+		<form-property name="passwd" type="String" />
+		<form-property name="extrainfo" type="Text" />
+	</form-bean>
+	<form-validation>
+		<field property="cid" depends="required,objectExsist">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
+			<var name="handler" value="bannerfinish" />
+		</field>
+		<field property="name" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_NAME" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="60" />
+		</field>
+		<field property="contact" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CONTACT" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="60" />
+		</field>
+		<field property="email" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_EMAIL" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="60" />
+		</field>
+		<field property="login" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_LOGIN" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="10" />
+		</field>
+		<field property="passwd" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_PASSWD" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="10" />
+		</field>
+		<field property="extrainfo" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_EXTRAINFO" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerAdminEditForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+		<form-property name="cid" type="Int" />
+		<form-property name="imptotal" type="Int" />
+		<form-property name="impmade" type="Int" />
+		<form-property name="clicks" type="Int" />
+		<form-property name="imageurl" type="String" />
+		<form-property name="clickurl" type="String" />
+		<form-property name="date" type="Int" />
+		<form-property name="htmlbanner" type="Bool" />
+		<form-property name="htmlcode" type="Text" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_BID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="cid" depends="required,objectExsist">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
+			<var name="handler" value="bannerclient" />
+		</field>
+		<field property="imptotal" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPTOTAL" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="impmade" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPMADE" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="clicks" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKS" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="imageurl" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_IMAGEURL" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="clickurl" depends="required,maxlength">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKURL" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="date" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_DATE" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="htmlcode" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_HTMLCODE" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/legacyRender/admin/.xml/banner_delete.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/banner_delete.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/banner_delete.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerAdminDeleteForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_BID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_delete.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_delete.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_delete.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerfinishAdminDeleteForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_BID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_delete.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_delete.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_delete.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerclientAdminDeleteForm" type="XCube_ActionForm">
+		<form-property name="cid" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="cid" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml:1.1.2.1
--- /dev/null	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml	Mon Apr 24 16:29:58 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="BannerfinishAdminEditForm" type="XCube_ActionForm">
+		<form-property name="bid" type="Int" />
+		<form-property name="cid" type="Int" />
+		<form-property name="impressions" type="Int" />
+		<form-property name="clicks" type="Int" />
+		<form-property name="datestart" type="Int" />
+		<form-property name="dateend" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="bid" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_BID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="cid" depends="required,objectExsist">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
+			<var name="handler" value="bannerclient" />
+		</field>
+		<field property="impressions" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPRESSIONS" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="clicks" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKS" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="datestart" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_DATESTART" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+		<field property="dateend" depends="required">
+			<arg0 key="const._AD_LEGACYRENDER_LANG_DATEEND" />
+			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:30:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:30:10 +0900
Subject: [xoops-cvslog 2862] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060424073010.CD83A2AC14F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php";
+
+class LegacyRender_BannerfinishEditAction extends LegacyRender_AbstractEditAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerfinish');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerfinishAdminEditForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerfinish_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBannerclient();
+		$render->setAttribute('object', $this->mObject);
+		
+		$bannerclientHandler =& xoops_getmodulehandler('bannerclient');
+		$bannerclientArr =& $bannerclientHandler->getObjects();
+		foreach (array_keys($bannerclientArr) as $key) {
+			$bannerclientArr[$key]->loadBanner();
+		}
+		$render->setAttribute('bannerclientArr', $bannerclientArr);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerfinishList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerfinishList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerEditAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerAdminEditForm.class.php";
+
+class LegacyRender_BannerEditAction extends LegacyRender_AbstractEditAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('banner');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerAdminEditForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("banner_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBannerclient();
+		$render->setAttribute('object', $this->mObject);
+		
+		$bannerclientHandler =& xoops_getmodulehandler('bannerclient');
+		$bannerclientArr =& $bannerclientHandler->getObjects();
+		foreach (array_keys($bannerclientArr) as $key) {
+			$bannerclientArr[$key]->loadBanner();
+		}
+		$render->setAttribute('bannerclientArr', $bannerclientArr);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishListAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishListAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishListAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,39 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerfinishFilterForm.class.php";
+
+class LegacyRender_BannerfinishListAction extends LegacyRender_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerfinish');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new LegacyRender_BannerfinishFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=BannerfinishList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerfinish_list.html");
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadBannerclient();
+		}
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientDeleteAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,47 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php";
+
+class LegacyRender_BannerclientDeleteAction extends LegacyRender_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['cid']) ? $_REQUEST['cid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerclient');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerclientAdminDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerclient_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBanner();
+		$this->mObject->loadBannerfinish();
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerclientList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishDeleteAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,46 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php";
+
+class LegacyRender_BannerfinishDeleteAction extends LegacyRender_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerfinish');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerfinishAdminDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerfinish_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBannerclient();
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerfinishList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerfinishList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,40 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerclientFilterForm.class.php";
+
+class LegacyRender_BannerclientListAction extends LegacyRender_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerclient');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new LegacyRender_BannerclientFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=BannerclientList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerclient_list.html");
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadBanner();
+			$this->mObjects[$key]->loadBannerfinish();
+		}
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientEditAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,47 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerclientAdminEditForm.class.php";
+
+class LegacyRender_BannerclientEditAction extends LegacyRender_AbstractEditAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['cid']) ? $_REQUEST['cid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('bannerclient');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerclientAdminEditForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("bannerclient_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBanner();
+		$this->mObject->loadBannerfinish();
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerclientList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerclientList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerListAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerListAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerListAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,39 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractListAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerFilterForm.class.php";
+
+class LegacyRender_BannerListAction extends LegacyRender_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('banner');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new LegacyRender_BannerFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=BannerList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("banner_list.html");
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadBannerclient();
+		}
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerDeleteAction.class.php	Mon Apr 24 16:30:10 2006
@@ -0,0 +1,46 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerAdminDeleteForm.class.php";
+
+class LegacyRender_BannerDeleteAction extends LegacyRender_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('banner');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new LegacyRender_BannerAdminDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("banner_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$this->mObject->loadBannerclient();
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=BannerList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=BannerList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>

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

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,79 @@
+<?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 LegacyRender_BannerfinishAdminEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerfinishAdminEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
+		$this->mFormProperties['impressions'] =& new XCube_IntProperty('impressions');
+		$this->mFormProperties['clicks'] =& new XCube_IntProperty('clicks');
+		$this->mFormProperties['datestart'] =& new XCube_IntProperty('datestart');
+		$this->mFormProperties['dateend'] =& new XCube_IntProperty('dateend');
+	
+		//
+		// 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);
+	
+		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['cid']->setDependsByArray(array('required','objectExsist'));
+		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addVar('handler', 'bannerclient');
+	
+		$this->mFieldProperties['impressions'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['impressions']->setDependsByArray(array('required'));
+		$this->mFieldProperties['impressions']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPRESSIONS);
+	
+		$this->mFieldProperties['clicks'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['clicks']->setDependsByArray(array('required'));
+		$this->mFieldProperties['clicks']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKS);
+	
+		$this->mFieldProperties['datestart'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['datestart']->setDependsByArray(array('required'));
+		$this->mFieldProperties['datestart']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATESTART);
+	
+		$this->mFieldProperties['dateend'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['dateend']->setDependsByArray(array('required'));
+		$this->mFieldProperties['dateend']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATEEND);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+		$this->set('cid', $obj->get('cid'));
+		$this->set('impressions', $obj->get('impressions'));
+		$this->set('clicks', $obj->get('clicks'));
+		$this->set('datestart', $obj->get('datestart'));
+		$this->set('dateend', $obj->get('dateend'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+		$obj->set('cid', $this->get('cid'));
+		$obj->set('impressions', $this->get('impressions'));
+		$obj->set('clicks', $this->get('clicks'));
+		$obj->set('datestart', $this->get('datestart'));
+		$obj->set('dateend', $this->get('dateend'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,72 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
+
+define('BANNERCLIENT_SORT_KEY_DEFAULT', 0);
+define('BANNERCLIENT_SORT_KEY_CID', 1);
+define('BANNERCLIENT_SORT_KEY_NAME', 2);
+define('BANNERCLIENT_SORT_KEY_CONTACT', 3);
+define('BANNERCLIENT_SORT_KEY_EMAIL', 4);
+define('BANNERCLIENT_SORT_KEY_LOGIN', 5);
+define('BANNERCLIENT_SORT_KEY_PASSWD', 6);
+define('BANNERCLIENT_SORT_KEY_EXTRAINFO', 7);
+define('BANNERCLIENT_SORT_KEY_MAXVALUE', 7);
+
+class LegacyRender_BannerclientFilterForm extends LegacyRender_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		BANNERCLIENT_SORT_KEY_DEFAULT => 'cid',
+		BANNERCLIENT_SORT_KEY_CID => 'cid',
+		BANNERCLIENT_SORT_KEY_NAME => 'name',
+		BANNERCLIENT_SORT_KEY_CONTACT => 'contact',
+		BANNERCLIENT_SORT_KEY_EMAIL => 'email',
+		BANNERCLIENT_SORT_KEY_LOGIN => 'login',
+		BANNERCLIENT_SORT_KEY_PASSWD => 'passwd',
+		BANNERCLIENT_SORT_KEY_EXTRAINFO => 'extrainfo'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > BANNERCLIENT_SORT_KEY_MAXVALUE) {
+			$this->mSort = BANNERCLIENT_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'))));
+		}
+	
+		if (isset($_REQUEST['name'])) {
+			$this->_mNavi->addExtra('name', xoops_getrequest('name'));
+			$this->_mCriteria->add(new Criteria('name', array(XOBJ_DTYPE_STRING, xoops_getrequest('name'))));
+		}
+	
+		if (isset($_REQUEST['contact'])) {
+			$this->_mNavi->addExtra('contact', xoops_getrequest('contact'));
+			$this->_mCriteria->add(new Criteria('contact', array(XOBJ_DTYPE_STRING, xoops_getrequest('contact'))));
+		}
+	
+		if (isset($_REQUEST['email'])) {
+			$this->_mNavi->addExtra('email', xoops_getrequest('email'));
+			$this->_mCriteria->add(new Criteria('email', array(XOBJ_DTYPE_STRING, xoops_getrequest('email'))));
+		}
+	
+		if (isset($_REQUEST['login'])) {
+			$this->_mNavi->addExtra('login', xoops_getrequest('login'));
+			$this->_mCriteria->add(new Criteria('login', array(XOBJ_DTYPE_STRING, xoops_getrequest('login'))));
+		}
+	
+		if (isset($_REQUEST['passwd'])) {
+			$this->_mNavi->addExtra('passwd', xoops_getrequest('passwd'));
+			$this->_mCriteria->add(new Criteria('passwd', array(XOBJ_DTYPE_STRING, xoops_getrequest('passwd'))));
+		}
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,70 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
+
+define('BANNERFINISH_SORT_KEY_DEFAULT', 0);
+define('BANNERFINISH_SORT_KEY_BID', 1);
+define('BANNERFINISH_SORT_KEY_CID', 2);
+define('BANNERFINISH_SORT_KEY_IMPRESSIONS', 3);
+define('BANNERFINISH_SORT_KEY_CLICKS', 4);
+define('BANNERFINISH_SORT_KEY_DATESTART', 5);
+define('BANNERFINISH_SORT_KEY_DATEEND', 6);
+define('BANNERFINISH_SORT_KEY_MAXVALUE', 6);
+
+class LegacyRender_BannerfinishFilterForm extends LegacyRender_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		BANNERFINISH_SORT_KEY_DEFAULT => 'bid',
+		BANNERFINISH_SORT_KEY_BID => 'bid',
+		BANNERFINISH_SORT_KEY_CID => 'cid',
+		BANNERFINISH_SORT_KEY_IMPRESSIONS => 'impressions',
+		BANNERFINISH_SORT_KEY_CLICKS => 'clicks',
+		BANNERFINISH_SORT_KEY_DATESTART => 'datestart',
+		BANNERFINISH_SORT_KEY_DATEEND => 'dateend'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > BANNERFINISH_SORT_KEY_MAXVALUE) {
+			$this->mSort = BANNERFINISH_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['bid'])) {
+			$this->_mNavi->addExtra('bid', xoops_getrequest('bid'));
+			$this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid'))));
+		}
+	
+		if (isset($_REQUEST['cid'])) {
+			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
+			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
+		}
+	
+		if (isset($_REQUEST['impressions'])) {
+			$this->_mNavi->addExtra('impressions', xoops_getrequest('impressions'));
+			$this->_mCriteria->add(new Criteria('impressions', array(XOBJ_DTYPE_INT, xoops_getrequest('impressions'))));
+		}
+	
+		if (isset($_REQUEST['clicks'])) {
+			$this->_mNavi->addExtra('clicks', xoops_getrequest('clicks'));
+			$this->_mCriteria->add(new Criteria('clicks', array(XOBJ_DTYPE_INT, xoops_getrequest('clicks'))));
+		}
+	
+		if (isset($_REQUEST['datestart'])) {
+			$this->_mNavi->addExtra('datestart', xoops_getrequest('datestart'));
+			$this->_mCriteria->add(new Criteria('datestart', array(XOBJ_DTYPE_INT, xoops_getrequest('datestart'))));
+		}
+	
+		if (isset($_REQUEST['dateend'])) {
+			$this->_mNavi->addExtra('dateend', xoops_getrequest('dateend'));
+			$this->_mCriteria->add(new Criteria('dateend', array(XOBJ_DTYPE_INT, xoops_getrequest('dateend'))));
+		}
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,96 @@
+<?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 LegacyRender_BannerclientAdminEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerclientAdminEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
+		$this->mFormProperties['name'] =& new XCube_StringProperty('name');
+		$this->mFormProperties['contact'] =& new XCube_StringProperty('contact');
+		$this->mFormProperties['email'] =& new XCube_StringProperty('email');
+		$this->mFormProperties['login'] =& new XCube_StringProperty('login');
+		$this->mFormProperties['passwd'] =& new XCube_StringProperty('passwd');
+		$this->mFormProperties['extrainfo'] =& new XCube_TextProperty('extrainfo');
+	
+		//
+		// Set field properties
+		//
+	
+		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['cid']->setDependsByArray(array('required','objectExsist'));
+		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addVar('handler', 'bannerfinish');
+	
+		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['name']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_NAME, '60');
+		$this->mFieldProperties['name']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_NAME, '60');
+		$this->mFieldProperties['name']->addVar('maxlength', '60');
+	
+		$this->mFieldProperties['contact'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['contact']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['contact']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CONTACT, '60');
+		$this->mFieldProperties['contact']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_CONTACT, '60');
+		$this->mFieldProperties['contact']->addVar('maxlength', '60');
+	
+		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['email']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_EMAIL, '60');
+		$this->mFieldProperties['email']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_EMAIL, '60');
+		$this->mFieldProperties['email']->addVar('maxlength', '60');
+	
+		$this->mFieldProperties['login'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['login']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['login']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_LOGIN, '10');
+		$this->mFieldProperties['login']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_LOGIN, '10');
+		$this->mFieldProperties['login']->addVar('maxlength', '10');
+	
+		$this->mFieldProperties['passwd'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['passwd']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['passwd']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_PASSWD, '10');
+		$this->mFieldProperties['passwd']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_PASSWD, '10');
+		$this->mFieldProperties['passwd']->addVar('maxlength', '10');
+	
+		$this->mFieldProperties['extrainfo'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['extrainfo']->setDependsByArray(array('required'));
+		$this->mFieldProperties['extrainfo']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_EXTRAINFO);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('cid', $obj->get('cid'));
+		$this->set('name', $obj->get('name'));
+		$this->set('contact', $obj->get('contact'));
+		$this->set('email', $obj->get('email'));
+		$this->set('login', $obj->get('login'));
+		$this->set('passwd', $obj->get('passwd'));
+		$this->set('extrainfo', $obj->get('extrainfo'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('cid', $this->get('cid'));
+		$obj->set('name', $this->get('name'));
+		$obj->set('contact', $this->get('contact'));
+		$obj->set('email', $this->get('email'));
+		$obj->set('login', $this->get('login'));
+		$obj->set('passwd', $this->get('passwd'));
+		$obj->set('extrainfo', $this->get('extrainfo'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminDeleteForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,42 @@
+<?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 LegacyRender_BannerAdminDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerAdminDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+	
+		//
+		// 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);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminDeleteForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,42 @@
+<?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 LegacyRender_BannerclientAdminDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerclientAdminDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
+	
+		//
+		// 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);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('cid', $obj->get('cid'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('cid', $this->get('cid'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,107 @@
+<?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 LegacyRender_BannerAdminEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerAdminEditForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
+		$this->mFormProperties['imptotal'] =& new XCube_IntProperty('imptotal');
+		$this->mFormProperties['impmade'] =& new XCube_IntProperty('impmade');
+		$this->mFormProperties['clicks'] =& new XCube_IntProperty('clicks');
+		$this->mFormProperties['imageurl'] =& new XCube_StringProperty('imageurl');
+		$this->mFormProperties['clickurl'] =& new XCube_StringProperty('clickurl');
+		$this->mFormProperties['date'] =& new XCube_IntProperty('date');
+		$this->mFormProperties['htmlbanner'] =& new XCube_BoolProperty('htmlbanner');
+		$this->mFormProperties['htmlcode'] =& new XCube_TextProperty('htmlcode');
+	
+		//
+		// 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);
+	
+		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['cid']->setDependsByArray(array('required','objectExsist'));
+		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
+		$this->mFieldProperties['cid']->addVar('handler', 'bannerclient');
+	
+		$this->mFieldProperties['imptotal'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['imptotal']->setDependsByArray(array('required'));
+		$this->mFieldProperties['imptotal']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPTOTAL);
+	
+		$this->mFieldProperties['impmade'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['impmade']->setDependsByArray(array('required'));
+		$this->mFieldProperties['impmade']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPMADE);
+	
+		$this->mFieldProperties['clicks'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['clicks']->setDependsByArray(array('required'));
+		$this->mFieldProperties['clicks']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKS);
+	
+		$this->mFieldProperties['imageurl'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['imageurl']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['imageurl']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMAGEURL, '255');
+		$this->mFieldProperties['imageurl']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_IMAGEURL, '255');
+		$this->mFieldProperties['imageurl']->addVar('maxlength', '255');
+	
+		$this->mFieldProperties['clickurl'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['clickurl']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['clickurl']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKURL, '255');
+		$this->mFieldProperties['clickurl']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_CLICKURL, '255');
+		$this->mFieldProperties['clickurl']->addVar('maxlength', '255');
+	
+		$this->mFieldProperties['date'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['date']->setDependsByArray(array('required'));
+		$this->mFieldProperties['date']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATE);
+	
+		$this->mFieldProperties['htmlcode'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['htmlcode']->setDependsByArray(array('required'));
+		$this->mFieldProperties['htmlcode']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_HTMLCODE);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+		$this->set('cid', $obj->get('cid'));
+		$this->set('imptotal', $obj->get('imptotal'));
+		$this->set('impmade', $obj->get('impmade'));
+		$this->set('clicks', $obj->get('clicks'));
+		$this->set('imageurl', $obj->get('imageurl'));
+		$this->set('clickurl', $obj->get('clickurl'));
+		$this->set('date', $obj->get('date'));
+		$this->set('htmlbanner', $obj->get('htmlbanner'));
+		$this->set('htmlcode', $obj->get('htmlcode'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+		$obj->set('cid', $this->get('cid'));
+		$obj->set('imptotal', $this->get('imptotal'));
+		$obj->set('impmade', $this->get('impmade'));
+		$obj->set('clicks', $this->get('clicks'));
+		$obj->set('imageurl', $this->get('imageurl'));
+		$obj->set('clickurl', $this->get('clickurl'));
+		$obj->set('date', $this->get('date'));
+		$obj->set('htmlbanner', $this->get('htmlbanner'));
+		$obj->set('htmlcode', $this->get('htmlcode'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminDeleteForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,42 @@
+<?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 LegacyRender_BannerfinishAdminDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.legacyRender.BannerfinishAdminDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
+	
+		//
+		// 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);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('bid', $obj->get('bid'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('bid', $this->get('bid'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php	Mon Apr 24 16:30:22 2006
@@ -0,0 +1,93 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
+
+define('BANNER_SORT_KEY_DEFAULT', 0);
+define('BANNER_SORT_KEY_BID', 1);
+define('BANNER_SORT_KEY_CID', 2);
+define('BANNER_SORT_KEY_IMPTOTAL', 3);
+define('BANNER_SORT_KEY_IMPMADE', 4);
+define('BANNER_SORT_KEY_CLICKS', 5);
+define('BANNER_SORT_KEY_IMAGEURL', 6);
+define('BANNER_SORT_KEY_CLICKURL', 7);
+define('BANNER_SORT_KEY_DATE', 8);
+define('BANNER_SORT_KEY_HTMLBANNER', 9);
+define('BANNER_SORT_KEY_HTMLCODE', 10);
+define('BANNER_SORT_KEY_MAXVALUE', 10);
+
+class LegacyRender_BannerFilterForm extends LegacyRender_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		BANNER_SORT_KEY_DEFAULT => 'bid',
+		BANNER_SORT_KEY_BID => 'bid',
+		BANNER_SORT_KEY_CID => 'cid',
+		BANNER_SORT_KEY_IMPTOTAL => 'imptotal',
+		BANNER_SORT_KEY_IMPMADE => 'impmade',
+		BANNER_SORT_KEY_CLICKS => 'clicks',
+		BANNER_SORT_KEY_IMAGEURL => 'imageurl',
+		BANNER_SORT_KEY_CLICKURL => 'clickurl',
+		BANNER_SORT_KEY_DATE => 'date',
+		BANNER_SORT_KEY_HTMLBANNER => 'htmlbanner',
+		BANNER_SORT_KEY_HTMLCODE => 'htmlcode'
+	);
+	var $_mCriteria = null;
+
+	function fetch()
+	{
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+	
+		if ($this->mSort > BANNER_SORT_KEY_MAXVALUE) {
+			$this->mSort = BANNER_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['bid'])) {
+			$this->_mNavi->addExtra('bid', xoops_getrequest('bid'));
+			$this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid'))));
+		}
+	
+		if (isset($_REQUEST['cid'])) {
+			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
+			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
+		}
+	
+		if (isset($_REQUEST['imptotal'])) {
+			$this->_mNavi->addExtra('imptotal', xoops_getrequest('imptotal'));
+			$this->_mCriteria->add(new Criteria('imptotal', array(XOBJ_DTYPE_INT, xoops_getrequest('imptotal'))));
+		}
+	
+		if (isset($_REQUEST['impmade'])) {
+			$this->_mNavi->addExtra('impmade', xoops_getrequest('impmade'));
+			$this->_mCriteria->add(new Criteria('impmade', array(XOBJ_DTYPE_INT, xoops_getrequest('impmade'))));
+		}
+	
+		if (isset($_REQUEST['clicks'])) {
+			$this->_mNavi->addExtra('clicks', xoops_getrequest('clicks'));
+			$this->_mCriteria->add(new Criteria('clicks', array(XOBJ_DTYPE_INT, xoops_getrequest('clicks'))));
+		}
+	
+		if (isset($_REQUEST['imageurl'])) {
+			$this->_mNavi->addExtra('imageurl', xoops_getrequest('imageurl'));
+			$this->_mCriteria->add(new Criteria('imageurl', array(XOBJ_DTYPE_STRING, xoops_getrequest('imageurl'))));
+		}
+	
+		if (isset($_REQUEST['clickurl'])) {
+			$this->_mNavi->addExtra('clickurl', xoops_getrequest('clickurl'));
+			$this->_mCriteria->add(new Criteria('clickurl', array(XOBJ_DTYPE_STRING, xoops_getrequest('clickurl'))));
+		}
+	
+		if (isset($_REQUEST['date'])) {
+			$this->_mNavi->addExtra('date', xoops_getrequest('date'));
+			$this->_mCriteria->add(new Criteria('date', array(XOBJ_DTYPE_INT, xoops_getrequest('date'))));
+		}
+	
+		if (isset($_REQUEST['htmlbanner'])) {
+			$this->_mNavi->addExtra('htmlbanner', xoops_getrequest('htmlbanner'));
+			$this->_mCriteria->add(new Criteria('htmlbanner', array(XOBJ_DTYPE_BOOL, xoops_getrequest('htmlbanner'))));
+		}
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:30:35 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:30:35 +0900
Subject: [xoops-cvslog 2864] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060424073035.98A8B2AC14F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,50 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerclientList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_DELETE}>
+</div>
+
+  <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_DELETE}></h3>
+
+<p><{$smarty.const._AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE}></p>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CONTACT}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('contact')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_EMAIL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('email')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('login')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('passwd')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('extrainfo')}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=BannerclientDelete" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=cid value=$actionForm->get('cid')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,62 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_DELETE}>
+</div>
+
+  <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_DELETE}></h3>
+
+<p><{$smarty.const._AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE}></p>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_BID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('imptotal')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('impmade')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clicks')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('imageurl')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clickurl')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('date')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('htmlbanner')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('htmlcode')}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=BannerDelete" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_edit.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,71 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerclientList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST}></a>
+  <{if $actionForm->get('cid')}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_EDIT}>
+  <{else}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_NEW}>
+  <{/if}>
+</div>
+
+  <{if $actionForm->get('cid')}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_EDIT}></h3>
+  <{else}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_NEW}></h3>
+  <{/if}>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=BannerclientEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=cid value=$actionForm->getVar('cid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_NAME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=60}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTACT}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=contact value=$actionForm->getVar('contact') size=15 maxlength=60}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_EMAIL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=email value=$actionForm->getVar('email') size=15 maxlength=60}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=login value=$actionForm->getVar('login') size=15 maxlength=10}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=passwd value=$actionForm->getVar('passwd') size=15 maxlength=10}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_dhtmltarea type=text name=extrainfo value=$actionForm->getVar('extrainfo')}>
+      </td>
+    </tr>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <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>
+</form>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,46 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerfinishList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_DELETE}>
+</div>
+
+  <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_DELETE}></h3>
+
+<p><{$smarty.const._AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE}></p>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_BID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('impressions')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('clicks')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('datestart')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATEEND}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('dateend')}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=BannerfinishDelete" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,68 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a>
+</div>
+
+<h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></h3>
+
+<div style="text-align:right;">
+  [ <a href="index.php?action=BannerclientList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST}></a> ]
+  [ <a href="index.php?action=BannerEdit"><{$smarty.const._AD_LEGACYRENDER_LANG_CREATE_NEW}></a> ]
+</div>
+<br/>
+
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_BID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLIENT_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_CID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_CID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_IMPTOTAL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_IMPTOTAL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_IMPMADE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_IMPMADE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_CLICKS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_CLICKS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_CLICKURL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_CLICKURL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_HTMLBANNER}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_HTMLBANNER}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_HTMLCODE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_HTMLCODE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=obj from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <td><{$obj->getVar('bid')}></td>
+      <td><{$obj->mClient->getVar('name')}></td>
+      <td><{$obj->getVar('imptotal')}></td>
+      <td><{$obj->getVar('impmade')}></td>
+      <td><{$obj->getVar('clicks')}></td>
+      <td><{$obj->getVar('imageurl')}></td>
+      <td><{$obj->getVar('clickurl')}></td>
+      <td><{$obj->get('date')|xoops_formattimestamp}></td>
+      <td><{$obj->getVar('htmlbanner')}></td>
+      <td><{$obj->getVar('htmlcode')}></td>
+      <td>
+        <a href="./index.php?action=BannerEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$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}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,97 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a>
+  <{if $actionForm->get('bid')}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_EDIT}>
+  <{else}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_NEW}>
+  <{/if}>
+</div>
+
+  <{if $actionForm->get('bid')}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_EDIT}></h3>
+  <{else}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_NEW}></h3>
+  <{/if}>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=BannerEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name="cid">
+          <{foreach item=child from=$bannerclientArr}>
+          	<{if $child->getVar('cid') == $actionForm->get('cid')}>
+          		<option value="<{$child->getVar('cid')}>" checked><{$child->getVar('name')}></option>
+          	<{else}>
+          		<option value="<{$child->getVar('cid')}>"><{$child->getVar('name')}></option>
+          	<{/if}>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=imptotal value=$actionForm->getVar('imptotal')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=impmade value=$actionForm->getVar('impmade')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=clicks value=$actionForm->getVar('clicks')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=imageurl value=$actionForm->getVar('imageurl') size=15 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=clickurl value=$actionForm->getVar('clickurl') size=15 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=date value=$actionForm->getVar('date')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=checkbox name=htmlbanner value=1 default=$actionForm->getVar('htmlbanner')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_dhtmltarea type=text name=htmlcode value=$actionForm->getVar('htmlcode')}>
+      </td>
+    </tr>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <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>
+</form>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,52 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerfinishList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
+</div>
+
+<h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></h3>
+
+<div style="text-align:right;">
+  [ <a href="index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a> ]
+  [ <a href="index.php?action=BannerfinishEdit"><{$smarty.const._AD_LEGACYRENDER_LANG_CREATE_NEW}></a> ]
+</div>
+<br/>
+
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_BID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_CID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_CID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_IMPRESSIONS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_IMPRESSIONS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_CLICKS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_CLICKS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_DATESTART}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_DATESTART}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATEEND}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_DATEEND}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_DATEEND}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=obj from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <td><{$obj->getVar('bid')}></td>
+      <td><{$obj->getVar('cid')}></td>
+      <td><{$obj->getVar('impressions')}></td>
+      <td><{$obj->getVar('clicks')}></td>
+      <td><{$obj->getVar('datestart')}></td>
+      <td><{$obj->getVar('dateend')}></td>
+      <td>
+        <a href="./index.php?action=BannerfinishEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=BannerfinishDelete&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,73 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerfinishList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
+  <{if $actionForm->get('bid')}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT}>
+  <{else}>
+    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_NEW}>
+  <{/if}>
+</div>
+
+  <{if $actionForm->get('bid')}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT}></h3>
+  <{else}>
+    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_NEW}></h3>
+  <{/if}>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=BannerfinishEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <select name="cid">
+          <{foreach item=child from=$bannerclientArr}>
+          	<{if $child->getVar('cid') == $actionForm->get('cid')}>
+          		<option value="<{$child->getVar('cid')}>" checked><{$child->getVar('name')}></option>
+          	<{else}>
+          		<option value="<{$child->getVar('cid')}>"><{$child->getVar('name')}></option>
+          	<{/if}>
+          <{/foreach}>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=impressions value=$actionForm->getVar('impressions')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=clicks value=$actionForm->getVar('clicks')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=datestart value=$actionForm->getVar('datestart')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATEEND}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=dateend value=$actionForm->getVar('dateend')}>
+      </td>
+    </tr>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <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>
+</form>
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html
diff -u /dev/null xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.1
--- /dev/null	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html	Mon Apr 24 16:30:35 2006
@@ -0,0 +1,59 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=BannerclientList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST}></a>
+</div>
+
+<h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST}></h3>
+
+<div style="text-align:right;">
+  [ <a href="index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a> ]
+  [ <a href="index.php?action=BannerfinishList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a> ]
+  [ <a href="index.php?action=BannerclientEdit"><{$smarty.const._AD_LEGACYRENDER_LANG_CREATE_NEW}></a> ]
+</div>
+<br/>
+
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_CID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_CID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_NAME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_NAME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_NAME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTACT}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_CONTACT}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_CONTACT}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_EMAIL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_EMAIL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_EMAIL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_LOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_LOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_PASSWD}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_PASSWD}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_EXTRAINFO}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_EXTRAINFO}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
+  </tr>
+  <{foreach item=obj from=$objects}>
+    <tr class="<{cycle values='odd,even'}>">
+      <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('passwd')}></td>
+      <td><{$obj->getVar('extrainfo')}></td>
+      <td>
+        <a href="./index.php?action=BannerList&amp;cid=<{$obj->get('cid')|escape}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a>
+        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->get('cid')|escape}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
+        <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->get('cid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <a href="./index.php?action=BannerclientDelete&amp;cid=<{$obj->get('cid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:30:55 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:30:55 +0900
Subject: [xoops-cvslog 2865] CVS update:
	xoops2jp/html/modules/legacyRender/admin
Message-ID: <20060424073055.598162AC14F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/menu.php
diff -u xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.3 xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.4
--- xoops2jp/html/modules/legacyRender/admin/menu.php:1.1.2.3	Sat Jan 14 02:33:27 2006
+++ xoops2jp/html/modules/legacyRender/admin/menu.php	Mon Apr 24 16:30:55 2006
@@ -10,4 +10,7 @@
 $adminmenu[3]['title']=_MI_LEGACYRENDER_ADMENU_TPLFILE_MANAGE;
 $adminmenu[3]['link']="admin/index.php?action=TplfileList";
 
-?>
\ No newline at end of file
+$adminmenu[4]['title']=_MI_LEGACYRENDER_ADMENU_BANNER_MANAGE;
+$adminmenu[4]['link']="admin/index.php?action=BannerList";
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:31:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:31:08 +0900
Subject: [xoops-cvslog 2866] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060424073108.6D7F72AC14F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,151 @@
+<?php
+
+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", 1);
+define ("LEGACYRENDER_FRAME_VIEW_SUCCESS", 2);
+define ("LEGACYRENDER_FRAME_VIEW_ERROR", 3);
+define ("LEGACYRENDER_FRAME_VIEW_INDEX", 4);
+define ("LEGACYRENDER_FRAME_VIEW_INPUT", 5);
+
+class LegacyRender_ActionFrame extends XCube_ActionStrategy
+{
+	var $mActionName = null;
+	var $mAction = null;
+	var $mAdminFlag = null;
+
+	function Legacy_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 = "LegacyRender_" . ucfirst($this->mActionName) . "Action";
+		$fileName = ucfirst($this->mActionName) . "Action";
+		if ($this->mAdminFlag) {
+			$fileName = XOOPS_MODULE_PATH . "/base/admin/actions/${fileName}.class.php";
+		}
+		else {
+			$fileName = XOOPS_MODULE_PATH . "/base/actions/${fileName}.class.php";
+		}
+	
+		if (!file_exists($fileName)) {
+			die();
+		}
+	
+		require_once $fileName;
+	
+		if (class_exists($className)) {
+			$this->mAction =& new $className($this->mAdminFlag);
+		}
+	
+		if (!is_object($this->mAction)) {
+			die();
+		}
+		
+		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser())) {
+			if ($this->mAdminFlag) {
+				$controller->executeForward(XOOPS_URL . "/admin.php");
+			}
+			else {
+				$controller->executeForward(XOOPS_URL);
+			}
+		}
+	
+		$this->mAction->prepare($controller, $controller->getXoopsUser());
+	
+		if (xoops_getenv("REQUEST_METHOD") == "POST") {
+			$viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
+		}
+		else {
+			$viewStatus = $this->mAction->getDefaultView($controller, $controller->getXoopsUser());
+		}
+	
+		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
+{
+	/**
+	 * @access private
+	 */
+	var $_mAdminFlag = false;
+	
+	function Legacy_Action($adminFlag = false)
+	{
+		$this->_mAdminFlag = $adminFlag;
+	}
+
+	function hasPerm(&$controller, &$xoopsUser)
+	{
+		return true;
+	}
+	
+	function prepare(&$controller, &$xoopsUser)
+	{
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		return LEGACY_FRAME_VIEW_NONE;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		return LEGACY_FRAME_VIEW_NONE;
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractEditAction.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,85 @@
+<?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 _setupActionForm()
+	{
+	}
+
+	function _setupObject()
+	{
+		$id = $this->_getId();
+		
+		$this->mObjectHandler = $this->_getHandler();
+		
+		$this->mObject =& $this->mObjectHandler->get($id);
+	
+		if ($this->mObject == null && $this->isEnableCreate()) {
+			$this->mObject =& $this->mObjectHandler->create();
+		}
+	}
+
+	function isEnableCreate()
+	{
+		return true;
+	}
+
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$this->_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;
+		}
+	
+		$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->_doExecute($this->mObject) ? LEGACYRENDER_FRAME_VIEW_SUCCESS
+		                                         : LEGACYRENDER_FRAME_VIEW_ERROR;
+	}
+
+	function _doExecute()
+	{
+		return $this->mObjectHandler->insert($this->mObject);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/PageNavigator.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,37 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_ROOT_PATH . "/class/XCube_PageNavigator.class.php";
+
+class LegacyRender_PageNavigator extends XCube_PageNavigator
+{
+	function getRenderSortUrl()
+	{
+		return parent::renderSortUrl('sort');
+	}
+
+	function renderHidden($sort = null)
+	{
+		if ($mask == null) {
+			$mask = array();
+		}
+		elseif (!is_array($mask)) {
+			$mask = array($mask);
+		}
+	
+		$ret = null;
+	
+		foreach ($this->mExtra as $key => $value) {
+		}
+	
+		if (!isset($mask[$key])) {
+			$value = htmlspecialchars($value, ENT_QUOTES);
+			$ret .= "<input type=\"hidden\" name=\"${key}\" value=\"${value}\" />";
+		}
+	
+		return $ret;
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/AbstractDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/AbstractDeleteAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractDeleteAction.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,20 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
+
+class LegacyRender_AbstractDeleteAction extends LegacyRender_AbstractEditAction
+{
+	function isEnableCreate()
+	{
+		return false;
+	}
+
+	function _doExecute()
+	{
+		return $this->mObjectHandler->delete($this->mObject);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/banner.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/banner.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,41 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class LegacyRenderBannerObject extends XoopsSimpleObject
+{
+	var $mClient = null;
+	var $_mClientLoadedFlag = false;
+
+	function LegacyRenderBannerObject()
+	{
+		$this->initVar('bid', XOBJ_DTYPE_INT, '', false);
+		$this->initVar('cid', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('imptotal', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('impmade', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('clicks', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('imageurl', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('clickurl', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('date', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('htmlbanner', XOBJ_DTYPE_BOOL, '0', true);
+		$this->initVar('htmlcode', XOBJ_DTYPE_TEXT, '', true);
+	}
+
+	function loadBannerclient()
+	{
+		if ($this->_mClientLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('bannerclient');
+			$this->mClient =& $handler->get($this->get('cid'));
+			$this->_mClientLoadedFlag = true;
+		}
+	}
+}
+
+class LegacyRenderBannerHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "banner";
+	var $mPrimary = "bid";
+	var $mClass = "LegacyRenderBannerObject";
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractFilterForm.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class LegacyRender_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array();
+	var $_mCriteria = null;
+	var $_mNavi = null;
+
+	function LegacyRender_AbstractFilterForm(&$navi)
+	{
+		$this->_mNavi =& $navi;
+		$this->_mCriteria =& new CriteriaCompo();
+	}
+
+	function fetch()
+	{
+	}
+
+	function getSort()
+	{
+		$sortkey = abs($this->mSort);
+		return isset($this->_mSortKeys[$sortkey]) ? $this->_mSortKeys[$sortkey] : null;
+	}
+
+	function getOrder()
+	{
+		return ($this->mSort < 0) ? "DESC" : "ASC";
+	}
+
+	function getCriteria($start = 0, $limit = 0)
+	{
+		$criteria = $this->_mCriteria;
+		
+		$criteria->setStart($start);
+		$criteria->setLimit($limit);
+		
+		return $criteria;
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/bannerclient.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/bannerclient.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,78 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class LegacyRenderBannerclientObject extends XoopsSimpleObject
+{
+	var $mBanners = array();
+	var $_mBannersLoadedFlag = false;
+	var $mFinishBanners = array();
+	var $_mFinishBannersLoadedFlag = false;
+
+	function LegacyRenderBannerclientObject()
+	{
+		$this->initVar('cid', XOBJ_DTYPE_INT, '', false);
+		$this->initVar('name', XOBJ_DTYPE_STRING, '', true, 60);
+		$this->initVar('contact', XOBJ_DTYPE_STRING, '', true, 60);
+		$this->initVar('email', XOBJ_DTYPE_STRING, '', true, 60);
+		$this->initVar('login', XOBJ_DTYPE_STRING, '', true, 10);
+		$this->initVar('passwd', XOBJ_DTYPE_STRING, '', true, 10);
+		$this->initVar('extrainfo', XOBJ_DTYPE_TEXT, '', true);
+	}
+
+	function loadBanner()
+	{
+		if ($this->_mBannersLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('banner');
+			$this->mBanners =& $handler->getObjects(new Criteria('cid', $this->get('cid')));
+			$this->_mBannersLoadedFlag = true;
+		}
+	}
+
+	function &createBanner()
+	{
+		$handler =& xoops_getmodulehandler('banner');
+		$obj =& $handler->create();
+		$obj->set('cid', $this->get('cid'));
+		return $obj;
+	}
+
+	function loadBannerfinish()
+	{
+		if ($this->_mFinishBannersLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('bannerfinish');
+			$this->mFinishBanners =& $handler->getObjects(new Criteria('cid', $this->get('cid')));
+			$this->_mFinishBannersLoadedFlag = true;
+		}
+	}
+
+	function &createBannerfinish()
+	{
+		$handler =& xoops_getmodulehandler('bannerfinish');
+		$obj =& $handler->create();
+		$obj->set('cid', $this->get('cid'));
+		return $obj;
+	}
+}
+
+class LegacyRenderBannerclientHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "bannerclient";
+	var $mPrimary = "cid";
+	var $mClass = "LegacyRenderBannerclientObject";
+
+	function delete(&$obj)
+	{
+		$handler =& xoops_getmodulehandler('banner');
+		$handler->deleteAll(new Criteria('cid', $obj->get('cid')));
+		unset($handler);
+	
+		$handler =& xoops_getmodulehandler('bannerfinish');
+		$handler->deleteAll(new Criteria('cid', $obj->get('cid')));
+		unset($handler);
+	
+		return parent::delete($obj);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/AbstractListAction.class.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,45 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/legacyRender/class/PageNavigator.class.php";
+
+class LegacyRender_AbstractListAction extends LegacyRender_Action
+{
+	var $mObjects = array();
+	var $mFilter = null;
+	var $mNavi = null;
+
+	function &_getHandler()
+	{
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+	}
+
+	function _getBaseUrl()
+	{
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		$this->mNavi =& new LegacyRender_PageNavigator($this->_getBaseUrl(), 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
+		
+		$this->mFilter =& $this->_getFilterForm($this->mNavi);
+		$this->mFilter->fetch();
+		$handler =& $this->_getHandler();
+		
+		$total = $handler->getCount($this->mFilter->getCriteria());
+		
+		$this->mNavi->setTotal($total);
+		$this->mNavi->fetch();
+		
+		$criteria = $this->mFilter->getCriteria($this->mNavi->getStart(), $this->mNavi->getPerpage());
+		$this->mObjects =& $handler->getObjects($criteria);
+		
+		return LEGACYRENDER_FRAME_VIEW_INDEX;
+	}
+}
+
+?>
Index: xoops2jp/html/modules/legacyRender/class/bannerfinish.php
diff -u /dev/null xoops2jp/html/modules/legacyRender/class/bannerfinish.php:1.1.2.1
--- /dev/null	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/bannerfinish.php	Mon Apr 24 16:31:08 2006
@@ -0,0 +1,37 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+class LegacyRenderBannerfinishObject extends XoopsSimpleObject
+{
+	var $mClient = null;
+	var $_mClientLoadedFlag = false;
+
+	function LegacyRenderBannerfinishObject()
+	{
+		$this->initVar('bid', XOBJ_DTYPE_INT, '', false);
+		$this->initVar('cid', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('impressions', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('clicks', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('datestart', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('dateend', XOBJ_DTYPE_INT, '0', true);
+	}
+
+	function loadBannerclient()
+	{
+		if ($this->_mClientLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('bannerclient');
+			$this->mClient =& $handler->get($this->get('cid'));
+			$this->_mClientLoadedFlag = true;
+		}
+	}
+}
+
+class LegacyRenderBannerfinishHandler extends XoopsObjectGenericHandler
+{
+	var $mTable = "bannerfinish";
+	var $mPrimary = "bid";
+	var $mClass = "LegacyRenderBannerfinishObject";
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:31:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:31:33 +0900
Subject: [xoops-cvslog 2867] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060424073133.4AFEA2AC14F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/english/modinfo.php
diff -u xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.7 xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.8
--- xoops2jp/html/modules/legacyRender/language/english/modinfo.php:1.1.2.7	Fri Mar 24 22:05:45 2006
+++ xoops2jp/html/modules/legacyRender/language/english/modinfo.php	Mon Apr 24 16:31:33 2006
@@ -1,10 +1,20 @@
 <?php
 
+define('_MI_LEGACYRENDER_ADMENU_BANNER_MANAGE', "Banner manage");
+define('_MI_LEGACYRENDER_ADMENU_BANNERCLIENT_MANAGE', "BannerClient Manage");
 define('_MI_LEGACYRENDER_ADMENU_HELP', "Help");
 define('_MI_LEGACYRENDER_ADMENU_TEMPLATE_MANAGE', "Template management");
 define('_MI_LEGACYRENDER_ADMENU_THEME_SETTING', "Theme settings");
 define('_MI_LEGACYRENDER_ADMENU_TPLFILE_MANAGE', "Template file management");
+define('_MI_LEGACYRENDER_BLOCK_THEME_DESC', "Shows theme selection box");
+define('_MI_LEGACYRENDER_BLOCK_THEME_NAME', "Themes");
 define('_MI_LEGACYRENDER_KEYWORD_ADD', "Add");
+define('_MI_LEGACYRENDER_KEYWORD_BANNER_CREATE', "Banner create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNER_LIST', "Banner list");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERCLIENT_CREATE', "Bannerclient create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERCLIENT_LIST', "Bannerclient list");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERFINISH_CREATE', "Bannerfinish create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERFINISH_LIST', "Bannerfinish list");
 define('_MI_LEGACYRENDER_KEYWORD_DELETE', "Delete");
 define('_MI_LEGACYRENDER_KEYWORD_DOWNLOAD', "Download");
 define('_MI_LEGACYRENDER_KEYWORD_INSTALL', "Install");
@@ -12,10 +22,13 @@
 define('_MI_LEGACYRENDER_KEYWORD_THEME', "Theme");
 define('_MI_LEGACYRENDER_KEYWORD_UNINSTALL', "Uninstall");
 define('_MI_LEGACYRENDER_KEYWORD_UPLOAD', "Upload");
+define('_MI_LEGACYRENDER_LANG_BANNER_CREATE', "Banner create");
+define('_MI_LEGACYRENDER_LANG_BANNER_LIST', "Banner list");
+define('_MI_LEGACYRENDER_LANG_BANNERCLIENT_CREATE', "Bannerclient create");
+define('_MI_LEGACYRENDER_LANG_BANNERCLIENT_LIST', "Bannerclient list");
+define('_MI_LEGACYRENDER_LANG_BANNERFINISH_CREATE', "Bannerfinish create");
+define('_MI_LEGACYRENDER_LANG_BANNERFINISH_LIST', "Bannerfinish list");
 define('_MI_LEGACYRENDER_NAME', "Legacy renderer");
 define('_MI_LEGACYRENDER_NAME_DESC', "This rendering engine (renderer) has compatibility with XOOPS 2.0.9 and XOOPS JP 2.0.x. You can use XOOPS2 Theme on this system.");
 
-define('_MI_LEGACYRENDER_BLOCK_THEME_NAME', "Themes");
-define('_MI_LEGACYRENDER_BLOCK_THEME_DESC', "Shows theme selection box");
-
 ?>
Index: xoops2jp/html/modules/legacyRender/language/english/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.13 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.14
--- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.13	Sat Feb  4 13:26:46 2006
+++ xoops2jp/html/modules/legacyRender/language/english/admin.php	Mon Apr 24 16:31:33 2006
@@ -2,25 +2,60 @@
 
 define('_AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED', "Database update failed.");
 define('_AD_LEGACYRENDER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
+define('_AD_LEGACYRENDER_ERROR_OBJECT_EXIST', "object exist");
 define('_AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST', "Specified object does not exist.");
 define('_AD_LEGACYRENDER_ERROR_REQUIRED', "{0} is required.");
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NAME_RULE', "You have to name template set with a-z, 0-9 and under-score (_).");
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NO_EXIST', "Specified template set does not exist.");
 define('_AD_LEGACYRENDER_ERROR_UNIQUE_NAME', "Input unique name");
 define('_AD_LEGACYRENDER_LANG_AUTHOR', "Author");
+define('_AD_LEGACYRENDER_LANG_BANNER_DELETE', "Banner delete");
+define('_AD_LEGACYRENDER_LANG_BANNER_EDIT', "Banner edit");
+define('_AD_LEGACYRENDER_LANG_BANNER_LIST', "Banner list");
+define('_AD_LEGACYRENDER_LANG_BANNER_NEW', "Banner new");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_DELETE', "Bannerclient delete");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_EDIT', "Bannerclient edit");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST', "Bannerclient list");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_NEW', "Bannerclient new");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_DELETE', "Bannerfinish delete");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT', "Bannerfinish edit");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_LIST', "Bannerfinish list");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_NEW', "Bannerfinish new");
+define('_AD_LEGACYRENDER_LANG_BID', "bid");
+define('_AD_LEGACYRENDER_LANG_CID', "cid");
+define('_AD_LEGACYRENDER_LANG_CLICKS', "clicks");
+define('_AD_LEGACYRENDER_LANG_CLICKURL', "clickurl");
+define('_AD_LEGACYRENDER_LANG_CLIENT_NAME', "Client name");
+define('_AD_LEGACYRENDER_LANG_CONTACT', "contact");
 define('_AD_LEGACYRENDER_LANG_CONTROL', "Control");
+define('_AD_LEGACYRENDER_LANG_CREATE_NEW', "create new");
+define('_AD_LEGACYRENDER_LANG_DATE', "date");
+define('_AD_LEGACYRENDER_LANG_DATEEND', "dateend");
+define('_AD_LEGACYRENDER_LANG_DATESTART', "datestart");
+define('_AD_LEGACYRENDER_LANG_EMAIL', "email");
+define('_AD_LEGACYRENDER_LANG_EXTRAINFO', "extrainfo");
+define('_AD_LEGACYRENDER_LANG_FINISHBANNER_LIST', "Finishbanner list");
 define('_AD_LEGACYRENDER_LANG_GET_ADDRESS', "Get the lastest version here.");
 define('_AD_LEGACYRENDER_LANG_GET_THEME', "Get additional themes");
 define('_AD_LEGACYRENDER_LANG_GETTING_START', "Getting started");
 define('_AD_LEGACYRENDER_LANG_HELP', "Help");
+define('_AD_LEGACYRENDER_LANG_HTMLBANNER', "htmlbanner");
+define('_AD_LEGACYRENDER_LANG_HTMLCODE', "htmlcode");
+define('_AD_LEGACYRENDER_LANG_IMAGEURL', "imageurl");
+define('_AD_LEGACYRENDER_LANG_IMPMADE', "impmade");
+define('_AD_LEGACYRENDER_LANG_IMPRESSIONS', "impressions");
+define('_AD_LEGACYRENDER_LANG_IMPTOTAL', "imptotal");
 define('_AD_LEGACYRENDER_LANG_INFORMATION', "Information");
 define('_AD_LEGACYRENDER_LANG_INSTALL', "Install");
 define('_AD_LEGACYRENDER_LANG_LICENCE', "Licence");
+define('_AD_LEGACYRENDER_LANG_LOGIN', "login");
 define('_AD_LEGACYRENDER_LANG_MANIFESTO', "Manifesto");
 define('_AD_LEGACYRENDER_LANG_MORE', "more");
 define('_AD_LEGACYRENDER_LANG_MORE_LARGE', "more large");
 define('_AD_LEGACYRENDER_LANG_MORE_SMALL', "more small");
+define('_AD_LEGACYRENDER_LANG_NAME', "name");
 define('_AD_LEGACYRENDER_LANG_PACKAGE', "Package");
+define('_AD_LEGACYRENDER_LANG_PASSWD', "passwd");
 define('_AD_LEGACYRENDER_LANG_RECENT_MODIFY_FILES', "Recently modified files");
 define('_AD_LEGACYRENDER_LANG_SEARCH_TEMPLATE', "Search templates");
 define('_AD_LEGACYRENDER_LANG_SELECT', "Select a theme");
@@ -60,6 +95,7 @@
 define('_AD_LEGACYRENDER_LANG_VIEW', "View");
 define('_AD_LEGACYRENDER_LANG_W3C', "W3C");
 define('_AD_LEGACYRENDER_LANGE_TEMPLATE_MANAGE', "Template management");
+define('_AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE', "confirm delete");
 define('_AD_LEGACYRENDER_MESSAGE_NO_MANIFESTO', "No manifesto");
 define('_AD_LEGACYRENDER_MESSAGE_NO_PACKAGE', "No package information");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1', "When you need to edit the template, make a copy of default template set, and customize your site with modifying templates. To learn more details, read the help.");

From minahito ＠ users.sourceforge.jp  Mon Apr 24 16:31:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 16:31:33 +0900
Subject: [xoops-cvslog 2868] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060424073133.7FA442AC150@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.6 xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.7
--- xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php:1.1.2.6	Fri Mar 24 22:05:45 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/modinfo.php	Mon Apr 24 16:31:33 2006
@@ -1,10 +1,20 @@
 <?php
 
+define('_MI_LEGACYRENDER_ADMENU_BANNER_MANAGE', "バナー管理");
+define('_MI_LEGACYRENDER_ADMENU_BANNERCLIENT_MANAGE', "BannerClient Manage");
 define('_MI_LEGACYRENDER_ADMENU_HELP', "ヘルプ");
 define('_MI_LEGACYRENDER_ADMENU_TEMPLATE_MANAGE', "テンプレート管理");
 define('_MI_LEGACYRENDER_ADMENU_THEME_SETTING', "テーマの設定");
 define('_MI_LEGACYRENDER_ADMENU_TPLFILE_MANAGE', "テンプレートファイル管理");
+define('_MI_LEGACYRENDER_BLOCK_THEME_DESC', "テーマ選択フォームを表示します");
+define('_MI_LEGACYRENDER_BLOCK_THEME_NAME', "テーマ選択");
 define('_MI_LEGACYRENDER_KEYWORD_ADD', "追加");
+define('_MI_LEGACYRENDER_KEYWORD_BANNER_CREATE', "Banner create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNER_LIST', "Banner list");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERCLIENT_CREATE', "Bannerclient create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERCLIENT_LIST', "Bannerclient list");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERFINISH_CREATE', "Bannerfinish create");
+define('_MI_LEGACYRENDER_KEYWORD_BANNERFINISH_LIST', "Bannerfinish list");
 define('_MI_LEGACYRENDER_KEYWORD_DELETE', "削除");
 define('_MI_LEGACYRENDER_KEYWORD_DOWNLOAD', "ダウンロード");
 define('_MI_LEGACYRENDER_KEYWORD_INSTALL', "インストール");
@@ -12,10 +22,13 @@
 define('_MI_LEGACYRENDER_KEYWORD_THEME', "テーマ");
 define('_MI_LEGACYRENDER_KEYWORD_UNINSTALL', "アンインストール");
 define('_MI_LEGACYRENDER_KEYWORD_UPLOAD', "アップロード");
+define('_MI_LEGACYRENDER_LANG_BANNER_CREATE', "Banner create");
+define('_MI_LEGACYRENDER_LANG_BANNER_LIST', "Banner list");
+define('_MI_LEGACYRENDER_LANG_BANNERCLIENT_CREATE', "Bannerclient create");
+define('_MI_LEGACYRENDER_LANG_BANNERCLIENT_LIST', "Bannerclient list");
+define('_MI_LEGACYRENDER_LANG_BANNERFINISH_CREATE', "Bannerfinish create");
+define('_MI_LEGACYRENDER_LANG_BANNERFINISH_LIST', "Bannerfinish list");
 define('_MI_LEGACYRENDER_NAME', "互換レンダーシステム");
 define('_MI_LEGACYRENDER_NAME_DESC', "XOOPS 2.0.9/XOOPS JP 2.0.x のテーマエンジンと互換性のあるレンダーシステムです。XOOPS2テーマを使用可能です。");
 
-define('_MI_LEGACYRENDER_BLOCK_THEME_NAME', "テーマ選択");
-define('_MI_LEGACYRENDER_BLOCK_THEME_DESC', "テーマ選択フォームを表示します");
-
 ?>
Index: xoops2jp/html/modules/legacyRender/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.14 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.15
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.14	Sat Feb  4 13:26:46 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php	Mon Apr 24 16:31:33 2006
@@ -2,24 +2,59 @@
 
 define('_AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
 define('_AD_LEGACYRENDER_ERROR_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
+define('_AD_LEGACYRENDER_ERROR_OBJECT_EXIST', "object exist");
 define('_AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST', "指定オブジェクトが存在しません");
 define('_AD_LEGACYRENDER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NAME_RULE', "テンプレートセットの名称は半角英数字およびアンダースコア(_)の組み合わせを使用してください");
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NO_EXIST', "指定されたテンプレートセットは存在しません");
 define('_AD_LEGACYRENDER_ERROR_UNIQUE_NAME', "他のテンプレートセットと重複しない名前を指定してください");
 define('_AD_LEGACYRENDER_LANG_AUTHOR', "作成者");
+define('_AD_LEGACYRENDER_LANG_BANNER_DELETE', "バナーの削除");
+define('_AD_LEGACYRENDER_LANG_BANNER_EDIT', "バナーの編集");
+define('_AD_LEGACYRENDER_LANG_BANNER_LIST', "バナーの一覧");
+define('_AD_LEGACYRENDER_LANG_BANNER_NEW', "バナーの新規作成");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_DELETE', "バナークライアントの削除");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_EDIT', "バナークライアントの編集");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_LIST', "バナークライアントの一覧");
+define('_AD_LEGACYRENDER_LANG_BANNERCLIENT_NEW', "バナークライアントの新規作成");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_DELETE', "終了したバナーの削除");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT', "掲載終了バナーの編集");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_LIST', "掲載終了バナーの一覧");
+define('_AD_LEGACYRENDER_LANG_BANNERFINISH_NEW', "掲載終了バナーの新規作成");
+define('_AD_LEGACYRENDER_LANG_BID', "バナーID");
+define('_AD_LEGACYRENDER_LANG_CID', "クライアントID");
+define('_AD_LEGACYRENDER_LANG_CLICKS', "クリック数");
+define('_AD_LEGACYRENDER_LANG_CLICKURL', "クリック先URL");
+define('_AD_LEGACYRENDER_LANG_CLIENT_NAME', "クライアント名");
+define('_AD_LEGACYRENDER_LANG_CONTACT', "担当者名");
 define('_AD_LEGACYRENDER_LANG_CONTROL', "コントロール");
+define('_AD_LEGACYRENDER_LANG_CREATE_NEW', "新規作成");
+define('_AD_LEGACYRENDER_LANG_DATE', "登録日");
+define('_AD_LEGACYRENDER_LANG_DATEEND', "終了日");
+define('_AD_LEGACYRENDER_LANG_DATESTART', "開始日");
+define('_AD_LEGACYRENDER_LANG_EMAIL', "担当者Email");
+define('_AD_LEGACYRENDER_LANG_EXTRAINFO', "その他");
+define('_AD_LEGACYRENDER_LANG_FINISHBANNER_LIST', "掲載終了バナーの一覧");
 define('_AD_LEGACYRENDER_LANG_GET_ADDRESS', "最新版の入手先");
 define('_AD_LEGACYRENDER_LANG_GET_THEME', "追加テーマの入手");
 define('_AD_LEGACYRENDER_LANG_GETTING_START', "まずはじめに");
 define('_AD_LEGACYRENDER_LANG_HELP', "ヘルプ");
+define('_AD_LEGACYRENDER_LANG_HTMLBANNER', "HTMLを使用");
+define('_AD_LEGACYRENDER_LANG_HTMLCODE', "HTMLコード");
+define('_AD_LEGACYRENDER_LANG_IMAGEURL', "画像URL");
+define('_AD_LEGACYRENDER_LANG_IMPMADE', "インプレッション数");
+define('_AD_LEGACYRENDER_LANG_IMPRESSIONS', "インプレッション数");
+define('_AD_LEGACYRENDER_LANG_IMPTOTAL', "残りインプレッション数");
 define('_AD_LEGACYRENDER_LANG_INFORMATION', "インフォメーション");
 define('_AD_LEGACYRENDER_LANG_INSTALL', "インストール");
 define('_AD_LEGACYRENDER_LANG_LICENCE', "ライセンス");
+define('_AD_LEGACYRENDER_LANG_LOGIN', "ログイン名");
 define('_AD_LEGACYRENDER_LANG_MORE', "もっと");
 define('_AD_LEGACYRENDER_LANG_MORE_LARGE', "大きく");
 define('_AD_LEGACYRENDER_LANG_MORE_SMALL', "小さく");
+define('_AD_LEGACYRENDER_LANG_NAME', "クライアント名");
 define('_AD_LEGACYRENDER_LANG_PACKAGE', "パッケージ");
+define('_AD_LEGACYRENDER_LANG_PASSWD', "パスワード");
 define('_AD_LEGACYRENDER_LANG_RECENT_MODIFY_FILES', "最近編集したファイル");
 define('_AD_LEGACYRENDER_LANG_SEARCH_TEMPLATE', "テンプレート検索");
 define('_AD_LEGACYRENDER_LANG_SELECT', "テーマ選択");
@@ -59,6 +94,7 @@
 define('_AD_LEGACYRENDER_LANG_VIEW', "閲覧");
 define('_AD_LEGACYRENDER_LANG_W3C', "W3C");
 define('_AD_LEGACYRENDER_LANGE_TEMPLATE_MANAGE', "テンプレート管理");
+define('_AD_LEGACYRENDER_MESSAGE_CONFIRM_DELETE', "以下のデータを本当に削除しますか？");
 define('_AD_LEGACYRENDER_MESSAGE_NO_PACKAGE', "パッケージ情報なし");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_1', "まず、デフォルトのテンプレートセットの複製を作成し、テンプレートを変更してサイトをカスタマイズしましょう。詳しくはヘルプをご覧ください。");
 define('_AD_LEGACYRENDER_TIPS_TEMPLATE_MANAGE_2', "サイトに適用するテンプレートセットを変更しますか？　選択ボタンを押して、テンプレートセットを選びましょう。詳しくはヘルプをご覧ください。");

From minahito ＠ users.sourceforge.jp  Mon Apr 24 19:40:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 19:40:06 +0900
Subject: [xoops-cvslog 2869] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060424104006.E6F582AC133@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.1 xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php	Mon Apr 24 19:40:06 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
 
-define('BANNER_SORT_KEY_DEFAULT', 0);
 define('BANNER_SORT_KEY_BID', 1);
 define('BANNER_SORT_KEY_CID', 2);
 define('BANNER_SORT_KEY_IMPTOTAL', 3);
@@ -17,11 +16,12 @@
 define('BANNER_SORT_KEY_HTMLCODE', 10);
 define('BANNER_SORT_KEY_MAXVALUE', 10);
 
+define('BANNER_SORT_KEY_DEFAULT', BANNER_SORT_KEY_BID);
+
 class LegacyRender_BannerFilterForm extends LegacyRender_AbstractFilterForm
 {
 	var $mSort = 0;
 	var $mSortKeys = array(
-		BANNER_SORT_KEY_DEFAULT => 'bid',
 		BANNER_SORT_KEY_BID => 'bid',
 		BANNER_SORT_KEY_CID => 'cid',
 		BANNER_SORT_KEY_IMPTOTAL => 'imptotal',
@@ -37,52 +37,17 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNER_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > BANNER_SORT_KEY_MAXVALUE) {
 			$this->mSort = BANNER_SORT_KEY_DEFAULT;
 		}
 	
-		if (isset($_REQUEST['bid'])) {
-			$this->_mNavi->addExtra('bid', xoops_getrequest('bid'));
-			$this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid'))));
-		}
-	
 		if (isset($_REQUEST['cid'])) {
 			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
 			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
 		}
 	
-		if (isset($_REQUEST['imptotal'])) {
-			$this->_mNavi->addExtra('imptotal', xoops_getrequest('imptotal'));
-			$this->_mCriteria->add(new Criteria('imptotal', array(XOBJ_DTYPE_INT, xoops_getrequest('imptotal'))));
-		}
-	
-		if (isset($_REQUEST['impmade'])) {
-			$this->_mNavi->addExtra('impmade', xoops_getrequest('impmade'));
-			$this->_mCriteria->add(new Criteria('impmade', array(XOBJ_DTYPE_INT, xoops_getrequest('impmade'))));
-		}
-	
-		if (isset($_REQUEST['clicks'])) {
-			$this->_mNavi->addExtra('clicks', xoops_getrequest('clicks'));
-			$this->_mCriteria->add(new Criteria('clicks', array(XOBJ_DTYPE_INT, xoops_getrequest('clicks'))));
-		}
-	
-		if (isset($_REQUEST['imageurl'])) {
-			$this->_mNavi->addExtra('imageurl', xoops_getrequest('imageurl'));
-			$this->_mCriteria->add(new Criteria('imageurl', array(XOBJ_DTYPE_STRING, xoops_getrequest('imageurl'))));
-		}
-	
-		if (isset($_REQUEST['clickurl'])) {
-			$this->_mNavi->addExtra('clickurl', xoops_getrequest('clickurl'));
-			$this->_mCriteria->add(new Criteria('clickurl', array(XOBJ_DTYPE_STRING, xoops_getrequest('clickurl'))));
-		}
-	
-		if (isset($_REQUEST['date'])) {
-			$this->_mNavi->addExtra('date', xoops_getrequest('date'));
-			$this->_mCriteria->add(new Criteria('date', array(XOBJ_DTYPE_INT, xoops_getrequest('date'))));
-		}
-	
 		if (isset($_REQUEST['htmlbanner'])) {
 			$this->_mNavi->addExtra('htmlbanner', xoops_getrequest('htmlbanner'));
 			$this->_mCriteria->add(new Criteria('htmlbanner', array(XOBJ_DTYPE_BOOL, xoops_getrequest('htmlbanner'))));

From minahito ＠ users.sourceforge.jp  Mon Apr 24 19:40:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 19:40:39 +0900
Subject: [xoops-cvslog 2870] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060424104039.91FF82AC133@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.1 xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html	Mon Apr 24 19:40:39 2006
@@ -31,18 +31,12 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_CLICKURL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_CLICKURL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_HTMLBANNER}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_HTMLBANNER}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_HTMLCODE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_HTMLCODE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CONTROL}></th>
   </tr>
   <{foreach item=obj from=$objects}>
@@ -52,11 +46,15 @@
       <td><{$obj->getVar('imptotal')}></td>
       <td><{$obj->getVar('impmade')}></td>
       <td><{$obj->getVar('clicks')}></td>
-      <td><{$obj->getVar('imageurl')}></td>
-      <td><{$obj->getVar('clickurl')}></td>
+      <td>
+        <{if $obj->get('htmlbanner')}>
+          <{$obj->get('htmlcode')}>
+        <{else}>
+          <a href="<{$obj->getVar('clickurl')}>" target="_blank"><img src="<{$obj->getVar('imageurl')}>" alt="Banner" /></a>
+        <{/if}>
+      </td>
       <td><{$obj->get('date')|xoops_formattimestamp}></td>
       <td><{$obj->getVar('htmlbanner')}></td>
-      <td><{$obj->getVar('htmlcode')}></td>
       <td>
         <a href="./index.php?action=BannerEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$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}>" /></a>

From minahito ＠ users.sourceforge.jp  Mon Apr 24 19:57:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 19:57:58 +0900
Subject: [xoops-cvslog 2871] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060424105758.072E92AC100@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/bannerclient.php
diff -u xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/class/bannerclient.php:1.1.2.1	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/bannerclient.php	Mon Apr 24 19:57:57 2006
@@ -6,8 +6,15 @@
 {
 	var $mBanners = array();
 	var $_mBannersLoadedFlag = false;
+	
 	var $mFinishBanners = array();
 	var $_mFinishBannersLoadedFlag = false;
+	
+	var $mBannerCount = null;
+	var $_mBannerCountLoadedFlag = false;
+
+	var $mFinishBannerCount = null;
+	var $_mFinishBannerCountLoadedFlag = false;
 
 	function LegacyRenderBannerclientObject()
 	{
@@ -29,6 +36,15 @@
 		}
 	}
 
+	function loadBannerCount()
+	{
+		if ($this->_mBannerCountLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('banner');
+			$this->mBannerCount = $handler->getCount(new Criteria('cid', $this->get('cid')));
+			$this->_mBannerCountLoadedFlag = true;
+		}
+	}
+
 	function &createBanner()
 	{
 		$handler =& xoops_getmodulehandler('banner');
@@ -39,10 +55,19 @@
 
 	function loadBannerfinish()
 	{
-		if ($this->_mFinishBannersLoadedFlag == false) {
+		if ($this->_mBannerfinishCountFlag == false) {
 			$handler =& xoops_getmodulehandler('bannerfinish');
 			$this->mFinishBanners =& $handler->getObjects(new Criteria('cid', $this->get('cid')));
-			$this->_mFinishBannersLoadedFlag = true;
+			$this->_mBannerfinishCountLoadedFlag = true;
+		}
+	}
+
+	function loadFinishBannerCount()
+	{
+		if ($this->_mFinishBannerCountLoadedFlag == false) {
+			$handler =& xoops_getmodulehandler('bannerfinish');
+			$this->mFinishBannerCount = $handler->getCount(new Criteria('cid', $this->get('cid')));
+			$this->_mFinishBannerCountLoadedFlag = true;
 		}
 	}
 

From minahito ＠ users.sourceforge.jp  Mon Apr 24 19:58:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 19:58:21 +0900
Subject: [xoops-cvslog 2872] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060424105821.26CCC2AC110@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.1 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.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerclientListAction.class.php	Mon Apr 24 19:58:21 2006
@@ -29,8 +29,8 @@
 	{
 		$render->setTemplateName("bannerclient_list.html");
 		foreach (array_keys($this->mObjects) as $key) {
-			$this->mObjects[$key]->loadBanner();
-			$this->mObjects[$key]->loadBannerfinish();
+			$this->mObjects[$key]->loadBannerCount();
+			$this->mObjects[$key]->loadFinishBannerCount();
 		}
 		$render->setAttribute("objects", $this->mObjects);
 		$render->setAttribute("pageNavi", $this->mNavi);

From minahito ＠ users.sourceforge.jp  Mon Apr 24 19:58:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Mon, 24 Apr 2006 19:58:44 +0900
Subject: [xoops-cvslog 2873] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060424105844.EF9BC2AC110@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.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_list.html	Mon Apr 24 19:58:44 2006
@@ -29,9 +29,6 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_LOGIN}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_LOGIN}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_LOGIN}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_PASSWD}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_PASSWD}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERCLIENT_SORT_KEY_EXTRAINFO}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERCLIENT_SORT_KEY_EXTRAINFO}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -44,13 +41,13 @@
       <td><{$obj->getVar('contact')}></td>
       <td><{$obj->getVar('email')}></td>
       <td><{$obj->getVar('login')}></td>
-      <td><{$obj->getVar('passwd')}></td>
       <td><{$obj->getVar('extrainfo')}></td>
       <td>
-        <a href="./index.php?action=BannerList&amp;cid=<{$obj->get('cid')|escape}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a>
-        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->get('cid')|escape}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
-        <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->get('cid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
-        <a href="./index.php?action=BannerclientDelete&amp;cid=<{$obj->get('cid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <{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>
+        <a href="./index.php?action=BannerfinishList&amp;cid=<{$obj->getVar('cid')}>"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}>(<{$obj->mFinishBannerCount|escape}>)</a>
+        <a href="./index.php?action=BannerclientEdit&amp;cid=<{$obj->getVar('cid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$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}>" /></a>
       </td>
     </tr>
   <{/foreach}>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:55:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:55:00 +0900
Subject: [xoops-cvslog 2874] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060425035500.8C1C92AC27F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.15 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.16
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.15	Mon Apr 24 16:31:33 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php	Tue Apr 25 12:55:00 2006
@@ -9,6 +9,7 @@
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NO_EXIST', "指定されたテンプレートセットは存在しません");
 define('_AD_LEGACYRENDER_ERROR_UNIQUE_NAME', "他のテンプレートセットと重複しない名前を指定してください");
 define('_AD_LEGACYRENDER_LANG_AUTHOR', "作成者");
+define('_AD_LEGACYRENDER_LANG_BANNER', "バナー");
 define('_AD_LEGACYRENDER_LANG_BANNER_DELETE', "バナーの削除");
 define('_AD_LEGACYRENDER_LANG_BANNER_EDIT', "バナーの編集");
 define('_AD_LEGACYRENDER_LANG_BANNER_LIST', "バナーの一覧");
@@ -87,6 +88,7 @@
 define('_AD_LEGACYRENDER_LANG_TPLSET_DESC', "概要");
 define('_AD_LEGACYRENDER_LANG_TPLSET_ID', "ID");
 define('_AD_LEGACYRENDER_LANG_TPLSET_NAME', "名前");
+define('_AD_LEGACYRENDER_LANG_UN_LIMITED', "無制限");
 define('_AD_LEGACYRENDER_LANG_UNINSTALL', "テーマのアンインストール");
 define('_AD_LEGACYRENDER_LANG_UPLOAD', "テーマのアップロード");
 define('_AD_LEGACYRENDER_LANG_USER_ENABLE_SELECT', "ユーザー選択可");

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:55:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:55:08 +0900
Subject: [xoops-cvslog 2875] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060425035508.D72292AC27F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/english/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.14 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.15
--- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.14	Mon Apr 24 16:31:33 2006
+++ xoops2jp/html/modules/legacyRender/language/english/admin.php	Tue Apr 25 12:55:08 2006
@@ -9,6 +9,7 @@
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NO_EXIST', "Specified template set does not exist.");
 define('_AD_LEGACYRENDER_ERROR_UNIQUE_NAME', "Input unique name");
 define('_AD_LEGACYRENDER_LANG_AUTHOR', "Author");
+define('_AD_LEGACYRENDER_LANG_BANNER', "Banner");
 define('_AD_LEGACYRENDER_LANG_BANNER_DELETE', "Banner delete");
 define('_AD_LEGACYRENDER_LANG_BANNER_EDIT', "Banner edit");
 define('_AD_LEGACYRENDER_LANG_BANNER_LIST', "Banner list");
@@ -88,6 +89,7 @@
 define('_AD_LEGACYRENDER_LANG_TPLSET_DESC', "Description");
 define('_AD_LEGACYRENDER_LANG_TPLSET_ID', "ID");
 define('_AD_LEGACYRENDER_LANG_TPLSET_NAME', "Name");
+define('_AD_LEGACYRENDER_LANG_UN_LIMITED', "Un limited");
 define('_AD_LEGACYRENDER_LANG_UNINSTALL', "Uninstall");
 define('_AD_LEGACYRENDER_LANG_UPLOAD', "Upload");
 define('_AD_LEGACYRENDER_LANG_USER_ENABLE_SELECT', "Selectable by user");

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:55:49 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:55:49 +0900
Subject: [xoops-cvslog 2876] CVS update:
	xoops2jp/html/modules/legacyRender/class
Message-ID: <20060425035549.982622AC27F@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/class/banner.php
diff -u xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.1 xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.2
--- xoops2jp/html/modules/legacyRender/class/banner.php:1.1.2.1	Mon Apr 24 16:31:08 2006
+++ xoops2jp/html/modules/legacyRender/class/banner.php	Tue Apr 25 12:55:49 2006
@@ -16,7 +16,7 @@
 		$this->initVar('clicks', XOBJ_DTYPE_INT, '0', true);
 		$this->initVar('imageurl', XOBJ_DTYPE_STRING, '', true, 255);
 		$this->initVar('clickurl', XOBJ_DTYPE_STRING, '', true, 255);
-		$this->initVar('date', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('date', XOBJ_DTYPE_INT, time(), true);
 		$this->initVar('htmlbanner', XOBJ_DTYPE_BOOL, '0', true);
 		$this->initVar('htmlcode', XOBJ_DTYPE_TEXT, '', true);
 	}

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:56:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:56:00 +0900
Subject: [xoops-cvslog 2877] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060425035600.308FE2AC280@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.1 xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_delete.html	Tue Apr 25 12:56:00 2006
@@ -14,12 +14,18 @@
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CLIENT_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getVar('name')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('imptotal')}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{if $object->get('imptotal') > 0}>
+          <{$object->getVar('imptotal')}>
+        <{else}>
+          <{$smarty.const._AD_LEGACYRENDER_LANG_UN_LIMITED}>
+        <{/if}>
+      </td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}></th>
@@ -39,7 +45,7 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('date')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('date')|xoops_formattimestamp}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}></th>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.2 xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html:1.1.2.2	Mon Apr 24 19:40:39 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_list.html	Tue Apr 25 12:56:00 2006
@@ -28,9 +28,7 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_CLICKS}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_CLICKS}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}><br />
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
-      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_IMAGEURL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER}></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNER_SORT_KEY_DATE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
@@ -43,7 +41,13 @@
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
       <td><{$obj->mClient->getVar('name')}></td>
-      <td><{$obj->getVar('imptotal')}></td>
+      <td>
+        <{if $obj->get('imptotal') > 0}>
+          <{$obj->getVar('imptotal')}>
+        <{else}>
+          <{$smarty.const._AD_LEGACYRENDER_LANG_UN_LIMITED}>
+        <{/if}>
+      </td>
       <td><{$obj->getVar('impmade')}></td>
       <td><{$obj->getVar('clicks')}></td>
       <td>
Index: xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/banner_edit.html	Tue Apr 25 12:56:00 2006
@@ -23,7 +23,7 @@
 <{/if}>
 <form action="index.php?action=BannerEdit" method="post">
   <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+  <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
@@ -42,49 +42,31 @@
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPTOTAL}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=imptotal value=$actionForm->getVar('imptotal')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPMADE}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=impmade value=$actionForm->getVar('impmade')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=clicks value=$actionForm->getVar('clicks')}>
+        <{xoops_input type=text name=imptotal value=$actionForm->get('imptotal')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMAGEURL}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=imageurl value=$actionForm->getVar('imageurl') size=15 maxlength=255}>
+        <{xoops_input type=text name=imageurl value=$actionForm->get('imageurl') size=64 maxlength=255}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKURL}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=clickurl value=$actionForm->getVar('clickurl') size=15 maxlength=255}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATE}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=date value=$actionForm->getVar('date')}>
+        <{xoops_input type=text name=clickurl value=$actionForm->get('clickurl') size=64 maxlength=255}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLBANNER}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=checkbox name=htmlbanner value=1 default=$actionForm->getVar('htmlbanner')}>
+        <{xoops_input type=checkbox name=htmlbanner value=1 default=$actionForm->get('htmlbanner')}>
       </td>
     </tr>
     <tr>
       <th><{$smarty.const._AD_LEGACYRENDER_LANG_HTMLCODE}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_dhtmltarea type=text name=htmlcode value=$actionForm->getVar('htmlcode')}>
+        <{xoops_textarea name=htmlcode cols=50 rows=5 value=$actionForm->get('htmlcode')}>
       </td>
     </tr>
     <tr class="foot">

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:58:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:58:58 +0900
Subject: [xoops-cvslog 2878] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060425035858.25E522AC280@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.1 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.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerAdminEditForm.class.php	Tue Apr 25 12:58:58 2006
@@ -20,11 +20,8 @@
 		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
 		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
 		$this->mFormProperties['imptotal'] =& new XCube_IntProperty('imptotal');
-		$this->mFormProperties['impmade'] =& new XCube_IntProperty('impmade');
-		$this->mFormProperties['clicks'] =& new XCube_IntProperty('clicks');
 		$this->mFormProperties['imageurl'] =& new XCube_StringProperty('imageurl');
 		$this->mFormProperties['clickurl'] =& new XCube_StringProperty('clickurl');
-		$this->mFormProperties['date'] =& new XCube_IntProperty('date');
 		$this->mFormProperties['htmlbanner'] =& new XCube_BoolProperty('htmlbanner');
 		$this->mFormProperties['htmlcode'] =& new XCube_TextProperty('htmlcode');
 	
@@ -41,38 +38,43 @@
 		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
 		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
 		$this->mFieldProperties['cid']->addVar('handler', 'bannerclient');
+		$this->mFieldProperties['cid']->addVar('module', 'legacyRender');
 	
 		$this->mFieldProperties['imptotal'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['imptotal']->setDependsByArray(array('required'));
 		$this->mFieldProperties['imptotal']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPTOTAL);
 	
-		$this->mFieldProperties['impmade'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['impmade']->setDependsByArray(array('required'));
-		$this->mFieldProperties['impmade']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPMADE);
-	
-		$this->mFieldProperties['clicks'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['clicks']->setDependsByArray(array('required'));
-		$this->mFieldProperties['clicks']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKS);
-	
 		$this->mFieldProperties['imageurl'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['imageurl']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['imageurl']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMAGEURL, '255');
+		$this->mFieldProperties['imageurl']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['imageurl']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_IMAGEURL, '255');
 		$this->mFieldProperties['imageurl']->addVar('maxlength', '255');
 	
 		$this->mFieldProperties['clickurl'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['clickurl']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['clickurl']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKURL, '255');
+		$this->mFieldProperties['clickurl']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['clickurl']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_CLICKURL, '255');
 		$this->mFieldProperties['clickurl']->addVar('maxlength', '255');
-	
-		$this->mFieldProperties['date'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['date']->setDependsByArray(array('required'));
-		$this->mFieldProperties['date']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATE);
-	
-		$this->mFieldProperties['htmlcode'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['htmlcode']->setDependsByArray(array('required'));
-		$this->mFieldProperties['htmlcode']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_HTMLCODE);
+	}
+
+	function validate()
+	{
+		parent::validate();
+		
+		//
+		// If htmlbanner is clicked, htmlbanner is requreid.
+		//
+		if ($this->get('htmlbanner')) {
+			if (strlen($this->get('htmlcode')) == 0) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_HTMLCODE));
+			}
+		}
+		else {
+			if (strlen($this->get('imageurl')) == 0) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMAGEURL));
+			}
+			if (strlen($this->get('clickurl')) == 0) {
+				$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKURL));
+			}
+		}
 	}
 
 	function load(&$obj)
@@ -80,11 +82,8 @@
 		$this->set('bid', $obj->get('bid'));
 		$this->set('cid', $obj->get('cid'));
 		$this->set('imptotal', $obj->get('imptotal'));
-		$this->set('impmade', $obj->get('impmade'));
-		$this->set('clicks', $obj->get('clicks'));
 		$this->set('imageurl', $obj->get('imageurl'));
 		$this->set('clickurl', $obj->get('clickurl'));
-		$this->set('date', $obj->get('date'));
 		$this->set('htmlbanner', $obj->get('htmlbanner'));
 		$this->set('htmlcode', $obj->get('htmlcode'));
 	}
@@ -94,11 +93,8 @@
 		$obj->set('bid', $this->get('bid'));
 		$obj->set('cid', $this->get('cid'));
 		$obj->set('imptotal', $this->get('imptotal'));
-		$obj->set('impmade', $this->get('impmade'));
-		$obj->set('clicks', $this->get('clicks'));
 		$obj->set('imageurl', $this->get('imageurl'));
 		$obj->set('clickurl', $this->get('clickurl'));
-		$obj->set('date', $this->get('date'));
 		$obj->set('htmlbanner', $this->get('htmlbanner'));
 		$obj->set('htmlcode', $this->get('htmlcode'));
 	}

From minahito ＠ users.sourceforge.jp  Tue Apr 25 12:59:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 12:59:13 +0900
Subject: [xoops-cvslog 2879] CVS update:
	xoops2jp/html/modules/legacyRender/admin/.xml
Message-ID: <20060425035913.77BE12AC280@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml
diff -u xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml:1.1.2.1	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/banner_edit.xml	Tue Apr 25 12:59:13 2006
@@ -4,11 +4,8 @@
 		<form-property name="bid" type="Int" />
 		<form-property name="cid" type="Int" />
 		<form-property name="imptotal" type="Int" />
-		<form-property name="impmade" type="Int" />
-		<form-property name="clicks" type="Int" />
 		<form-property name="imageurl" type="String" />
 		<form-property name="clickurl" type="String" />
-		<form-property name="date" type="Int" />
 		<form-property name="htmlbanner" type="Bool" />
 		<form-property name="htmlcode" type="Text" />
 	</form-bean>
@@ -22,40 +19,23 @@
 			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
 			<var name="handler" value="bannerclient" />
+			<var name="module" value="legacyRender" />
 		</field>
 		<field property="imptotal" depends="required">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPTOTAL" />
 			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 		</field>
-		<field property="impmade" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPMADE" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="clicks" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKS" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="imageurl" depends="required,maxlength">
+		<field property="imageurl" depends="maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_IMAGEURL" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="255" />
 		</field>
-		<field property="clickurl" depends="required,maxlength">
+		<field property="clickurl" depends="maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKURL" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="255" />
 		</field>
-		<field property="date" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_DATE" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="htmlcode" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_HTMLCODE" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
 	</form-validation>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:13 +0900
Subject: [xoops-cvslog 2880] CVS update:
	xoops2jp/html/modules/legacyRender/admin/.xml
Message-ID: <20060425051613.EF34C2AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml
diff -u xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml:removed
--- xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml:1.1.2.1	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerfinish_edit.xml	Tue Apr 25 14:16:13 2006
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<xoopscube-dynaactionform>
-	<form-bean name="BannerfinishAdminEditForm" type="XCube_ActionForm">
-		<form-property name="bid" type="Int" />
-		<form-property name="cid" type="Int" />
-		<form-property name="impressions" type="Int" />
-		<form-property name="clicks" type="Int" />
-		<form-property name="datestart" type="Int" />
-		<form-property name="dateend" type="Int" />
-	</form-bean>
-	<form-validation>
-		<field property="bid" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_BID" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="cid" depends="required,objectExsist">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
-			<var name="handler" value="bannerclient" />
-		</field>
-		<field property="impressions" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_IMPRESSIONS" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="clicks" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_CLICKS" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="datestart" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_DATESTART" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-		<field property="dateend" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_DATEEND" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
-	</form-validation>
-</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:21 +0900
Subject: [xoops-cvslog 2881] CVS update:
	xoops2jp/html/modules/legacyRender/admin/actions
Message-ID: <20060425051621.196862AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php:removed
--- xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php:1.1.2.1	Mon Apr 24 16:30:10 2006
+++ xoops2jp/html/modules/legacyRender/admin/actions/BannerfinishEditAction.class.php	Tue Apr 25 14:16:21 2006
@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractEditAction.class.php";
-require_once XOOPS_MODULE_PATH . "/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php";
-
-class LegacyRender_BannerfinishEditAction extends LegacyRender_AbstractEditAction
-{
-	function _getId()
-	{
-		return isset($_REQUEST['bid']) ? $_REQUEST['bid'] : 0;
-	}
-
-	function &_getHandler()
-	{
-		$handler =& xoops_getmodulehandler('bannerfinish');
-		return $handler;
-	}
-
-	function _setupActionForm()
-	{
-		$this->mActionForm =& new LegacyRender_BannerfinishAdminEditForm();
-		$this->mActionForm->prepare();
-	}
-
-	function executeViewInput(&$controller, &$xoopsUser, &$render)
-	{
-		$render->setTemplateName("bannerfinish_edit.html");
-		$render->setAttribute('actionForm', $this->mActionForm);
-		$this->mObject->loadBannerclient();
-		$render->setAttribute('object', $this->mObject);
-		
-		$bannerclientHandler =& xoops_getmodulehandler('bannerclient');
-		$bannerclientArr =& $bannerclientHandler->getObjects();
-		foreach (array_keys($bannerclientArr) as $key) {
-			$bannerclientArr[$key]->loadBanner();
-		}
-		$render->setAttribute('bannerclientArr', $bannerclientArr);
-	}
-
-	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
-	{
-		$controller->executeForward("./index.php?action=BannerfinishList");
-	}
-
-	function executeViewError(&$controller, &$xoopsUser, &$render)
-	{
-		redirect_header("./index.php?action=BannerfinishList", 1, _AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED);
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:28 +0900
Subject: [xoops-cvslog 2882] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060425051628.0D7E02AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php:removed
--- xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php:1.1.2.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishAdminEditForm.class.php	Tue Apr 25 14:16:27 2006
@@ -1,79 +0,0 @@
-<?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 LegacyRender_BannerfinishAdminEditForm extends XCube_ActionForm
-{
-	function getTokenName()
-	{
-		return "module.legacyRender.BannerfinishAdminEditForm.TOKEN";
-	}
-
-	function prepare()
-	{
-		//
-		// Set form properties
-		//
-		$this->mFormProperties['bid'] =& new XCube_IntProperty('bid');
-		$this->mFormProperties['cid'] =& new XCube_IntProperty('cid');
-		$this->mFormProperties['impressions'] =& new XCube_IntProperty('impressions');
-		$this->mFormProperties['clicks'] =& new XCube_IntProperty('clicks');
-		$this->mFormProperties['datestart'] =& new XCube_IntProperty('datestart');
-		$this->mFormProperties['dateend'] =& new XCube_IntProperty('dateend');
-	
-		//
-		// 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);
-	
-		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['cid']->setDependsByArray(array('required','objectExsist'));
-		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
-		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
-		$this->mFieldProperties['cid']->addVar('handler', 'bannerclient');
-	
-		$this->mFieldProperties['impressions'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['impressions']->setDependsByArray(array('required'));
-		$this->mFieldProperties['impressions']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_IMPRESSIONS);
-	
-		$this->mFieldProperties['clicks'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['clicks']->setDependsByArray(array('required'));
-		$this->mFieldProperties['clicks']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CLICKS);
-	
-		$this->mFieldProperties['datestart'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['datestart']->setDependsByArray(array('required'));
-		$this->mFieldProperties['datestart']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATESTART);
-	
-		$this->mFieldProperties['dateend'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['dateend']->setDependsByArray(array('required'));
-		$this->mFieldProperties['dateend']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_DATEEND);
-	}
-
-	function load(&$obj)
-	{
-		$this->set('bid', $obj->get('bid'));
-		$this->set('cid', $obj->get('cid'));
-		$this->set('impressions', $obj->get('impressions'));
-		$this->set('clicks', $obj->get('clicks'));
-		$this->set('datestart', $obj->get('datestart'));
-		$this->set('dateend', $obj->get('dateend'));
-	}
-
-	function update(&$obj)
-	{
-		$obj->set('bid', $this->get('bid'));
-		$obj->set('cid', $this->get('cid'));
-		$obj->set('impressions', $this->get('impressions'));
-		$obj->set('clicks', $this->get('clicks'));
-		$obj->set('datestart', $this->get('datestart'));
-		$obj->set('dateend', $this->get('dateend'));
-	}
-}
-
-?>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:34 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:34 +0900
Subject: [xoops-cvslog 2883] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060425051634.BD3FD2AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html:removed
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_edit.html	Tue Apr 25 14:16:34 2006
@@ -1,73 +0,0 @@
-<div class="adminnavi">
-  <a href="./index.php"><{$smarty.const._MI_LEGACYRENDER_NAME}></a>
-  &raquo;&raquo; <a href="./index.php?action=BannerfinishList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_LIST}></a>
-  <{if $actionForm->get('bid')}>
-    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT}>
-  <{else}>
-    &raquo;&raquo; <{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_NEW}>
-  <{/if}>
-</div>
-
-  <{if $actionForm->get('bid')}>
-    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_EDIT}></h3>
-  <{else}>
-    <h3><{$smarty.const._AD_LEGACYRENDER_LANG_BANNERFINISH_NEW}></h3>
-  <{/if}>
-
-<{if $actionForm->hasError()}>
-  <ul>
-    <{foreach item=message from=$actionForm->getErrorMessages()}>
-      <li><{$message|escape}></li>
-    <{/foreach}>
-  </ul>
-<{/if}>
-<form action="index.php?action=BannerfinishEdit" method="post">
-  <{xoops_token form=$actionForm}>
-  <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
-  <table class="outer" cellspacing="1">
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <select name="cid">
-          <{foreach item=child from=$bannerclientArr}>
-          	<{if $child->getVar('cid') == $actionForm->get('cid')}>
-          		<option value="<{$child->getVar('cid')}>" checked><{$child->getVar('name')}></option>
-          	<{else}>
-          		<option value="<{$child->getVar('cid')}>"><{$child->getVar('name')}></option>
-          	<{/if}>
-          <{/foreach}>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=impressions value=$actionForm->getVar('impressions')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLICKS}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=clicks value=$actionForm->getVar('clicks')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=datestart value=$actionForm->getVar('datestart')}>
-      </td>
-    </tr>
-    <tr>
-      <th><{$smarty.const._AD_LEGACYRENDER_LANG_DATEEND}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=dateend value=$actionForm->getVar('dateend')}>
-      </td>
-    </tr>
-    <tr class="foot">
-      <td colspan="2" style="text-align:center;">
-        <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>
-</form>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:45 +0900
Subject: [xoops-cvslog 2884] CVS update:
	xoops2jp/html/modules/legacyRender/language/english
Message-ID: <20060425051645.B572C2AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/english/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.15 xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.16
--- xoops2jp/html/modules/legacyRender/language/english/admin.php:1.1.2.15	Tue Apr 25 12:55:08 2006
+++ xoops2jp/html/modules/legacyRender/language/english/admin.php	Tue Apr 25 14:16:45 2006
@@ -1,6 +1,8 @@
 <?php
 
 define('_AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED', "Database update failed.");
+define('_AD_LEGACYRENDER_ERROR_EMAIL', "EMAIL");
+define('_AD_LEGACYRENDER_ERROR_LOGIN_REPETITION', "Login repetition");
 define('_AD_LEGACYRENDER_ERROR_MAXLENGTH', "Input {0} with {1} or less characters.");
 define('_AD_LEGACYRENDER_ERROR_OBJECT_EXIST', "object exist");
 define('_AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST', "Specified object does not exist.");

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:16:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:16:53 +0900
Subject: [xoops-cvslog 2885] CVS update:
	xoops2jp/html/modules/legacyRender/language/japanese
Message-ID: <20060425051653.500B82AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/language/japanese/admin.php
diff -u xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.16 xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.17
--- xoops2jp/html/modules/legacyRender/language/japanese/admin.php:1.1.2.16	Tue Apr 25 12:55:00 2006
+++ xoops2jp/html/modules/legacyRender/language/japanese/admin.php	Tue Apr 25 14:16:53 2006
@@ -1,8 +1,10 @@
 <?php
 
 define('_AD_LEGACYRENDER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
+define('_AD_LEGACYRENDER_ERROR_EMAIL', "入力された{0}を電子メールの形式として正しく認識できません");
+define('_AD_LEGACYRENDER_ERROR_LOGIN_REPETITION', "入力されたログイン名はすでに使われています");
 define('_AD_LEGACYRENDER_ERROR_MAXLENGTH', "{0}は最大半角{1}文字以内で入力して下さい");
-define('_AD_LEGACYRENDER_ERROR_OBJECT_EXIST', "object exist");
+define('_AD_LEGACYRENDER_ERROR_OBJECT_EXIST', "{0}に入力された値が不正です");
 define('_AD_LEGACYRENDER_ERROR_OBJECT_IS_NOT_EXIST', "指定オブジェクトが存在しません");
 define('_AD_LEGACYRENDER_ERROR_REQUIRED', "{0}は必ず入力して下さい");
 define('_AD_LEGACYRENDER_ERROR_TPLSET_NAME_RULE', "テンプレートセットの名称は半角英数字およびアンダースコア(_)の組み合わせを使用してください");

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:17:01 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:17:01 +0900
Subject: [xoops-cvslog 2886] CVS update:
	xoops2jp/html/modules/legacyRender/admin/.xml
Message-ID: <20060425051701.477E42AC28D@users.sourceforge.jp>

Index: xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml
diff -u xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml:1.1.2.1	Mon Apr 24 16:29:58 2006
+++ xoops2jp/html/modules/legacyRender/admin/.xml/bannerclient_edit.xml	Tue Apr 25 14:17:01 2006
@@ -10,11 +10,9 @@
 		<form-property name="extrainfo" type="Text" />
 	</form-bean>
 	<form-validation>
-		<field property="cid" depends="required,objectExsist">
+		<field property="cid" depends="required">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_CID" />
 			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-			<msg name="objectExist" key="const._AD_LEGACYRENDER_ERROR_OBJECT_EXIST" />
-			<var name="handler" value="bannerfinish" />
 		</field>
 		<field property="name" depends="required,maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_NAME" />
@@ -23,37 +21,30 @@
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="60" />
 		</field>
-		<field property="contact" depends="required,maxlength">
+		<field property="contact" depends="maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_CONTACT" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="60" />
 		</field>
-		<field property="email" depends="required,maxlength">
+		<field property="email" depends="maxlength,email">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_EMAIL" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
+			<msg name="email" key="const._AD_LEGACYRENDER_ERROR_EMAIL" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="60" />
 		</field>
-		<field property="login" depends="required,maxlength">
+		<field property="login" depends="maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_LOGIN" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="10" />
 		</field>
-		<field property="passwd" depends="required,maxlength">
+		<field property="passwd" depends="maxlength">
 			<arg0 key="const._AD_LEGACYRENDER_LANG_PASSWD" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
 			<arg1 name="maxlength" key="${var:maxlength}" />
 			<msg name="maxlength" key="const._AD_LEGACYRENDER_ERROR_MAXLENGTH" />
 			<var name="maxlength" value="10" />
 		</field>
-		<field property="extrainfo" depends="required">
-			<arg0 key="const._AD_LEGACYRENDER_LANG_EXTRAINFO" />
-			<msg name="required" key="const._AD_LEGACYRENDER_ERROR_REQUIRED" />
-		</field>
 	</form-validation>
 </xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:17:19 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:17:19 +0900
Subject: [xoops-cvslog 2887] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060425051719.DC8762AC28D@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.1 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.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientAdminEditForm.class.php	Tue Apr 25 14:17:19 2006
@@ -30,10 +30,8 @@
 		//
 	
 		$this->mFieldProperties['cid'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['cid']->setDependsByArray(array('required','objectExsist'));
+		$this->mFieldProperties['cid']->setDependsByArray(array('required'));
 		$this->mFieldProperties['cid']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CID);
-		$this->mFieldProperties['cid']->addMessage('objectExist', _AD_LEGACYRENDER_ERROR_OBJECT_EXIST, _AD_LEGACYRENDER_LANG_CID);
-		$this->mFieldProperties['cid']->addVar('handler', 'bannerfinish');
 	
 		$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
 		$this->mFieldProperties['name']->setDependsByArray(array('required','maxlength'));
@@ -42,32 +40,43 @@
 		$this->mFieldProperties['name']->addVar('maxlength', '60');
 	
 		$this->mFieldProperties['contact'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['contact']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['contact']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_CONTACT, '60');
+		$this->mFieldProperties['contact']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['contact']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_CONTACT, '60');
 		$this->mFieldProperties['contact']->addVar('maxlength', '60');
 	
 		$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['email']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['email']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_EMAIL, '60');
+		$this->mFieldProperties['email']->setDependsByArray(array('maxlength','email'));
+		$this->mFieldProperties['email']->addMessage('email', _AD_LEGACYRENDER_ERROR_EMAIL, _AD_LEGACYRENDER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_EMAIL, '60');
 		$this->mFieldProperties['email']->addVar('maxlength', '60');
 	
 		$this->mFieldProperties['login'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['login']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['login']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_LOGIN, '10');
+		$this->mFieldProperties['login']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['login']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_LOGIN, '10');
 		$this->mFieldProperties['login']->addVar('maxlength', '10');
 	
 		$this->mFieldProperties['passwd'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['passwd']->setDependsByArray(array('required','maxlength'));
-		$this->mFieldProperties['passwd']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_PASSWD, '10');
+		$this->mFieldProperties['passwd']->setDependsByArray(array('maxlength'));
 		$this->mFieldProperties['passwd']->addMessage('maxlength', _AD_LEGACYRENDER_ERROR_MAXLENGTH, _AD_LEGACYRENDER_LANG_PASSWD, '10');
 		$this->mFieldProperties['passwd']->addVar('maxlength', '10');
+	}
+
+	function validateLogin()
+	{
+		if (strlen($this->get('login')) > 0) {
+			$handler =& xoops_getmodulehandler('bannerclient', 'legacyRender');
+			$t_objs =& $handler->getObjects(new Criteria('login', $this->get('login')));
+			if (count($t_objs) > 0) {
+				$this->addErrorMessage(_AD_LEGACYRENDER_ERROR_LOGIN_REPETITION);
+			}
+		}
+	}
 	
-		$this->mFieldProperties['extrainfo'] =& new XCube_FieldProperty($this);
-		$this->mFieldProperties['extrainfo']->setDependsByArray(array('required'));
-		$this->mFieldProperties['extrainfo']->addMessage('required', _AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_EXTRAINFO);
+	function validatePasswd()
+	{
+		if (strlen($this->get('login')) > 0 && strlen($this->get('passwd')) == 0) {
+			$this->addErrorMessage(XCube_Utils::formatMessage(_AD_LEGACYRENDER_ERROR_REQUIRED, _AD_LEGACYRENDER_LANG_PASSWD));
+		}
 	}
 
 	function load(&$obj)

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:17:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:17:28 +0900
Subject: [xoops-cvslog 2888] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060425051728.1A1F52AC28D@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.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerclient_delete.html	Tue Apr 25 14:17:27 2006
@@ -30,10 +30,6 @@
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('login')}></td>
     </tr>
     <tr>
-      <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_PASSWD}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('passwd')}></td>
-    </tr>
-    <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_EXTRAINFO}></th>
       <td class="<{cycle values="odd,even"}>"><{$object->getVar('extrainfo')}></td>
     </tr>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:17:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:17:39 +0900
Subject: [xoops-cvslog 2889] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060425051739.B76722AC28D@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.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_delete.html	Tue Apr 25 14:17:39 2006
@@ -15,7 +15,7 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_CID}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('cid')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->mClient->getVar('name')}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}></th>
@@ -27,11 +27,11 @@
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATESTART}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('datestart')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('datestart')|xoops_formattimestamp}></td>
     </tr>
     <tr>
       <th style="width:30%;"><{$smarty.const._AD_LEGACYRENDER_LANG_DATEEND}></th>
-      <td class="<{cycle values="odd,even"}>"><{$object->getVar('dateend')}></td>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('dateend')|xoops_formattimestamp}></td>
     </tr>
     <tr>
       <td class="foot" colspan="2" style="text-align:center;"><br />
Index: xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html
diff -u xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.1 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.2
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.1	Mon Apr 24 16:30:35 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html	Tue Apr 25 14:17:39 2006
@@ -16,7 +16,7 @@
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_BID}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_BID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_BID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
-    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CID}><br />
+    <th><{$smarty.const._AD_LEGACYRENDER_LANG_CLIENT_NAME}><br />
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.BANNERFINISH_SORT_KEY_CID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
       <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.BANNERFINISH_SORT_KEY_CID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
     <th><{$smarty.const._AD_LEGACYRENDER_LANG_IMPRESSIONS}><br />
@@ -36,13 +36,12 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->getVar('cid')}></td>
+      <td><{$obj->mClient->getVar('name')}></td>
       <td><{$obj->getVar('impressions')}></td>
       <td><{$obj->getVar('clicks')}></td>
-      <td><{$obj->getVar('datestart')}></td>
-      <td><{$obj->getVar('dateend')}></td>
+      <td><{$obj->get('datestart')|xoops_formattimestamp}></td>
+      <td><{$obj->get('dateend')|xoops_formattimestamp}></td>
       <td>
-        <a href="./index.php?action=BannerfinishEdit&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
         <a href="./index.php?action=BannerfinishDelete&amp;bid=<{$obj->get('bid')|escape}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:24:16 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:24:16 +0900
Subject: [xoops-cvslog 2890] CVS update:
	xoops2jp/html/modules/legacyRender/admin/forms
Message-ID: <20060425052416.84C3F2AC29C@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.1 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.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerclientFilterForm.class.php	Tue Apr 25 14:24:16 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
 
-define('BANNERCLIENT_SORT_KEY_DEFAULT', 0);
 define('BANNERCLIENT_SORT_KEY_CID', 1);
 define('BANNERCLIENT_SORT_KEY_NAME', 2);
 define('BANNERCLIENT_SORT_KEY_CONTACT', 3);
@@ -14,11 +13,12 @@
 define('BANNERCLIENT_SORT_KEY_EXTRAINFO', 7);
 define('BANNERCLIENT_SORT_KEY_MAXVALUE', 7);
 
+define('BANNERCLIENT_SORT_KEY_DEFAULT', BANNERCLIENT_SORT_KEY_CID);
+
 class LegacyRender_BannerclientFilterForm extends LegacyRender_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $mSortKeys = array(
-		BANNERCLIENT_SORT_KEY_DEFAULT => 'cid',
+	var $_mSortKeys = array(
 		BANNERCLIENT_SORT_KEY_CID => 'cid',
 		BANNERCLIENT_SORT_KEY_NAME => 'name',
 		BANNERCLIENT_SORT_KEY_CONTACT => 'contact',
@@ -31,41 +31,25 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNERCLIENT_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > BANNERCLIENT_SORT_KEY_MAXVALUE) {
 			$this->mSort = BANNERCLIENT_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'))));
-		}
-	
 		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'))));
 		}
 	
 		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'))));
 		}
-	
-		if (isset($_REQUEST['email'])) {
-			$this->_mNavi->addExtra('email', xoops_getrequest('email'));
-			$this->_mCriteria->add(new Criteria('email', array(XOBJ_DTYPE_STRING, xoops_getrequest('email'))));
-		}
-	
-		if (isset($_REQUEST['login'])) {
-			$this->_mNavi->addExtra('login', xoops_getrequest('login'));
-			$this->_mCriteria->add(new Criteria('login', array(XOBJ_DTYPE_STRING, xoops_getrequest('login'))));
-		}
-	
-		if (isset($_REQUEST['passwd'])) {
-			$this->_mNavi->addExtra('passwd', xoops_getrequest('passwd'));
-			$this->_mCriteria->add(new Criteria('passwd', array(XOBJ_DTYPE_STRING, xoops_getrequest('passwd'))));
-		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php:1.1.2.1 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.1	Mon Apr 24 16:30:22 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerfinishFilterForm.class.php	Tue Apr 25 14:24:16 2006
@@ -4,7 +4,6 @@
 
 require_once XOOPS_MODULE_PATH . "/legacyRender/class/AbstractFilterForm.class.php";
 
-define('BANNERFINISH_SORT_KEY_DEFAULT', 0);
 define('BANNERFINISH_SORT_KEY_BID', 1);
 define('BANNERFINISH_SORT_KEY_CID', 2);
 define('BANNERFINISH_SORT_KEY_IMPRESSIONS', 3);
@@ -13,11 +12,12 @@
 define('BANNERFINISH_SORT_KEY_DATEEND', 6);
 define('BANNERFINISH_SORT_KEY_MAXVALUE', 6);
 
+define('BANNERFINISH_SORT_KEY_DEFAULT', BANNERFINISH_SORT_KEY_BID);
+
 class LegacyRender_BannerfinishFilterForm extends LegacyRender_AbstractFilterForm
 {
 	var $mSort = 0;
-	var $mSortKeys = array(
-		BANNERFINISH_SORT_KEY_DEFAULT => 'bid',
+	var $_mSortKeys = array(
 		BANNERFINISH_SORT_KEY_BID => 'bid',
 		BANNERFINISH_SORT_KEY_CID => 'cid',
 		BANNERFINISH_SORT_KEY_IMPRESSIONS => 'impressions',
@@ -29,41 +29,18 @@
 
 	function fetch()
 	{
-		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : 0;
+		$this->mSort = isset($_REQUEST['sort']) ? intval($_REQUEST['sort']) : BANNERFINISH_SORT_KEY_DEFAULT;
 	
 		if ($this->mSort > BANNERFINISH_SORT_KEY_MAXVALUE) {
 			$this->mSort = BANNERFINISH_SORT_KEY_DEFAULT;
 		}
 	
-		if (isset($_REQUEST['bid'])) {
-			$this->_mNavi->addExtra('bid', xoops_getrequest('bid'));
-			$this->_mCriteria->add(new Criteria('bid', array(XOBJ_DTYPE_INT, xoops_getrequest('bid'))));
-		}
-	
 		if (isset($_REQUEST['cid'])) {
 			$this->_mNavi->addExtra('cid', xoops_getrequest('cid'));
 			$this->_mCriteria->add(new Criteria('cid', array(XOBJ_DTYPE_INT, xoops_getrequest('cid'))));
 		}
-	
-		if (isset($_REQUEST['impressions'])) {
-			$this->_mNavi->addExtra('impressions', xoops_getrequest('impressions'));
-			$this->_mCriteria->add(new Criteria('impressions', array(XOBJ_DTYPE_INT, xoops_getrequest('impressions'))));
-		}
-	
-		if (isset($_REQUEST['clicks'])) {
-			$this->_mNavi->addExtra('clicks', xoops_getrequest('clicks'));
-			$this->_mCriteria->add(new Criteria('clicks', array(XOBJ_DTYPE_INT, xoops_getrequest('clicks'))));
-		}
-	
-		if (isset($_REQUEST['datestart'])) {
-			$this->_mNavi->addExtra('datestart', xoops_getrequest('datestart'));
-			$this->_mCriteria->add(new Criteria('datestart', array(XOBJ_DTYPE_INT, xoops_getrequest('datestart'))));
-		}
-	
-		if (isset($_REQUEST['dateend'])) {
-			$this->_mNavi->addExtra('dateend', xoops_getrequest('dateend'));
-			$this->_mCriteria->add(new Criteria('dateend', array(XOBJ_DTYPE_INT, xoops_getrequest('dateend'))));
-		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 
Index: xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php
diff -u xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php:1.1.2.2 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.2	Mon Apr 24 19:40:06 2006
+++ xoops2jp/html/modules/legacyRender/admin/forms/BannerFilterForm.class.php	Tue Apr 25 14:24:16 2006
@@ -21,7 +21,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',
@@ -52,6 +52,8 @@
 			$this->_mNavi->addExtra('htmlbanner', xoops_getrequest('htmlbanner'));
 			$this->_mCriteria->add(new Criteria('htmlbanner', array(XOBJ_DTYPE_BOOL, xoops_getrequest('htmlbanner'))));
 		}
+		
+		$this->_mCriteria->addSort($this->getSort(), $this->getOrder());
 	}
 }
 

From minahito ＠ users.sourceforge.jp  Tue Apr 25 14:25:57 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Tue, 25 Apr 2006 14:25:57 +0900
Subject: [xoops-cvslog 2891] CVS update:
	xoops2jp/html/modules/legacyRender/admin/templates
Message-ID: <20060425052557.0950E2AC298@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.2 xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.3
--- xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html:1.1.2.2	Tue Apr 25 14:17:39 2006
+++ xoops2jp/html/modules/legacyRender/admin/templates/bannerfinish_list.html	Tue Apr 25 14:25:56 2006
@@ -7,7 +7,6 @@
 
 <div style="text-align:right;">
   [ <a href="index.php?action=BannerList"><{$smarty.const._AD_LEGACYRENDER_LANG_BANNER_LIST}></a> ]
-  [ <a href="index.php?action=BannerfinishEdit"><{$smarty.const._AD_LEGACYRENDER_LANG_CREATE_NEW}></a> ]
 </div>
 <br/>
 

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:22:45 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:22:45 +0900
Subject: [xoops-cvslog 2892] CVS update: xoops2jp/html/modules/user
Message-ID: <20060427102245.8644E2AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/xoops_version.php
diff -u xoops2jp/html/modules/user/xoops_version.php:1.1.2.16 xoops2jp/html/modules/user/xoops_version.php:1.1.2.17
--- xoops2jp/html/modules/user/xoops_version.php:1.1.2.16	Wed Mar 29 22:52:01 2006
+++ xoops2jp/html/modules/user/xoops_version.php	Thu Apr 27 19:22:45 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: xoops_version.php,v 1.1.2.16 2006/03/29 13:52:01 nobunobu Exp $
+// $Id: xoops_version.php,v 1.1.2.17 2006/04/27 10:22:45 minahito Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -36,6 +36,9 @@
 $modversion['image'] = "images/user.gif";
 $modversion['dirname'] = "user";
 
+// SQL
+$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
+
 // Admin things
 $modversion['hasAdmin'] = 1;
 $modversion['adminindex'] = "admin/index.php";

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:23:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:23:10 +0900
Subject: [xoops-cvslog 2893] CVS update: xoops2jp/html/modules/user/.xml/data
Message-ID: <20060427102311.02C502AC535@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:23:14 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:23:14 +0900
Subject: [xoops-cvslog 2894] CVS update: xoops2jp/html/modules/user/.xml/data
Message-ID: <20060427102314.749832AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/.xml/data/mailjob.cbs.xml
diff -u /dev/null xoops2jp/html/modules/user/.xml/data/mailjob.cbs.xml:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:14 2006
+++ xoops2jp/html/modules/user/.xml/data/mailjob.cbs.xml	Thu Apr 27 19:23:14 2006
@@ -0,0 +1,15 @@
+鏤??xml version="1.0" encoding="utf-8"?>
+<cubson-mapping>
+  <class name="mailjob">
+    <id name="mailjob_id" type="XOBJ_DTYPE_INT" column="mailjob_id">
+      <generator type="increment" />
+    </id>
+    <property name="title" type="XOBJ_DTYPE_STRING" column="title" not-null="true" length="255" />
+    <property name="body" type="XOBJ_DTYPE_TEXT" column="body" not-null="true" />
+    <property name="from_name" type="XOBJ_DTYPE_STRING" column="from_name" not-null="false" length="255" />
+    <property name="from_email" type="XOBJ_DTYPE_STRING" column="from_email" not-null="false" length="255" />
+    <property name="is_pm" type="XOBJ_DTYPE_BOOL" column="is_pm" not-null="true" default="0" />
+    <property name="is_mail" type="XOBJ_DTYPE_BOOL" column="is_mail" not-null="true" default="0" />
+    <property name="create_unixtime" type="XOBJ_DTYPE_INT" column="create_unixtime" not-null="true" default="0" />
+  </class>
+</cubson-mapping>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:23:28 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:23:28 +0900
Subject: [xoops-cvslog 2895] CVS update: xoops2jp/html/modules/user/admin/.xml
Message-ID: <20060427102328.037502AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:27 2006
+++ xoops2jp/html/modules/user/admin/.xml/mailjob_edit.xml	Thu Apr 27 19:23:27 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="MailjobAdminEditForm" type="XCube_ActionForm">
+		<form-property name="mailjob_id" type="Int" />
+		<form-property name="title" type="String" />
+		<form-property name="body" type="Text" />
+		<form-property name="from_name" type="String" />
+		<form-property name="from_email" type="String" />
+		<form-property name="is_pm" type="Bool" />
+		<form-property name="is_mail" type="Bool" />
+	</form-bean>
+	<form-validation>
+		<field property="mailjob_id" depends="required">
+			<arg0 key="const._AD_USER_LANG_MAILJOB_ID" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+		</field>
+		<field property="title" depends="required,maxlength">
+			<arg0 key="const._AD_USER_LANG_TITLE" />
+			<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="255" />
+		</field>
+		<field property="body" depends="required">
+			<arg0 key="const._AD_USER_LANG_BODY" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+		</field>
+		<field property="from_name" depends="maxlength">
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+		<field property="from_email" depends="maxlength,email">
+			<arg1 name="maxlength" key="${var:maxlength}" />
+			<msg name="maxlength" key="const._AD_USER_ERROR_MAXLENGTH" />
+			<var name="maxlength" value="255" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:27 2006
+++ xoops2jp/html/modules/user/admin/.xml/mailjob_delete.xml	Thu Apr 27 19:23:27 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="MailjobAdminDeleteForm" type="XCube_ActionForm">
+		<form-property name="mailjob_id" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="mailjob_id" depends="required">
+			<arg0 key="const._AD_USER_LANG_MAILJOB_ID" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>
Index: xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml
diff -u /dev/null xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:27 2006
+++ xoops2jp/html/modules/user/admin/.xml/mailjob_send.xml	Thu Apr 27 19:23:27 2006
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xoopscube-dynaactionform>
+	<form-bean name="MailjobAdminSendForm" type="XCube_ActionForm">
+		<form-property name="mailjob_id" type="Int" />
+	</form-bean>
+	<form-validation>
+		<field property="mailjob_id" depends="required">
+			<arg0 key="const._AD_USER_LANG_MAILJOB_ID" />
+			<msg name="required" key="const._AD_USER_ERROR_REQUIRED" />
+		</field>
+	</form-validation>
+</xoopscube-dynaactionform>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:23:38 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:23:38 +0900
Subject: [xoops-cvslog 2896] CVS update:
	xoops2jp/html/modules/user/admin/actions
Message-ID: <20060427102338.7E29F2AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobListAction.class.php	Thu Apr 27 19:23:38 2006
@@ -0,0 +1,41 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+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/MailjobFilterForm.class.php";
+
+class User_MailjobListAction extends User_AbstractListAction
+{
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('mailjob');
+		return $handler;
+	}
+
+	function &_getFilterForm(&$navi)
+	{
+		$filter =& new User_MailjobFilterForm($navi);
+		return $filter;
+	}
+
+	function _getBaseUrl()
+	{
+		return "./index.php?action=MailjobList";
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("mailjob_list.html");
+		
+		foreach (array_keys($this->mObjects) as $key) {
+			$this->mObjects[$key]->loadUserCount();
+		}
+
+		$render->setAttribute("objects", $this->mObjects);
+		$render->setAttribute("pageNavi", $this->mNavi);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobSendAction.class.php	Thu Apr 27 19:23:38 2006
@@ -0,0 +1,87 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/MailjobAdminSendForm.class.php";
+
+class User_MailjobSendAction extends User_Action
+{
+	var $mMailjob = null;
+	var $mActionForm = null;
+	
+	function User_MailjobSendAction()
+	{
+	}
+
+	function prepare(&$controller, &$xoopsUser)
+	{
+		$id = intval(xoops_getrequest('mailjob_id'));
+		
+		$handler =& xoops_getmodulehandler('mailjob');
+		
+		$this->mMailjob =& $handler->get($id);
+
+		if (is_object($this->mMailjob)) {
+			$this->mActionForm =& new User_MailjobAdminSendForm();
+			$this->mActionForm->prepare();
+			$this->mActionForm->load($this->mMailjob);
+		}
+	}
+
+	function getDefaultView(&$controller, &$xoopsUser)
+	{
+		if (!is_object($this->mMailjob)) {
+			return USER_FRAME_VIEW_ERROR;
+		}
+
+		//
+		//
+		//
+		$this->mMailjob->loadUser();
+		
+		return USER_FRAME_VIEW_INPUT;
+	}
+
+	function execute(&$controller, &$xoopsUser)
+	{
+		if (!is_object($this->mMailjob)) {
+			return USER_FRAME_VIEW_ERROR;
+		}
+		
+		$this->mActionForm->fetch();
+		$this->mActionForm->validate();
+		
+		if ($this->mActionForm->hasError()) {
+			return USER_FRAME_VIEW_INPUT;
+		}
+		
+		$this->mMailjob->send($xoopsUser);
+		
+		$this->mMailjob->loadUserCount();
+		
+		return ($this->mMailjob->mCount > 0) ? USER_FRAME_VIEW_INPUT : USER_FRAME_VIEW_SUCCESS;
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward('./index.php?action=MailjobList');
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		XCube_Utils::redirectHeader('./index.php?action=MailjobList', 1, _AD_USER_ERROR_MAILJOB_SEND_FAIL);
+	}
+
+	function executeViewIndex(&$controller, &$xoopsUser, &$render)
+	{
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("mailjob_send.html");
+		$render->setAttribute('object', $this->mMailjob);
+		$render->setAttribute('actionForm', $this->mActionForm);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobEditAction.class.php	Thu Apr 27 19:23:38 2006
@@ -0,0 +1,78 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractEditAction.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/MailjobAdminEditForm.class.php";
+require_once XOOPS_MODULE_PATH . "/user/class/PageNavigator.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/UserSearchFilterForm.class.php";
+
+class User_MailjobEditAction extends User_AbstractEditAction
+{
+	var $mPageNavi = null;
+	var $mFilter = null;
+	
+	function _getId()
+	{
+		return isset($_REQUEST['mailjob_id']) ? $_REQUEST['mailjob_id'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('mailjob');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new User_MailjobAdminEditForm();
+		$this->mActionForm->prepare();
+
+		$this->mPageNavi =& new User_PageNavigator('./index?action=MailjobEdit', 0, XCUBE_PAGENAVI_START | XCUBE_PAGENAVI_PERPAGE);
+		$this->mFilter =& new User_UserSearchFilterForm($this->mPageNavi);
+		
+		$this->mFilter->fetch();
+	}
+	
+	function execute(&$controller, &$xoopsUser)
+	{
+		$isNew = $this->mObject->isNew();
+		
+		$ret = parent::execute($controller, $xoopsUser);
+		
+		if ($ret == USER_FRAME_VIEW_SUCCESS && $isNew) {
+			$handler =& xoops_getmodulehandler('users');
+			$uidArr = $handler->getUids($this->mFilter->getCriteria());
+			
+			$handler =& xoops_getmodulehandler('mailjob_link');
+			foreach ($uidArr as $uid) {
+				$obj =& $handler->create();
+				$obj->set('mailjob_id', $this->mObject->get('mailjob_id'));
+				$obj->set('uid', $uid);
+				$handler->insert($obj);
+			}
+		}
+		
+		return $ret;
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("mailjob_edit.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		$render->setAttribute('pageNavi', $this->mPageNavi);
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=MailjobList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:23:38 2006
+++ xoops2jp/html/modules/user/admin/actions/MailjobDeleteAction.class.php	Thu Apr 27 19:23:38 2006
@@ -0,0 +1,46 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractDeleteAction.class.php";
+require_once XOOPS_MODULE_PATH . "/user/admin/forms/MailjobAdminDeleteForm.class.php";
+
+class User_MailjobDeleteAction extends User_AbstractDeleteAction
+{
+	function _getId()
+	{
+		return isset($_REQUEST['mailjob_id']) ? $_REQUEST['mailjob_id'] : 0;
+	}
+
+	function &_getHandler()
+	{
+		$handler =& xoops_getmodulehandler('mailjob');
+		return $handler;
+	}
+
+	function _setupActionForm()
+	{
+		$this->mActionForm =& new User_MailjobAdminDeleteForm();
+		$this->mActionForm->prepare();
+	}
+
+	function executeViewInput(&$controller, &$xoopsUser, &$render)
+	{
+		$render->setTemplateName("mailjob_delete.html");
+		$render->setAttribute('actionForm', $this->mActionForm);
+		#cubson::lazy_load('mailjob', $this->mObject);
+		$render->setAttribute('object', $this->mObject);
+	}
+
+	function executeViewSuccess(&$controller, &$xoopsUser, &$render)
+	{
+		$controller->executeForward("./index.php?action=MailjobList");
+	}
+
+	function executeViewError(&$controller, &$xoopsUser, &$render)
+	{
+		redirect_header("./index.php?action=MailjobList", 1, _AD_USER_ERROR_DBUPDATE_FAILED);
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:24:00 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:24:00 +0900
Subject: [xoops-cvslog 2897] CVS update: xoops2jp/html/modules/user/admin/forms
Message-ID: <20060427102400.7127E2AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminDeleteForm.class.php	Thu Apr 27 19:24:00 2006
@@ -0,0 +1,42 @@
+<?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 User_MailjobAdminDeleteForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.MailjobAdminDeleteForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['mailjob_id'] =& new XCube_IntProperty('mailjob_id');
+	
+		//
+		// 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);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('mailjob_id', $obj->get('mailjob_id'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('mailjob_id', $this->get('mailjob_id'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminSendForm.class.php	Thu Apr 27 19:24:00 2006
@@ -0,0 +1,37 @@
+<?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 User_MailjobAdminSendForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.MailjobAdminSendForm.TOKEN";
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['mailjob_id'] =& new XCube_IntProperty('mailjob_id');
+	
+		//
+		// 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);
+	}
+
+	function load(&$obj)
+	{
+		$this->set('mailjob_id', $obj->get('mailjob_id'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php:1.1.2.1
--- /dev/null	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobAdminEditForm.class.php	Thu Apr 27 19:24:00 2006
@@ -0,0 +1,97 @@
+<?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 User_MailjobAdminEditForm extends XCube_ActionForm
+{
+	function getTokenName()
+	{
+		return "module.user.MailjobAdminEditForm.TOKEN" . $this->get('mailjob_id');
+	}
+
+	function prepare()
+	{
+		//
+		// Set form properties
+		//
+		$this->mFormProperties['mailjob_id'] =& new XCube_IntProperty('mailjob_id');
+		$this->mFormProperties['title'] =& new XCube_StringProperty('title');
+		$this->mFormProperties['body'] =& new XCube_TextProperty('body');
+		$this->mFormProperties['from_name'] =& new XCube_StringProperty('from_name');
+		$this->mFormProperties['from_email'] =& new XCube_StringProperty('from_email');
+		$this->mFormProperties['is_pm'] =& new XCube_BoolProperty('is_pm');
+		$this->mFormProperties['is_mail'] =& new XCube_BoolProperty('is_mail');
+	
+		//
+		// 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);
+	
+		$this->mFieldProperties['title'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['title']->setDependsByArray(array('required','maxlength'));
+		$this->mFieldProperties['title']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_TITLE, '255');
+		$this->mFieldProperties['title']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, _AD_USER_LANG_TITLE, '255');
+		$this->mFieldProperties['title']->addVar('maxlength', '255');
+	
+		$this->mFieldProperties['body'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['body']->setDependsByArray(array('required'));
+		$this->mFieldProperties['body']->addMessage('required', _AD_USER_ERROR_REQUIRED, _AD_USER_LANG_BODY);
+	
+		$this->mFieldProperties['from_name'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['from_name']->setDependsByArray(array('maxlength'));
+		$this->mFieldProperties['from_name']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255');
+		$this->mFieldProperties['from_name']->addVar('maxlength', '255');
+	
+		$this->mFieldProperties['from_email'] =& new XCube_FieldProperty($this);
+		$this->mFieldProperties['from_email']->setDependsByArray(array('maxlength', 'email'));
+		$this->mFieldProperties['from_email']->addMessage('maxlength', _AD_USER_ERROR_MAXLENGTH, '255');
+		$this->mFieldProperties['from_email']->addVar('maxlength', '255');
+		$this->mFieldProperties['from_email']->addMessage('email', _AD_USER_ERROR_EMAIL, _AD_USER_LANG_FROM_EMAIL);
+	}
+	
+	function validateFrom_email()
+	{
+		if ($this->get('is_mail') && strlen($this->get('from_email')) == 0) {
+			$this->addErrorMessage(XCube_Utils::formatMessage(_AD_USER_ERROR_REQUIRED, _AD_USER_LANG_FROM_EMAIL));
+		}
+	}
+	
+	function validate()
+	{
+		parent::validate();
+		
+		if (!$this->get('is_pm') && !$this->get('is_mail')) {
+			$this->addErrorMessage(_AD_USER_ERROR_MAILJOB_SEND_MEANS);
+		}
+	}
+
+	function load(&$obj)
+	{
+		$this->set('mailjob_id', $obj->get('mailjob_id'));
+		$this->set('title', $obj->get('title'));
+		$this->set('body', $obj->get('body'));
+		$this->set('from_name', $obj->get('from_name'));
+		$this->set('from_email', $obj->get('from_email'));
+		$this->set('is_pm', $obj->get('is_pm'));
+		$this->set('is_mail', $obj->get('is_mail'));
+	}
+
+	function update(&$obj)
+	{
+		$obj->set('mailjob_id', $this->get('mailjob_id'));
+		$obj->set('title', $this->get('title'));
+		$obj->set('body', $this->get('body'));
+		$obj->set('from_name', $this->get('from_name'));
+		$obj->set('from_email', $this->get('from_email'));
+		$obj->set('is_pm', $this->get('is_pm'));
+		$obj->set('is_mail', $this->get('is_mail'));
+	}
+}
+
+?>
Index: xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php
diff -u /dev/null xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php:1.1.2.3
--- /dev/null	Thu Apr 27 19:24:00 2006
+++ xoops2jp/html/modules/user/admin/forms/MailjobFilterForm.class.php	Thu Apr 27 19:24:00 2006
@@ -0,0 +1,64 @@
+<?php
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+require_once XOOPS_MODULE_PATH . "/user/class/AbstractFilterForm.class.php";
+
+define('MAILJOB_SORT_KEY_MAILJOB_ID', 1);
+define('MAILJOB_SORT_KEY_TITLE', 2);
+define('MAILJOB_SORT_KEY_BODY', 3);
+define('MAILJOB_SORT_KEY_FROM_NAME', 4);
+define('MAILJOB_SORT_KEY_FROM_EMAIL', 5);
+define('MAILJOB_SORT_KEY_IS_PM', 6);
+define('MAILJOB_SORT_KEY_IS_MAIL', 7);
+define('MAILJOB_SORT_KEY_CREATE_UNIXTIME', 8);
+define('MAILJOB_SORT_KEY_MAXVALUE', 8);
+
+define('MAILJOB_SORT_KEY_DEFAULT', -MAILJOB_SORT_KEY_CREATE_UNIXTIME);
+
+class User_MailjobFilterForm extends User_AbstractFilterForm
+{
+	var $mSort = 0;
+	var $mSortKeys = array(
+		MAILJOB_SORT_KEY_MAILJOB_ID => 'mailjob_id',
+		MAILJOB_SORT_KEY_TITLE => 'title',
+		MAILJOB_SORT_KEY_BODY => 'body',
+		MAILJOB_SORT_KEY_FROM_NAME => 'from_name',
+		MAILJOB_SORT_KEY_FROM_EMAIL => 'from_email',
+		MAILJOB_SORT_KEY_IS_PM => 'is_pm',
+		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) {
+			$this->mSort = MAILJOB_SORT_KEY_DEFAULT;
+		}
+	
+		if (isset($_REQUEST['title'])) {
+			//
+			// TODO like
+			//
+			$this->_mNavi->addExtra('title', xoops_getrequest('title'));
+			$this->_mCriteria->add(new Criteria('title', array(XOBJ_DTYPE_STRING, xoops_getrequest('title'))));
+		}
+	
+		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'))));
+		}
+	
+		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->addSort($this->getSort(), $this->getOrder());
+	}
+}
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:24:27 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:24:27 +0900
Subject: [xoops-cvslog 2898] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060427102427.AD2862AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/templates/mailjob_edit.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/mailjob_edit.html:1.1.2.4
--- /dev/null	Thu Apr 27 19:24:27 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_edit.html	Thu Apr 27 19:24:27 2006
@@ -0,0 +1,72 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=MailjobList"><{$smarty.const._AD_USER_LANG_MAILJOB_LIST}></a>
+  <{if $actionForm->get('mailjob_id')}>
+    &raquo;&raquo; <{$smarty.const._AD_USER_LANG_MAILJOB_EDIT}>
+  <{else}>
+    &raquo;&raquo; <{$smarty.const._AD_USER_LANG_MAILJOB_NEW}>
+  <{/if}>
+</div>
+
+  <{if $actionForm->get('mailjob_id')}>
+    <h3><{$smarty.const._AD_USER_LANG_MAILJOB_EDIT}></h3>
+  <{else}>
+    <h3><{$smarty.const._AD_USER_LANG_MAILJOB_NEW}></h3>
+  <{/if}>
+
+<{if $actionForm->hasError()}>
+  <ul>
+    <{foreach item=message from=$actionForm->getErrorMessages()}>
+      <li><{$message|escape}></li>
+    <{/foreach}>
+  </ul>
+<{/if}>
+<form action="index.php?action=MailjobEdit" method="post">
+  <{xoops_token form=$actionForm}>
+  <{xoops_input type=hidden name=mailjob_id value=$actionForm->get('mailjob_id')}>
+  <{$pageNavi->renderHidden()}>
+  <table class="outer" cellspacing="1">
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=title value=$actionForm->get('title') size=32 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_BODY}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_dhtmltarea type=text name=body value=$actionForm->get('body') rows=10}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_FROM_NAME}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=from_name value=$actionForm->get('from_name') size=32 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=text name=from_email value=$actionForm->get('from_email') size=32 maxlength=255}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_IS_PM}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=checkbox name=is_pm value=1 default=$actionForm->get('is_pm')}>
+      </td>
+    </tr>
+    <tr>
+      <th><{$smarty.const._AD_USER_LANG_IS_MAIL}></th>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input type=checkbox name=is_mail value=1 default=$actionForm->get('is_mail')}>
+      </td>
+    </tr>
+    <tr class="foot">
+      <td colspan="2" style="text-align:center;">
+        <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>
+</form>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_delete.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/mailjob_delete.html:1.1.2.1
--- /dev/null	Thu Apr 27 19:24:27 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_delete.html	Thu Apr 27 19:24:27 2006
@@ -0,0 +1,54 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=MailjobList"><{$smarty.const._AD_USER_LANG_MAILJOB_LIST}></a>
+  &raquo;&raquo; <{$smarty.const._AD_USER_LANG_MAILJOB_DELETE}>
+</div>
+
+  <h3><{$smarty.const._AD_USER_LANG_MAILJOB_DELETE}></h3>
+
+<p><{$smarty.const._AD_USER_MESSAGE_CONFIRM_DELETE}></p>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_BODY}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_FROM_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_IS_PM}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_IS_MAIL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('create_unixtime')|xoops_formattimestamp:l}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=MailjobDelete" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=mailjob_id value=$actionForm->get('mailjob_id')}>
+          <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
+          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_list.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/mailjob_list.html:1.1.2.3
--- /dev/null	Thu Apr 27 19:24:27 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_list.html	Thu Apr 27 19:24:27 2006
@@ -0,0 +1,53 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=MailjobList"><{$smarty.const._AD_USER_LANG_MAILJOB_LIST}></a>
+</div>
+
+<h3><{$smarty.const._AD_USER_LANG_MAILJOB_LIST}></h3>
+
+<div style="text-align:right;">[ <a href="index.php?action=UserSearch"><{$smarty.const._AD_USER_LANG_CREATE_NEW}></a> ]</div>
+<br/>
+
+<table class="outer" cellspacing="1">
+  <tr>
+    <th><{$smarty.const._AD_USER_LANG_MAILJOB_ID}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_MAILJOB_ID}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_MAILJOB_ID}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_TITLE}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_TITLE}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_TITLE}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_IS_PM}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_IS_PM}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_IS_PM}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_IS_MAIL}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_IS_MAIL}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_IS_MAIL}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}><br />
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=<{$smarty.const.MAILJOB_SORT_KEY_CREATE_UNIXTIME}>"><img src="<{"icons/up.gif"|theme}>" alt="<{$smarty.const._ASCENDING}>" /></a>
+      <a href="<{$pageNavi->renderSortUrl()}>&amp;sort=-<{$smarty.const.MAILJOB_SORT_KEY_CREATE_UNIXTIME}>"><img src="<{"icons/down.gif"|theme}>" alt="<{$smarty.const._DESCENDING}>" /></a></th>
+    <th><{$smarty.const._AD_USER_LANG_LEFT_TARGET_USER}></th>
+    <th><{$smarty.const._AD_USER_LANG_CONTROL}></th>
+  </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>
+        <{if $obj->mUserCount > 0}>
+          <span style='color:red;'><{$obj->mUserCount|escape}></span>
+        <{else}>
+          <{$smarty.const._AD_USER_LANG_COMPLETED}>
+        <{/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}>" /></a>
+        <a href="./index.php?action=MailjobDelete&amp;mailjob_id=<{$obj->getVar('mailjob_id')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+      </td>
+    </tr>
+  <{/foreach}>
+</table>
+<br />
+<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div>
Index: xoops2jp/html/modules/user/admin/templates/mailjob_send.html
diff -u /dev/null xoops2jp/html/modules/user/admin/templates/mailjob_send.html:1.1.2.1
--- /dev/null	Thu Apr 27 19:24:27 2006
+++ xoops2jp/html/modules/user/admin/templates/mailjob_send.html	Thu Apr 27 19:24:27 2006
@@ -0,0 +1,57 @@
+<div class="adminnavi">
+  <a href="./index.php"><{$smarty.const._MI_USER_NAME}></a>
+  &raquo;&raquo; <a href="./index.php?action=MailjobList"><{$smarty.const._AD_USER_LANG_MAILJOB_LIST}></a>
+    &raquo;&raquo; <{$smarty.const._AD_USER_LANG_MAILJOB_SEND}>
+</div>
+
+<h3><{$smarty.const._AD_USER_LANG_MAILJOB_SEND}></h3>
+
+<div class="tips">
+  <{$smarty.const._AD_USER_TIPS_MAILJOB_SEND}>
+</div>
+
+<table class="outer" cellspacing="1">
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_MAILJOB_ID}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('mailjob_id')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_TITLE}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_BODY}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('body')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_FROM_NAME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_name')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_FROM_EMAIL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('from_email')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_IS_PM}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_pm')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_IS_MAIL}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->getVar('is_mail')}></td>
+    </tr>
+    <tr>
+      <th style="width:30%;"><{$smarty.const._AD_USER_LANG_CREATE_UNIXTIME}></th>
+      <td class="<{cycle values="odd,even"}>"><{$object->get('create_unixtime')|xoops_formattimestamp:l}></td>
+    </tr>
+    <tr>
+      <td class="foot" colspan="2" style="text-align:center;"><br />
+        <form action="./index.php?action=MailjobSend" method="POST">
+          <{xoops_token form=$actionForm}>
+          <{xoops_input type=hidden name=mailjob_id value=$actionForm->get('mailjob_id')}>
+          <input type="submit" value="<{$smarty.const._SEND}>" class="formButton" />
+          <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+        </form>
+      </td>
+    </tr>
+</table>
+

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:25:10 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:25:10 +0900
Subject: [xoops-cvslog 2899] CVS update:
	xoops2jp/html/modules/user/admin/templates
Message-ID: <20060427102510.A79C82AC535@users.sourceforge.jp>

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.4 xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.5
--- xoops2jp/html/modules/user/admin/templates/user_search_list.html:1.1.2.4	Thu Apr 13 00:31:39 2006
+++ xoops2jp/html/modules/user/admin/templates/user_search_list.html	Thu Apr 27 19:25:10 2006
@@ -6,7 +6,10 @@
 
 <h3><{$smarty.const._AD_USER_LANG_USER_SEARCH_LIST}></h3>
 
-<div class="toptab">[ <a href="<{$pageNavi->getRenderOtherUrl('./index.php?action=UserSearch')}>"><{$smarty.const._AD_USER_LANG_SEARCH_AGAIN}></a> ]</div>
+<div class="toptab">
+  [ <a href="<{$pageNavi->getRenderOtherUrl('./index.php?action=UserSearch')}>"><{$smarty.const._AD_USER_LANG_SEARCH_AGAIN}></a> ]
+  [ <a href="<{$pageNavi->getRenderOtherUrl('./index.php?action=MailjobEdit')}>"><{$smarty.const._AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION}></a> ]
+</div>
 
 <table class="outer">
   <tr>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:25:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:25:47 +0900
Subject: [xoops-cvslog 2900] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060427102547.D12292AC535@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/mailjob_link.php
diff -u xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.2 xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.3
--- xoops2jp/html/modules/user/class/mailjob_link.php:1.1.2.2	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/mailjob_link.php	Thu Apr 27 19:25:47 2006
@@ -6,16 +6,15 @@
 {
 	function UserMailjob_linkObject()
 	{
-		$this->initVar('lid', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('id', XOBJ_DTYPE_INT, '0', true);
+		$this->initVar('mailjob_id', XOBJ_DTYPE_INT, '0', true);
 		$this->initVar('uid', XOBJ_DTYPE_INT, '0', true);
 	}
 }
 
 class UserMailjob_linkHandler extends XoopsObjectGenericHandler
 {
-	var $mTable = "mailjob_link";
-	var $mPrimary = "lid";
+	var $mTable = "user_mailjob_link";
+	var $mPrimary = "mailjob_id";
 	var $mClass = "UserMailjob_linkObject";
 }
 

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:26:11 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:26:11 +0900
Subject: [xoops-cvslog 2901] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060427102611.70D892AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/mailjob.php
diff -u xoops2jp/html/modules/user/class/mailjob.php:1.1.2.3 xoops2jp/html/modules/user/class/mailjob.php:1.1.2.4
--- xoops2jp/html/modules/user/class/mailjob.php:1.1.2.3	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/mailjob.php	Thu Apr 27 19:26:11 2006
@@ -4,28 +4,147 @@
 
 class UserMailjobObject extends XoopsSimpleObject
 {
+	var $mUsers = array();
+	var $_mUsersLoadedFlag = false;
+	var $mUserCount = 0;
+	
 	function UserMailjobObject()
 	{
-		$this->initVar('id', XOBJ_DTYPE_INT, '', true);
-		$this->initVar('lastlogin', XOBJ_DTYPE_INT, '', false);
-		$this->initVar('lastlogin_flag', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('mailok', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('activeuser', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('registdate', XOBJ_DTYPE_INT, '0', false);
-		$this->initVar('registdate_flag', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('sender', XOBJ_DTYPE_STRING, '', false, 255);
-		$this->initVar('email', XOBJ_DTYPE_STRING, '', false, 255);
-		$this->initVar('subject', XOBJ_DTYPE_STRING, '', true, 255);
+		$this->initVar('mailjob_id', XOBJ_DTYPE_INT, '', false);
+		$this->initVar('title', XOBJ_DTYPE_STRING, '', true, 255);
 		$this->initVar('body', XOBJ_DTYPE_TEXT, '', true);
-		$this->initVar('by_pm', XOBJ_DTYPE_BOOL, '0', true);
-		$this->initVar('by_email', XOBJ_DTYPE_BOOL, '0', true);
+		$this->initVar('from_name', XOBJ_DTYPE_STRING, '', false, 255);
+		$this->initVar('from_email', XOBJ_DTYPE_STRING, '', false, 255);
+		$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);
+	}
+
+	/**
+	 * Count the number of target users, and set it to mUserCount. 
+	 */	
+	function loadUserCount()
+	{
+		$handler =& xoops_getmodulehandler('mailjob_link', 'user');
+		$this->mUserCount = $handler->getCount(new Criteria('mailjob_id', $this->get('mailjob_id')));
+	}
+	
+	/**
+	 * Load the uid list of target users.
+	 */
+	function loadUser()
+	{
+		if (!$this->_mUsersLoadedFlag) {
+			$handler =& xoops_getmodulehandler('mailjob_link', 'user');
+			$this->mUsers =& $handler->getObjects(new Criteria('mailjob_id', $this->get('mailjob_id')));
+			$this->_mUsersLoadedFlag = true;
+		}
+	}
+	
+	function send($from_user)
+	{
+		$root =& XCube_Root::getSingleton();
+		
+		$root->mEventManager->add("Module.User.Mailjob.ReplaceBody", new XCube_InstanceDelegate($this, "getReplaceBody"));
+
+		if ($this->get('is_pm')) {
+			$root->mEventManager->add("Module.User.Mailjob.Send", new XCube_InstanceDelegate($this, "sendPM"));
+		}
+		
+		$this->loadUser();
+		$handler =& xoops_getmodulehandler('mailjob_link', 'user');
+
+		$userHandler =& xoops_gethandler('user');
+		
+		foreach ($this->mUsers as $link) {
+			$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);
+			}
+			
+			$handler->delete($link);
+		}
+	}
+	
+	function getReplaceBody(&$sender, &$eventArgs)
+	{
+		//
+		// 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}
+	}
+	
+	function sendPM(&$sender, &$eventArgs)
+	{
+		$root =& XCube_Root::getSingleton();
+		$serviceMgr =& $root->getServiceManager();
+		$pmService =& $serviceMgr->searchXCubeService('PrivateMessage');
+		
+		$pmClient =& new XCube_ServiceClient($pmService);
+		
+		//
+		// 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);
+		
+		$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);
+	}
+
+	function sendMail(&$sender, &$eventArgs)
+	{
+		$root =& XCube_Root::getSingleton();
+		$serviceMgr =& $root->getServiceManager();
+		$pmService =& $serviceMgr->searchXCubeService('PrivateMessage');
+		
+		$pmClient =& new XCube_ServiceClient($pmService);
+		
+		//
+		// 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);
+		
+		$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);
 	}
 }
 
 class UserMailjobHandler extends XoopsObjectGenericHandler
 {
 	var $mTable = "user_mailjob";
-	var $mPrimary = "id";
+	var $mPrimary = "mailjob_id";
 	var $mClass = "UserMailjobObject";
 }
 

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:26:21 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:26:21 +0900
Subject: [xoops-cvslog 2902] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060427102621.EA7982AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/PageNavigator.class.php
diff -u xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.3 xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.4
--- xoops2jp/html/modules/user/class/PageNavigator.class.php:1.1.2.3	Tue Apr 11 18:17:07 2006
+++ xoops2jp/html/modules/user/class/PageNavigator.class.php	Thu Apr 27 19:26:21 2006
@@ -23,11 +23,10 @@
 		$ret = null;
 	
 		foreach ($this->mExtra as $key => $value) {
-		}
-	
-		if (!isset($mask[$key])) {
-			$value = htmlspecialchars($value, ENT_QUOTES);
-			$ret .= "<input type=\"hidden\" name=\"${key}\" value=\"${value}\" />";
+			if (!isset($mask[$key])) {
+				$value = htmlspecialchars($value, ENT_QUOTES);
+				$ret .= "<input type=\"hidden\" name=\"${key}\" value=\"${value}\" />";
+			}
 		}
 	
 		return $ret;

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:26:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:26:39 +0900
Subject: [xoops-cvslog 2903] CVS update: xoops2jp/html/modules/user/class
Message-ID: <20060427102639.AF0A02AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/class/users.php
diff -u xoops2jp/html/modules/user/class/users.php:1.1.2.2 xoops2jp/html/modules/user/class/users.php:1.1.2.3
--- xoops2jp/html/modules/user/class/users.php:1.1.2.2	Tue Mar 28 22:32:03 2006
+++ xoops2jp/html/modules/user/class/users.php	Thu Apr 27 19:26:39 2006
@@ -74,6 +74,56 @@
 			}
 		}
 	}
+
+	/**
+	 * 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)
+	{
+		$ret = array();
+
+		$sql = "SELECT uid FROM " . $this->mTable;
+		
+		$limit = 0;
+		$start = 0;
+
+		if($criteria !== null && is_a($criteria, 'CriteriaElement')) {
+			$where = $this->_makeCriteria4sql($criteria);
+			
+			if (trim($where)) {
+				$sql .= " WHERE ".$where;
+			}
+			
+			$sorts = array();
+			foreach ($criteria->getSorts() as $sort) {
+				$sorts[] = $sort['sort'] . ' ' . $sort['order'];
+			}
+			if ($criteria->getSort() != '') {
+				$sql .= " ORDER BY " . implode(',', $sorts);
+			}
+			
+			$limit=$criteria->getLimit();
+			$start=$criteria->getStart();
+			
+			$ret =& $this->_getObjects($sql, $limit, $start, $param1);
+		}
+		else {
+			$limit = $param1;
+			$start = $param2;
+		}
+		
+		$result = $this->db->query($sql, $limit, $start);
+		if (!$result) {
+			return $ret;
+		}
+		
+		while ($row = $this->db->fetchArray($result)) {
+			$ret[] = $row['uid'];
+		}
+		
+		return $ret;
+	}
 	
 	function insert(&$user, $force = false)
 	{

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:26:53 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:26:53 +0900
Subject: [xoops-cvslog 2904] CVS update:
	xoops2jp/html/modules/user/language/english
Message-ID: <20060427102654.01CBA2AC539@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.15 xoops2jp/html/modules/user/language/english/admin.php:1.1.2.16
--- xoops2jp/html/modules/user/language/english/admin.php:1.1.2.15	Sat Apr 15 13:41:17 2006
+++ xoops2jp/html/modules/user/language/english/admin.php	Thu Apr 27 19:26:53 2006
@@ -2,12 +2,16 @@
 
 define('_AD_USER_ERROR_AVATAR_EXTENSION', "A injury file is uploaded.");
 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.");
 define('_AD_USER_ERROR_IMAGE_REQUIRED', "You must select a image file.");
 define('_AD_USER_ERROR_INJURY', "The specified value {0} is wrong.");
 define('_AD_USER_ERROR_INJURY_MIN_MAX', "Relationship between minimum value and maximum value is wrong.");
 define('_AD_USER_ERROR_INJURY_SPECIAL', "Value of the special rank is wrong.");
 define('_AD_USER_ERROR_INTRANGE', "intRange");
+define('_AD_USER_ERROR_MAILJOB_SEND_ERROR', "Mailjob send error");
+define('_AD_USER_ERROR_MAILJOB_SEND_FAIL', "Mailjob send fail");
+define('_AD_USER_ERROR_MAILJOB_SEND_MEANS', "Mailjob send means");
 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.");
@@ -40,14 +44,18 @@
 define('_AD_USER_LANG_BODY', "Body");
 define('_AD_USER_LANG_BY_EMAIL', "Sent by email");
 define('_AD_USER_LANG_BY_PM', "Sent by PM");
+define('_AD_USER_LANG_COMPLETED', "Completed");
 define('_AD_USER_LANG_CONTROL', "Control");
 define('_AD_USER_LANG_CREATE_NEW', "Create new");
+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_DISPLAY_USER_LEVEL', "Display user level");
 define('_AD_USER_LANG_DISPLAY_USER_MAIL_CONDITION', "Display user mail condition");
 define('_AD_USER_LANG_EDIT', "Edit");
 define('_AD_USER_LANG_EMAIL', "Email address");
+define('_AD_USER_LANG_FROM_EMAIL', "from email");
+define('_AD_USER_LANG_FROM_NAME', "from name");
 define('_AD_USER_LANG_GROUP', "Group");
 define('_AD_USER_LANG_GROUP_AMMO', "Count");
 define('_AD_USER_LANG_GROUP_ASSIGN', "Assign a member");
@@ -67,14 +75,23 @@
 define('_AD_USER_LANG_GROUP_TYPE', "Type");
 define('_AD_USER_LANG_GROUPID', "Group ID");
 define('_AD_USER_LANG_ID', "ID");
+define('_AD_USER_LANG_IS_MAIL', "is mail");
+define('_AD_USER_LANG_IS_PM', "is pm");
 define('_AD_USER_LANG_LAST_LOGIN', "Last login");
 define('_AD_USER_LANG_LASTLOG_LESS', "Last login is less than <strong>X</strong> days ago");
 define('_AD_USER_LANG_LASTLOG_MORE', "Last login is more than <strong>X</strong> days ago");
 define('_AD_USER_LANG_LASTLOGIN', "Last login");
 define('_AD_USER_LANG_LASTLOGIN_FLAG', "Last Login Flag");
+define('_AD_USER_LANG_LEFT_TARGET_USER', "Left target user");
 define('_AD_USER_LANG_LEVEL', "Level");
 define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "Only users that don't accept mail ");
 define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "Only users that accept mail");
+define('_AD_USER_LANG_MAILJOB_DELETE', "Mailjob delete");
+define('_AD_USER_LANG_MAILJOB_EDIT', "Mailjob edit");
+define('_AD_USER_LANG_MAILJOB_ID', "mailjob id");
+define('_AD_USER_LANG_MAILJOB_LIST', "Mailjob list");
+define('_AD_USER_LANG_MAILJOB_NEW', "Mailjob new");
+define('_AD_USER_LANG_MAILJOB_SEND', "Mailjob send");
 define('_AD_USER_LANG_MAILOK', "Receive occasional email notices from administrators and moderators?");
 define('_AD_USER_LANG_NAME', "Real name");
 define('_AD_USER_LANG_NO_SPECIAL_RANK', "--------------");
@@ -110,12 +127,14 @@
 define('_AD_USER_LANG_REGISTDATE', "Registered date");
 define('_AD_USER_LANG_REGISTDATE_FLAG', "Registered date flag");
 define('_AD_USER_LANG_SEARCH_AGAIN', "Search again");
+define('_AD_USER_LANG_SEND_MAIL_BY_THIS_CONDITION', "Send mail by this condition");
 define('_AD_USER_LANG_SENDER', "Sender");
 define('_AD_USER_LANG_SUBJECT', "Subject");
 define('_AD_USER_LANG_SUBMIT', "Submit");
 define('_AD_USER_LANG_SYSTEM_AVATAR', "System avatar");
 define('_AD_USER_LANG_THEME', "theme");
 define('_AD_USER_LANG_TIMEZONE_OFFSET', "TimeZone");
+define('_AD_USER_LANG_TITLE', "title");
 define('_AD_USER_LANG_UID', "UID");
 define('_AD_USER_LANG_UMODE', "Comments Display Mode");
 define('_AD_USER_LANG_UNAME', "User name");
@@ -147,5 +166,6 @@
 define('_AD_USER_MESSAGE_DELETE_RANK_SUCCESS', "The user rank has been deleted.");
 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");
 
 ?>
Index: xoops2jp/html/modules/user/language/english/modinfo.php
diff -u xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.10 xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.11
--- xoops2jp/html/modules/user/language/english/modinfo.php:1.1.2.10	Tue Apr 11 18:17:23 2006
+++ xoops2jp/html/modules/user/language/english/modinfo.php	Thu Apr 27 19:26:53 2006
@@ -4,6 +4,7 @@
 define('_MI_USER_ADMENU_GROUP_LIST', "Group Management");
 define('_MI_USER_ADMENU_LIST', "User Management");
 define('_MI_USER_ADMENU_MAIL', "Mail Users");
+define('_MI_USER_ADMENU_MAILJOB_MANAGE', "Mailjob manage");
 define('_MI_USER_ADMENU_NEW_RANK', "Add a New Rank");
 define('_MI_USER_ADMENU_RANK_LIST', "User Rank Manager");
 define('_MI_USER_ADMENU_SEARCH', "Find a User");
@@ -55,8 +56,13 @@
 define('_MI_USER_KEYWORD_CREATE_RANK', "create rank");
 define('_MI_USER_KEYWORD_CREATE_USER', "Create user");
 define('_MI_USER_KEYWORD_GROUP_LIST', "list edit modify delete user permission add remove member");
+define('_MI_USER_KEYWORD_MAILJOB_CREATE', "Mailjob create");
+define('_MI_USER_KEYWORD_MAILJOB_LIST', "Mailjob list");
+define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage");
 define('_MI_USER_KEYWORD_USER_LIST', "user list");
 define('_MI_USER_KEYWORD_USER_SEARCH', "User search");
+define('_MI_USER_LANG_MAILJOB_CREATE', "Mailjob create");
+define('_MI_USER_LANG_MAILJOB_LIST', "Mailjob list");
 define('_MI_USER_MENU_CREATE_AVATAR', "Create avatar");
 define('_MI_USER_MENU_CREATE_GROUP', "Create group");
 define('_MI_USER_MENU_CREATE_RANK', "user rank create new");

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:27:02 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:27:02 +0900
Subject: [xoops-cvslog 2905] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060427102702.906E62AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/modinfo.php
diff -u xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.13 xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.14
--- xoops2jp/html/modules/user/language/japanese/modinfo.php:1.1.2.13	Tue Apr 11 18:17:24 2006
+++ xoops2jp/html/modules/user/language/japanese/modinfo.php	Thu Apr 27 19:27:02 2006
@@ -4,6 +4,7 @@
 define('_MI_USER_ADMENU_GROUP_LIST', "ユーザーグループ管理");
 define('_MI_USER_ADMENU_LIST', "ユーザー管理");
 define('_MI_USER_ADMENU_MAIL', "一斉メール送信");
+define('_MI_USER_ADMENU_MAILJOB_MANAGE', "メールジョブ管理");
 define('_MI_USER_ADMENU_NEW_RANK', "ユーザーランク新規登録");
 define('_MI_USER_ADMENU_RANK_LIST', "ユーザーランク管理");
 define('_MI_USER_ADMENU_SEARCH', "ユーザー検索");
@@ -55,8 +56,13 @@
 define('_MI_USER_KEYWORD_CREATE_RANK', "ランク ユーザーランク");
 define('_MI_USER_KEYWORD_CREATE_USER', "新規登録");
 define('_MI_USER_KEYWORD_GROUP_LIST', "グループ 一覧 リスト 編集 変更  削除 ユーザー ユーザグループ 権限 パーミッション 追加 メンバー");
+define('_MI_USER_KEYWORD_MAILJOB_CREATE', "Mailjob create");
+define('_MI_USER_KEYWORD_MAILJOB_LIST', "Mailjob list");
+define('_MI_USER_KEYWORD_MAILJOB_MANAGE', "Mailjob manage");
 define('_MI_USER_KEYWORD_USER_LIST', "一覧 リスト 編集 変更 削除");
 define('_MI_USER_KEYWORD_USER_SEARCH', "User search");
+define('_MI_USER_LANG_MAILJOB_CREATE', "Mailjob create");
+define('_MI_USER_LANG_MAILJOB_LIST', "Mailjob list");
 define('_MI_USER_MENU_CREATE_AVATAR', "アバターの新規作成");
 define('_MI_USER_MENU_CREATE_GROUP', "グループの新規作成");
 define('_MI_USER_MENU_CREATE_RANK', "ランクの新規作成");
Index: xoops2jp/html/modules/user/language/japanese/admin.php
diff -u xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.24 xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.25
--- xoops2jp/html/modules/user/language/japanese/admin.php:1.1.2.24	Fri Apr 14 15:36:26 2006
+++ xoops2jp/html/modules/user/language/japanese/admin.php	Thu Apr 27 19:27:02 2006
@@ -1,151 +1,171 @@
-<?php
-
-define('_AD_USER_ERROR_AVATAR_EXTENSION', "不正なファイルがアップロードされました");
-define('_AD_USER_ERROR_DBUPDATE_FAILED', "データベースの更新に失敗しました");
-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_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_CONTROL', "操作");
-define('_AD_USER_LANG_CREATE_NEW', "新規作成");
-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_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_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_LEVEL', "レベル");
-define('_AD_USER_LANG_MAIL_NG_USERS_ONLY', "メール受信NGのユーザのみ");
-define('_AD_USER_LANG_MAIL_OK_USERS_ONLY', "メール受信OKのユーザのみ");
-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_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_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', "このアバターを使用しているユーザーのアバターはブランクに変更されます");
-
-?>
+<?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/>その場合はブラウザでリロード（再読込）操作を行ってください。操作を繰り返すことで全ユーザーへ送信できます。");
+
+?>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:27:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:27:39 +0900
Subject: [xoops-cvslog 2906] CVS update:
	xoops2jp/html/modules/user/language/japanese
Message-ID: <20060427102739.075EA2AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/language/japanese/help.html
diff -u xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.1 xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.2
--- xoops2jp/html/modules/user/language/japanese/help.html:1.1.2.1	Sat Feb  4 00:56:11 2006
+++ xoops2jp/html/modules/user/language/japanese/help.html	Thu Apr 27 19:27:38 2006
@@ -32,10 +32,23 @@
   <li>ユーザーグループ一覧にあるコマンドボタン「プロパティ(スマイリーの絵)」にて、該当グループの設定情況を一覧で確認できます。グループパーミッションの設定情況を確認するためには、こちらの一覧で確認した上で、該当グループに属するテスト用のユーザーIDを作成し、実際にアクセスして確認することをおすすめします。</li>
 </ul>
 
+<span style="color:red;">New</span>
 <h4>一斉メール送信</h4>
-<ul>
-  <li>登録ユーザーに対して一斉同報メールを送信することが出来ます。最終ログイン日時や登録日等で絞り込んでメールを送付することが出来るため、一定期間サイトにアクセスしていない人にサイト上のお知らせを確認するように促したり、最近一週間の間に登録された利用者にウェルカムメッセージを流したりすることが可能です。</li>
-</ul>
+<p>複数のユーザーに対してメールやメッセージを送信することができます。<br/>
+XOOPS 2.0.x 系とは操作手順、処理の考え方が異なり、メールの内容と対象ユーザーを「メールジョブ」というデータに保存し、好きなときに送信することが出来ます。<br/>
+また、cronで処理することも可能です（予定）。</p>
+<ol>
+  <li>まず送信するユーザーを<strong>ユーザー検索</strong>で絞り込みましょう。
+  <li>検索結果を確認し、「この条件でメールを送信」をクリックしてください。
+  <li>メールの内容を入力し、保存してください。
+  <li>メールジョブの画面から送信するメールジョブを選択してください。
+  <li>ガイドに従い、送信ボタンを押してください。
+</ol>
+<p>
+メールジョブは送信開始前であれば件名や本文を修正することができ、送信後も履歴として残すことができます。<br/>
+メールタイトルや本文では、特殊な記法を使うことで、送信先のユーザーのユーザー名などをメッセージに含めることが出来ます。<br/>
+物足りない場合は、記法や送信方法を拡張するカスタム・ファイルやモジュールが配布されていないか探してみましょう。
+</p>
 
 <h4>一般設定</h4>
 <ul>

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:27:50 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:27:50 +0900
Subject: [xoops-cvslog 2907] CVS update: xoops2jp/html/modules/user/sql
Message-ID: <20060427102750.98EC72AC539@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/sql/mysql.sql
diff -u /dev/null xoops2jp/html/modules/user/sql/mysql.sql:1.1.2.3
--- /dev/null	Thu Apr 27 19:27:50 2006
+++ xoops2jp/html/modules/user/sql/mysql.sql	Thu Apr 27 19:27:50 2006
@@ -0,0 +1,17 @@
+CREATE TABLE user_mailjob (
+  mailjob_id int(10) NOT NULL auto_increment,
+  title varchar(255) NOT NULL default '',
+  body text NOT NULL,
+  from_name varchar(255) default NULL,
+  from_email varchar(255) default NULL,
+  is_pm tinyint(1) NOT NULL default '0',
+  is_mail tinyint(1) NOT NULL default '0',
+  create_unixtime int(10) NOT NULL default '0',
+  PRIMARY KEY (mailjob_id)
+) TYPE=MyISAM;
+
+CREATE TABLE user_mailjob_link (
+  mailjob_id int(10) NOT NULL default '0',
+  uid mediumint(8) NOT NULL default '0',
+  PRIMARY KEY (mailjob_id, uid)
+) TYPE=MyISAM;

From minahito ＠ users.sourceforge.jp  Thu Apr 27 19:28:15 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Thu, 27 Apr 2006 19:28:15 +0900
Subject: [xoops-cvslog 2908] CVS update: xoops2jp/html/modules/user/admin
Message-ID: <20060427102815.C0A342AC53A@users.sourceforge.jp>

Index: xoops2jp/html/modules/user/admin/menu.php
diff -u xoops2jp/html/modules/user/admin/menu.php:1.1.2.7 xoops2jp/html/modules/user/admin/menu.php:1.1.2.8
--- xoops2jp/html/modules/user/admin/menu.php:1.1.2.7	Tue Apr 11 18:15:46 2006
+++ xoops2jp/html/modules/user/admin/menu.php	Thu Apr 27 19:28:15 2006
@@ -1,42 +1,46 @@
-<?php
-
-$adminmenu[1]['title'] = _MI_USER_MENU_CREATE_USER;
-$adminmenu[1]['link'] = "admin/index.php?action=UserEdit";
-$adminmenu[1]['keywords'] = _MI_USER_KEYWORD_CREATE_USER;
-$adminmenu[1]['show'] = false;
-
-$adminmenu[2]['title'] = _MI_USER_ADMENU_LIST;
-$adminmenu[2]['keywords'] = _MI_USER_KEYWORD_USER_LIST;
-$adminmenu[2]['link'] = "admin/index.php";
-
-$adminmenu[3]['title'] = _MI_USER_ADMENU_USER_SEARCH;
-$adminmenu[3]['keywords'] = _MI_USER_KEYWORD_USER_SEARCH;
-$adminmenu[3]['link'] = "admin/index.php?action=UserSearch";
-
-$adminmenu[4]['title'] = _MI_USER_MENU_CREATE_RANK;
-$adminmenu[4]['link'] = "admin/index.php?action=RanksEdit";
-$adminmenu[4]['keywords'] = _MI_USER_KEYWORD_CREATE_RANK;
-$adminmenu[4]['show'] = false;
-
-$adminmenu[5]['title'] = _MI_USER_ADMENU_RANK_LIST;
-$adminmenu[5]['link'] = "admin/index.php?action=RanksList";
-
-$adminmenu[6]['title'] = _MI_USER_MENU_CREATE_GROUP;
-$adminmenu[6]['link'] = "admin/index.php?action=RanksList";
-$adminmenu[6]['keywords'] = _MI_USER_KEYWORD_CREATE_GROUP;
-$adminmenu[6]['show'] = false;
-
-$adminmenu[7]['title'] = _MI_USER_ADMENU_GROUP_LIST;
-$adminmenu[7]['keywords'] = _MI_USER_KEYWORD_GROUP_LIST;
-$adminmenu[7]['link'] = "admin/index.php?action=GroupList";
-
-$adminmenu[8]['title'] = _MI_USER_MENU_CREATE_AVATAR;
-$adminmenu[8]['link'] = "admin/index.php?action=AvatarEdit";
-$adminmenu[8]['keywords'] = _MI_USER_KEYWORD_CREATE_AVATAR;
-$adminmenu[8]['show'] = false;
-
-$adminmenu[9]['title'] = _MI_USER_ADMENU_AVATAR_MANAGE;
-$adminmenu[9]['keywords'] = _MI_USER_KEYWORD_AVATAR_MANAGE;
-$adminmenu[9]['link'] = "admin/index.php?action=AvatarList";
-
-?>
\ No newline at end of file
+<?php
+
+$adminmenu[1]['title'] = _MI_USER_MENU_CREATE_USER;
+$adminmenu[1]['link'] = "admin/index.php?action=UserEdit";
+$adminmenu[1]['keywords'] = _MI_USER_KEYWORD_CREATE_USER;
+$adminmenu[1]['show'] = false;
+
+$adminmenu[2]['title'] = _MI_USER_ADMENU_LIST;
+$adminmenu[2]['keywords'] = _MI_USER_KEYWORD_USER_LIST;
+$adminmenu[2]['link'] = "admin/index.php";
+
+$adminmenu[3]['title'] = _MI_USER_ADMENU_USER_SEARCH;
+$adminmenu[3]['keywords'] = _MI_USER_KEYWORD_USER_SEARCH;
+$adminmenu[3]['link'] = "admin/index.php?action=UserSearch";
+
+$adminmenu[4]['title'] = _MI_USER_MENU_CREATE_RANK;
+$adminmenu[4]['link'] = "admin/index.php?action=RanksEdit";
+$adminmenu[4]['keywords'] = _MI_USER_KEYWORD_CREATE_RANK;
+$adminmenu[4]['show'] = false;
+
+$adminmenu[5]['title'] = _MI_USER_ADMENU_RANK_LIST;
+$adminmenu[5]['link'] = "admin/index.php?action=RanksList";
+
+$adminmenu[6]['title'] = _MI_USER_MENU_CREATE_GROUP;
+$adminmenu[6]['link'] = "admin/index.php?action=RanksList";
+$adminmenu[6]['keywords'] = _MI_USER_KEYWORD_CREATE_GROUP;
+$adminmenu[6]['show'] = false;
+
+$adminmenu[7]['title'] = _MI_USER_ADMENU_GROUP_LIST;
+$adminmenu[7]['keywords'] = _MI_USER_KEYWORD_GROUP_LIST;
+$adminmenu[7]['link'] = "admin/index.php?action=GroupList";
+
+$adminmenu[8]['title'] = _MI_USER_MENU_CREATE_AVATAR;
+$adminmenu[8]['link'] = "admin/index.php?action=AvatarEdit";
+$adminmenu[8]['keywords'] = _MI_USER_KEYWORD_CREATE_AVATAR;
+$adminmenu[8]['show'] = false;
+
+$adminmenu[9]['title'] = _MI_USER_ADMENU_AVATAR_MANAGE;
+$adminmenu[9]['keywords'] = _MI_USER_KEYWORD_AVATAR_MANAGE;
+$adminmenu[9]['link'] = "admin/index.php?action=AvatarList";
+
+$adminmenu[10]['title'] = _MI_USER_ADMENU_MAILJOB_MANAGE;
+$adminmenu[10]['keywords'] = _MI_USER_KEYWORD_MAILJOB_MANAGE;
+$adminmenu[10]['link'] = "admin/index.php?action=MailjobList";
+
+?>

From onokazu ＠ users.sourceforge.jp  Fri Apr 28 13:57:56 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Fri, 28 Apr 2006 13:57:56 +0900
Subject: [xoops-cvslog 2909] CVS update: xoops2jp/html/install/class
Message-ID: <20060428045756.E72992AC117@users.sourceforge.jp>

Index: xoops2jp/html/install/class/mainfilemanager.php
diff -u xoops2jp/html/install/class/mainfilemanager.php:1.2 xoops2jp/html/install/class/mainfilemanager.php:1.2.16.1
--- xoops2jp/html/install/class/mainfilemanager.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/mainfilemanager.php	Fri Apr 28 13:57:56 2006
@@ -28,7 +28,7 @@
 * mainfile manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: mainfilemanager.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+* @version $Id: mainfilemanager.php,v 1.2.16.1 2006/04/28 04:57:56 onokazu Exp $
 * @access public
 **/
 class mainfile_manager {
@@ -63,6 +63,7 @@
             $this->error = true;
             return false;
         }
+        clearstatcache();
         $content = fread($file, filesize($this->path) );
         fclose($file);
 

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:45:39 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:45:39 +0900
Subject: [xoops-cvslog 2910] CVS update: xoops2jp/html/kernel
Message-ID: <20060428064539.88DCE2AC655@users.sourceforge.jp>

Index: xoops2jp/html/kernel/privmessage.php
diff -u xoops2jp/html/kernel/privmessage.php:1.2.8.3 xoops2jp/html/kernel/privmessage.php:1.2.8.4
--- xoops2jp/html/kernel/privmessage.php:1.2.8.3	Mon Jan  2 22:51:45 2006
+++ xoops2jp/html/kernel/privmessage.php	Fri Apr 28 15:45:39 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: privmessage.php,v 1.2.8.3 2006/01/02 13:51:45 minahito Exp $
+// $Id: privmessage.php,v 1.2.8.4 2006/04/28 06:45:39 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.3 $ - $Date: 2006/01/02 13:51:45 $
+ * @version		$Revision: 1.2.8.4 $ - $Date: 2006/04/28 06:45:39 $
  */
 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.3 $ - $Date: 2006/01/02 13:51:45 $
+ * @version		$Revision: 1.2.8.4 $ - $Date: 2006/04/28 06:45:39 $
  */
 class XoopsPrivmessageHandler extends XoopsObjectHandler
 {
@@ -151,13 +151,17 @@
         } else {
             $sql = sprintf("UPDATE %s SET msg_image = %s, subject = %s, from_userid = %u, to_userid = %u, msg_text = %s, read_msg = %u WHERE msg_id = %u", $this->db->prefix('priv_msgs'), $this->db->quoteString($msg_image), $this->db->quoteString($subject), $from_userid, $to_userid, $this->db->quoteString($msg_text), $read_msg, $msg_id);
         }
-        if (!$result = $this->db->query($sql)) {
+        
+        $result = $force ? $this->db->queryF($sql) : $this->db->query($sql);
+        
+        if (!$result) {
             return false;
         }
         if (empty($msg_id)) {
             $msg_id = $this->db->getInsertId();
         }
 		$pm->assignVar('msg_id', $msg_id);
+		
         return true;
     }
 

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:46:06 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:46:06 +0900
Subject: [xoops-cvslog 2911] CVS update: xoops2jp/html/modules/base/class
Message-ID: <20060428064606.366EB2AC655@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/DebuggerManager.class.php
diff -u /dev/null xoops2jp/html/modules/base/class/DebuggerManager.class.php:1.1.2.1
--- /dev/null	Fri Apr 28 15:46:06 2006
+++ xoops2jp/html/modules/base/class/DebuggerManager.class.php	Fri Apr 28 15:46:06 2006
@@ -0,0 +1,161 @@
+<?php
+// $Id: DebuggerManager.class.php,v 1.1.2.1 2006/04/28 06:46:06 minahito Exp $
+//  ------------------------------------------------------------------------ //
+//                XOOPS - PHP Content Management System                      //
+//                    Copyright (c) 2000 XOOPS.org                           //
+//                       <http://www.xoops.org/>                             //
+//  ------------------------------------------------------------------------ //
+//  This program is free software; you can redistribute it and/or modify     //
+//  it under the terms of the GNU General Public License as published by     //
+//  the Free Software Foundation; either version 2 of the License, or        //
+//  (at your option) any later version.                                      //
+//                                                                           //
+//  You may not change or alter any portion of this comment or credits       //
+//  of supporting developers from this source code or any supporting         //
+//  source code which is considered copyrighted (c) material of the          //
+//  original comment or credit authors.                                      //
+//                                                                           //
+//  This program is distributed in the hope that it will be useful,          //
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
+//  GNU General Public License for more details.                             //
+//                                                                           //
+//  You should have received a copy of the GNU General Public License        //
+//  along with this program; if not, write to the Free Software              //
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
+//  ------------------------------------------------------------------------ //
+
+if (!defined('XOOPS_ROOT_PATH')) exit();
+
+define("XOOPS_DEBUG_OFF",0);
+define("XOOPS_DEBUG_PHP",1);
+define("XOOPS_DEBUG_MYSQL",2);
+define("XOOPS_DEBUG_SMARTY",3);
+
+class Legacy_DebuggerManager
+{
+	function getInstance($debug_mode)
+	{
+        static $instance = array();
+
+        if (empty($instance[$debug_mode])) {
+            $instance[$debug_mode] =& Legacy_DebuggerManager::_createInstance($debug_mode);
+        }
+        
+        return $instance[$debug_mode];
+	}
+	
+	/**
+	Create XoopsDebugger instance.
+	You must not communicate with this method directly.
+	*/
+	function &_createInstance($debug_mode)
+	{
+		$instance = null;
+		switch($debug_mode) {
+			case XOOPS_DEBUG_PHP:
+				$instance =& new Legacy_PHPDebugger();
+				break;
+
+			case XOOPS_DEBUG_MYSQL:
+				$instance =& new Legacy_MysqlDebugger();
+				break;
+
+			case XOOPS_DEBUG_SMARTY:
+				$instance =& new Legacy_SmartyDebugger();
+				break;
+			
+			case XOOPS_DEBUG_OFF:
+			default:
+				// @todo I can not realize abstract class to instance.
+				$instance =& new Legacy_AbstractDebugger();
+				break;
+		}
+		
+		return $instance;
+	}
+}
+
+class Legacy_AbstractDebugger
+{
+	function Legacy_AbstractDebugger()
+	{
+	}
+
+	function prepare()
+	{
+	}
+	
+	function isDebugRenderSystem()
+	{
+		return false;
+	}
+
+	/**
+	 * @return string Log as html code.
+	 */	
+	function renderLog()
+	{
+	}
+	
+	function displayLog()
+	{
+	}
+}
+
+/**
+This class works for "PHP debugging mode".
+*/
+class Legacy_PHPDebugger extends Legacy_AbstractDebugger
+{
+	function prepare()
+	{
+		error_reporting(E_ALL);
+	}
+}
+
+/**
+This class works for "Mysql debugging mode".
+*/
+class Legacy_MysqlDebugger extends Legacy_AbstractDebugger
+{
+	function renderLog()
+	{
+		$xoopsLogger =& XoopsLogger::instance();
+		return $xoopsLogger->dumpAll();
+	}
+	
+	function displayLog()
+	{
+        echo $count . '<script type="text/javascript">
+        <!--//
+        debug_window = openWithSelfMain("", "xoops_debug", 680, 600, true);
+        ';
+        $content = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.htmlspecialchars($xoopsConfig['sitename']).'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body>'.$this->renderLog().'<div style="text-align:center;"><input class="formButton" value="'._CLOSE.'" type="button" onclick="javascript:window.close();" /></div></body></html>';
+        $lines = preg_split("/(\r\n|\r|\n)( *)/", $content);
+        foreach ($lines as $line) {
+            echo 'debug_window.document.writeln("'.str_replace('"', '\"', $line).'");';
+        }
+        echo '
+        debug_window.document.close();
+        //-->
+        </script>';
+	}
+}
+
+
+/**
+This class works for "Smarty debugging mode".
+*/
+class Legacy_SmartyDebugger extends Legacy_AbstractDebugger
+{
+	function isDebugRenderSystem()
+	{
+		$root =& XCube_Root::getSingleton();
+		$user =& $root->mController->getXoopsUser();
+		
+		return is_object($user) ? $user->isAdmin(0) : false;
+	}
+}
+
+?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:46:23 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:46:23 +0900
Subject: [xoops-cvslog 2912] CVS update: xoops2jp/html/modules/base/class/debug
Message-ID: <20060428064623.A3A6F2AC655@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/class/debug/index.html
diff -u xoops2jp/html/modules/base/class/debug/index.html:1.1.2.1 xoops2jp/html/modules/base/class/debug/index.html:removed
--- xoops2jp/html/modules/base/class/debug/index.html:1.1.2.1	Mon Mar 27 11:41:50 2006
+++ xoops2jp/html/modules/base/class/debug/index.html	Fri Apr 28 15:46:23 2006
@@ -1 +0,0 @@
- <script>history.go(-1);</script>
\ No newline at end of file
Index: xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php
diff -u xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:1.1.4.6 xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:removed
--- xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php:1.1.4.6	Fri Apr 14 15:28:50 2006
+++ xoops2jp/html/modules/base/class/debug/XoopsDebugManager.class.php	Fri Apr 28 15:46:23 2006
@@ -1,145 +0,0 @@
-<?php
-// $Id: XoopsDebugManager.class.php,v 1.1.4.6 2006/04/14 06:28:50 minahito Exp $
-//  ------------------------------------------------------------------------ //
-//                XOOPS - PHP Content Management System                      //
-//                    Copyright (c) 2000 XOOPS.org                           //
-//                       <http://www.xoops.org/>                             //
-//  ------------------------------------------------------------------------ //
-//  This program is free software; you can redistribute it and/or modify     //
-//  it under the terms of the GNU General Public License as published by     //
-//  the Free Software Foundation; either version 2 of the License, or        //
-//  (at your option) any later version.                                      //
-//                                                                           //
-//  You may not change or alter any portion of this comment or credits       //
-//  of supporting developers from this source code or any supporting         //
-//  source code which is considered copyrighted (c) material of the          //
-//  original comment or credit authors.                                      //
-//                                                                           //
-//  This program is distributed in the hope that it will be useful,          //
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of           //
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            //
-//  GNU General Public License for more details.                             //
-//                                                                           //
-//  You should have received a copy of the GNU General Public License        //
-//  along with this program; if not, write to the Free Software              //
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
-//  ------------------------------------------------------------------------ //
-
-if (!defined('XOOPS_ROOT_PATH')) exit();
-
-define("XOOPS_DEBUG_OFF",0);
-define("XOOPS_DEBUG_PHP",1);
-define("XOOPS_DEBUG_MYSQL",2);
-define("XOOPS_DEBUG_SMARTY",3);
-
-class XoopsDebuggerManager
-{
-	function getInstance($debug_mode)
-	{
-        static $instance = array();
-        if (empty($instance[$debug_mode])) {
-            $instance[$debug_mode] =& XoopsDebuggerManager::_createInstance($debug_mode);
-        }
-        
-        return $instance[$debug_mode];
-	}
-	
-	/**
-	Create XoopsDebugger instance.
-	You must not communicate with this method directly.
-	*/
-	function &_createInstance($debug_mode)
-	{
-		$instance = null;
-		switch($debug_mode) {
-			case XOOPS_DEBUG_PHP:
-				$instance = new XoopsPHPDebugger();
-				break;
-
-			case XOOPS_DEBUG_MYSQL:
-				$instance = new XoopsMysqlDebugger();
-				break;
-
-			case XOOPS_DEBUG_SMARTY:
-				$instance = new XoopsSmartyDebugger();
-				break;
-			
-			case XOOPS_DEBUG_OFF:
-			default:
-				// @todo I can not realize abstract class to instance.
-				$instance = new AbstractXoopsDebugger();
-				break;
-		}
-		
-		return $instance;
-	}
-}
-
-class AbstractXoopsDebugger
-{
-	function XoopsDebugger()
-	{
-	}
-
-	function setup()
-	{
-	}
-	
-	function isDebugRenderSystem()
-	{
-		return false;
-	}
-	
-	function displayLog()
-	{
-	}
-}
-
-/**
-This class works for "PHP debugging mode".
-*/
-class XoopsPHPDebugger extends AbstractXoopsDebugger
-{
-	function setup()
-	{
-		error_reporting(E_ALL);
-	}
-}
-
-/**
-This class works for "Mysql debugging mode".
-*/
-class XoopsMysqlDebugger extends AbstractXoopsDebugger
-{
-	function displayLog()
-	{
-		$xoopsLogger =& XoopsLogger::instance();
-        echo '<script type="text/javascript">
-        <!--//
-        debug_window = openWithSelfMain("", "xoops_debug", 680, 600, true);
-        ';
-        $content = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.htmlspecialchars($xoopsConfig['sitename']).'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body>'.$xoopsLogger->dumpAll().'<div style="text-align:center;"><input class="formButton" value="'._CLOSE.'" type="button" onclick="javascript:window.close();" /></div></body></html>';
-        $lines = preg_split("/(\r\n|\r|\n)( *)/", $content);
-        foreach ($lines as $line) {
-            echo 'debug_window.document.writeln("'.str_replace('"', '\"', $line).'");';
-        }
-        echo '
-        debug_window.document.close();
-        //-->
-        </script>';
-	}
-}
-
-
-/**
-This class works for "Smarty debugging mode".
-*/
-class XoopsSmartyDebugger extends AbstractXoopsDebugger
-{
-	function isDebugRenderSystem()
-	{
-		return true;
-	}
-}
-
-?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:46:47 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:46:47 +0900
Subject: [xoops-cvslog 2913] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060428064647.0BA642AC655@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.3 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.4
--- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.3	Mon Apr 17 18:48:51 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php	Fri Apr 28 15:46:46 2006
@@ -134,8 +134,6 @@
 	
 	function renderTheme(&$target)
 	{
-		$this->mController->mDebugger->displayLog();
-
 		//
 		// Assign from attributes of the render-target.
 		//

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:47:13 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:47:13 +0900
Subject: [xoops-cvslog 2914] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060428064713.F00D62AC656@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.31 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.32
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.31	Wed Apr 19 14:27:59 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Fri Apr 28 15:47:13 2006
@@ -332,16 +332,17 @@
 	{
 		error_reporting(0);
 
-		require_once XOOPS_BASE_PATH."/class/debug/XoopsDebugManager.class.php";
+		require_once XOOPS_BASE_PATH . "/class/DebuggerManager.class.php";
 		
 		$debug_mode = $this->mConfig['debug_mode'];
-		if(defined("OH_MY_GOD_HELP_ME"))
+		if (defined("OH_MY_GOD_HELP_ME")) {
 			$debug_mode = XOOPS_DEBUG_PHP;
+		}
+		
+		$this->mDebugger =& Legacy_DebuggerManager::getInstance($debug_mode);
+		$this->mDebugger->prepare();
 
-		$this->mDebugger=&XoopsDebuggerManager::getInstance($debug_mode);
-		$this->mDebugger->setup();
-
-		$GLOBALS['xoopsDebugger']=&$this->mDebugger;
+		$GLOBALS['xoopsDebugger'] =& $this->mDebugger;
 	}
 
 	function _processPreBlockFilter()
@@ -532,21 +533,24 @@
 
 		$this->mRenderSystem->renderWithTarget($screenTarget);
 
-		$isAdmin=false;
-		if(is_object($this->mXoopsUser)) {
-			if($this->mModuleController->isModuleProcess() && $this->mModuleController->isActive()) {
+		//
+		// Debug Process
+		//
+		$isAdmin = false;
+		if (is_object($this->mXoopsUser)) {
+			if ($this->mModuleController->isModuleProcess() && $this->mModuleController->isActive()) {
 				// @todo I depend on Legacy Module Controller.
 				$mid=$this->mModuleController->mModuleObject->getVar('mid');
 			}
-			else
+			else {
 				$mid=1;	///< @todo Do not use literal directly!
+			}
 
 			$isAdmin = $this->mXoopsUser->isAdmin($mid);
 		}
 
-		// Debug Process
-		if ($this->mConfig['debug_mode'] == XOOPS_DEBUG_MYSQL && $isAdmin) {
-			$xoopsDebugger->displayLog();
+		if ($isAdmin) {
+			$this->mDebugger->displayLog();
 		}
 	}
 

From minahito ＠ users.sourceforge.jp  Fri Apr 28 15:47:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 15:47:46 +0900
Subject: [xoops-cvslog 2915] CVS update:
	xoops2jp/html/modules/legacyRender/kernel
Message-ID: <20060428064746.A485C2AC655@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.13 xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.14
--- xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php:1.1.2.13	Tue Mar 28 22:30:50 2006
+++ xoops2jp/html/modules/legacyRender/kernel/Legacy_RenderSystem.class.php	Fri Apr 28 15:47:46 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.13 2006/03/28 13:30:50 minahito Exp $
+ * @version $Id: Legacy_RenderSystem.class.php,v 1.1.2.14 2006/04/28 06:47:46 minahito Exp $
  */
 
 if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -49,14 +49,11 @@
 	{
 		$this->mController =& $controller;
 		
-		require_once XOOPS_ROOT_PATH."/class/template.php";
+		require_once XOOPS_ROOT_PATH . "/class/template.php";
 
 		// XoopsTpl default setup
-		$this->mXoopsTpl=new XoopsTpl();
+		$this->mXoopsTpl =& new XoopsTpl();
 		
-		$this->mXoopsTpl->register_modifier("xcstring","legacy_render_system_xcstring");
-		$this->mXoopsTpl->register_modifier("xctext","legacy_render_system_xctext");
-
 		// compatible
 		$GLOBALS['xoopsTpl']=&$this->mXoopsTpl;
 		
@@ -68,8 +65,9 @@
 								));
 
 		// If debugger request debugging to me, send debug mode signal by any methods.
-		if($this->mController->mDebugger->isDebugRenderSystem())
+		if($this->mController->mDebugger->isDebugRenderSystem()) {
 			$this->mXoopsTpl->xoops_setDebugging(true);
+		}
 		
    		$this->mXoopsTpl->assign(array('xoops_theme' => $this->mController->mConfig['theme_set'],
 							'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
@@ -229,7 +227,7 @@
 		foreach($target->getAttributes() as $key=>$value) {
 			$this->mXoopsTpl->assign($key,$value);
 		}
-
+		
 		//
 		// [TODO]
 		// We must implement with a render-target.
@@ -276,10 +274,10 @@
 		//
 		$result=null;
 		if($target->getAttribute("isFileTheme")) {
-			$result=$this->mXoopsTpl->fetch($target->getTemplateName()."/theme.html");
+			$result=$this->mXoopsTpl->fetch($target->getTemplateName()."/theme.html", null, null, true);
 		}
 		else {
-			$result=$this->mXoopsTpl->fetch("db:".$target->getTemplateName());
+			$result=$this->mXoopsTpl->fetch("db:".$target->getTemplateName(), null, null, true);
 		}
 
 		$target->setResult($result);

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:16:30 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:16:30 +0900
Subject: [xoops-cvslog 2916] CVS update: xoops2jp/html/modules/base/admin
Message-ID: <20060428091630.C5EF82AC67A@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/css.php
diff -u xoops2jp/html/modules/base/admin/css.php:1.1.2.3 xoops2jp/html/modules/base/admin/css.php:1.1.2.4
--- xoops2jp/html/modules/base/admin/css.php:1.1.2.3	Thu Jan 26 01:09:07 2006
+++ xoops2jp/html/modules/base/admin/css.php	Fri Apr 28 18:16:30 2006
@@ -5,20 +5,23 @@
 
 
 $theme = isset($_GET['theme']) ? trim($_GET['theme']) : null;
-$file = trim($_GET['file']);
+$dirname = isset($_GET['dirname']) ? trim($_GET['dirname']) : null;
+$file = "stylesheets/" . trim($_GET['file']);
 
-if (strpos($file, "..") !== false) {
+if (strstr($theme, "..") !== false || strstr($dirname, "..") !== false || strstr($file, "..") !== false) {
 	exit();
 }
 
 $smarty = new Legacy_AdminSmarty();
 
-if ($theme !=null && !file_exists(XOOPS_THEME_PATH . "/" . $theme . "/" . $file)) {
-	exit();
+if ($theme != null && $dirname != null) {
+	$path = XOOPS_THEME_PATH . "/${theme}/modules/${dirname}/admin/templates";
 }
-
-if($theme!=null) {
-	$path = XOOPS_THEME_PATH . "/" . $theme;
+elseif ($theme != null) {
+	$path = XOOPS_THEME_PATH . "/" .$theme;
+}
+elseif ($dirname != null) {
+	$path = XOOPS_MODULE_PATH . "/${dirname}/admin/templates";
 }
 else {
 	$path = LEGACY_ADMIN_RENDER_FALLBACK_PATH;

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:16:46 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:16:46 +0900
Subject: [xoops-cvslog 2917] CVS update: xoops2jp/html/modules/base/admin/theme
Message-ID: <20060428091646.6BE262AC67E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/style.css
diff -u xoops2jp/html/modules/base/admin/theme/style.css:1.1.2.4 xoops2jp/html/modules/base/admin/theme/style.css:removed
--- xoops2jp/html/modules/base/admin/theme/style.css:1.1.2.4	Wed Mar 29 23:48:38 2006
+++ xoops2jp/html/modules/base/admin/theme/style.css	Fri Apr 28 18:16:46 2006
@@ -1,232 +0,0 @@
-
-body {
-	background: #ffffff;
-	font-size: 12px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	margin: 0;
-	padding: 0;
-}
-h1, h2, h3, h4, h5 {
-	color: #47477f;
-	margin: 5px 0 12px;
-}
-h2 {
-	color: #666666;
-	background: url(<{"design/h2bg.gif"|theme}>) repeat-x;
-	padding-left: 5px;
-}
-a {
-	color: #000000;
-	font-weight: normal;
-	text-decoration:none;
-}
-a:visited {
-	color: #000000;
-	font-weight: normal;
-}
-a:hover {
-	color: #B22222;
-}
-
-img {border:0}
-
-ul {
-	margin: 2px;
-	padding: 2px;
-	list-style: square outside;
-}
-
-li {
-	margin-left: 20px;
-	line-height: 130%;
-}
-
-th {
-	color: #ffffff;
-	background: #000080;
-	text-align: center;
-	padding: 3px 4px;
-}
-
-th a {
-	font-weight: bold;
-	color: #ffffff;
-}
-
-th a:visited {
-	font-weight: bold;
-	color: #ffffff;
-}
-
-th a:hover {
-	font-weight: bold;
-	color: #ff8c00;
-}
-
-input.formButton {
-	background: url(<{"design/buttonbg.gif"|theme}>);
-	border-top: solid 1px #9a9caa;
-	border-left: solid 1px #9a9caa;
-	border-right: solid 1px #43445e;
-	border-bottom: solid 1px #43445e;
-}
-
-#Table1 {
-	background: #000080;
-}
-#header {
-	color: #ffffff;
-	text-align: right;
-	vertical-align: middle;
-	width: 100%;
-	padding-top: 5px;
-}
-#header a:link, #header a:visited {
-	color: #ffffff;
-}
-#header2 {
-	color: #ffffff;
-	background: #00004f url(<{"design/headersearchborder.gif"|theme}>) repeat-y left;
-	text-align: center;
-	vertical-align: middle;
-}
-#header2 input {
-/*	background: #778899; */
-}
-#sidemenu {
-	background: #e6e6e6;
-	vertical-align: top;
-	padding: 2px 0 0 0;
-	margin: 0;
-}
-#sidemenu div.head {
-	background: url(<{"design/menutitle_close.gif"|theme}>) no-repeat;
-	height: 15px; /* 25px */
-	padding: 3px;
-}
-#sidemenu div.head2 {
-	background: url(<{"design/menutitle_open.gif"|theme}>) no-repeat;
-	height: 15px; /* 25px */
-	padding: 3px;
-}
-#sidemenu div.head a:link, #sidemenu div.head a:visited {
-	color: #000080;
-	font-weight: bold;
-}
-#sidemenu div.head2 a:link, #sidemenu div.head2 a:visited {
-	color: #9c0808;
-	font-weight: bold;
-}
-#sidemenu div.head a:hover, #sidemenu div.head2 a:hover {
-	color: #ffffff;
-}
-.side {
-	margin: 0 5px 10px 1px;
-	display: none;
-}
-.side li {
-	list-style: url(<{"design/menulist.gif"|theme}>);
-}
-#nav {
-	margin-bottom: 3px;
-}
-#nav a:link, #nav a:visited {
-	color: #666666;
-	font-size: 8pt;
-	font-weight: normal;
-}
-#nav a:hover {
-	color: #800000;
-}
-#nav table {
-	width: auto;
-	border: none;
-	display: inline;
-}
-#nav td.center {
-	background: url(<{"design/nav_bg.gif"|theme}>) repeat-x;
-	height: 18px;
-}
-#nav td.left {
-	background: url(<{"design/nav_lcap.gif"|theme}>) no-repeat;
-	width: 5px;
-	height: 18px;
-}
-#nav td.right {
-	background: url(<{"design/nav_rcap.gif"|theme}>) no-repeat;
-	width: 5px;
-	height: 18x;
-}
-#content {
-	background: #f5f5f5 url(<{"design/menuborder.gif"|theme}>) repeat-y left;
-	margin: 0;
-	padding: 5px 5px 5px 12px;
-	border-right: solid 1px #efefef;
-}
-#content table {
-	width: 100%;
-	border: solid 1px #cccccc;
-}
-#contentBody {
-	background: #ffffff;
-	padding: 12px;
-}
-
-#searchBox {
-	margin: 0;
-}
-#footer {
-	background: #cccccc;
-	font-size: 95%;
-	text-align: center;
-	padding: 3px 0;
-}
-.nw {
-	white-space: nowrap;
-}
-.head {
-	color: #000000;
-	background: #dddddd;
-	padding: 1px 4px;
-}
-.foot {
-	color: #000000;
-	background: #dddddd;
-	padding: 4px 4px;
-	text-align: center;
-}
-.odd {
-	background: #e6e6e6;
-	padding: 1px 4px;
-}
-.even {
-	background: #f5f5f5;
-	padding: 1px 4px;
-}
-tr.odd td {
-	background: #e6e6e6;
-	padding: 1px 4px;
-}
-tr.even td {
-	background: #f5f5f5;
-	padding: 1px 4px;
-}
-.adminnavi {
-}
-.adminnavi a {
-}
-.toptab {
-	text-align: right;
-}
-.pagenavi {
-	text-align: center;
-}
-.tips {
-	border:2px dotted #ff6633;
-	padding: 8px;
-	padding-left: 35px;
-	margin: 10px;
-	background: #fff8ee url(<{"design/module_title.gif"|theme}>) no-repeat 5px 2px;
-}
-.help {
-}
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:16:56 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:16:56 +0900
Subject: [xoops-cvslog 2918] CVS update:
	xoops2jp/html/modules/base/admin/theme/stylesheets
Message-ID: <20060428091656.8FD092AC67E@users.sourceforge.jp>



From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:16:58 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:16:58 +0900
Subject: [xoops-cvslog 2919] CVS update:
	xoops2jp/html/modules/base/admin/theme/stylesheets
Message-ID: <20060428091658.972D52AC67E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/stylesheets/index.html
diff -u /dev/null xoops2jp/html/modules/base/admin/theme/stylesheets/index.html:1.1.2.1
--- /dev/null	Fri Apr 28 18:16:58 2006
+++ xoops2jp/html/modules/base/admin/theme/stylesheets/index.html	Fri Apr 28 18:16:58 2006
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:17:08 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:17:08 +0900
Subject: [xoops-cvslog 2920] CVS update:
	xoops2jp/html/modules/base/admin/theme/stylesheets
Message-ID: <20060428091709.01DA02AC67E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/stylesheets/style.css
diff -u /dev/null xoops2jp/html/modules/base/admin/theme/stylesheets/style.css:1.1.2.1
--- /dev/null	Fri Apr 28 18:17:08 2006
+++ xoops2jp/html/modules/base/admin/theme/stylesheets/style.css	Fri Apr 28 18:17:08 2006
@@ -0,0 +1,232 @@
+
+body {
+	background: #ffffff;
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	margin: 0;
+	padding: 0;
+}
+h1, h2, h3, h4, h5 {
+	color: #47477f;
+	margin: 5px 0 12px;
+}
+h2 {
+	color: #666666;
+	background: url(<{"design/h2bg.gif"|theme}>) repeat-x;
+	padding-left: 5px;
+}
+a {
+	color: #000000;
+	font-weight: normal;
+	text-decoration:none;
+}
+a:visited {
+	color: #000000;
+	font-weight: normal;
+}
+a:hover {
+	color: #B22222;
+}
+
+img {border:0}
+
+ul {
+	margin: 2px;
+	padding: 2px;
+	list-style: square outside;
+}
+
+li {
+	margin-left: 20px;
+	line-height: 130%;
+}
+
+th {
+	color: #ffffff;
+	background: #000080;
+	text-align: center;
+	padding: 3px 4px;
+}
+
+th a {
+	font-weight: bold;
+	color: #ffffff;
+}
+
+th a:visited {
+	font-weight: bold;
+	color: #ffffff;
+}
+
+th a:hover {
+	font-weight: bold;
+	color: #ff8c00;
+}
+
+input.formButton {
+	background: url(<{"design/buttonbg.gif"|theme}>);
+	border-top: solid 1px #9a9caa;
+	border-left: solid 1px #9a9caa;
+	border-right: solid 1px #43445e;
+	border-bottom: solid 1px #43445e;
+}
+
+#Table1 {
+	background: #000080;
+}
+#header {
+	color: #ffffff;
+	text-align: right;
+	vertical-align: middle;
+	width: 100%;
+	padding-top: 5px;
+}
+#header a:link, #header a:visited {
+	color: #ffffff;
+}
+#header2 {
+	color: #ffffff;
+	background: #00004f url(<{"design/headersearchborder.gif"|theme}>) repeat-y left;
+	text-align: center;
+	vertical-align: middle;
+}
+#header2 input {
+/*	background: #778899; */
+}
+#sidemenu {
+	background: #e6e6e6;
+	vertical-align: top;
+	padding: 2px 0 0 0;
+	margin: 0;
+}
+#sidemenu div.head {
+	background: url(<{"design/menutitle_close.gif"|theme}>) no-repeat;
+	height: 15px; /* 25px */
+	padding: 3px;
+}
+#sidemenu div.head2 {
+	background: url(<{"design/menutitle_open.gif"|theme}>) no-repeat;
+	height: 15px; /* 25px */
+	padding: 3px;
+}
+#sidemenu div.head a:link, #sidemenu div.head a:visited {
+	color: #000080;
+	font-weight: bold;
+}
+#sidemenu div.head2 a:link, #sidemenu div.head2 a:visited {
+	color: #9c0808;
+	font-weight: bold;
+}
+#sidemenu div.head a:hover, #sidemenu div.head2 a:hover {
+	color: #ffffff;
+}
+.side {
+	margin: 0 5px 10px 1px;
+	display: none;
+}
+.side li {
+	list-style: url(<{"design/menulist.gif"|theme}>);
+}
+#nav {
+	margin-bottom: 3px;
+}
+#nav a:link, #nav a:visited {
+	color: #666666;
+	font-size: 8pt;
+	font-weight: normal;
+}
+#nav a:hover {
+	color: #800000;
+}
+#nav table {
+	width: auto;
+	border: none;
+	display: inline;
+}
+#nav td.center {
+	background: url(<{"design/nav_bg.gif"|theme}>) repeat-x;
+	height: 18px;
+}
+#nav td.left {
+	background: url(<{"design/nav_lcap.gif"|theme}>) no-repeat;
+	width: 5px;
+	height: 18px;
+}
+#nav td.right {
+	background: url(<{"design/nav_rcap.gif"|theme}>) no-repeat;
+	width: 5px;
+	height: 18x;
+}
+#content {
+	background: #f5f5f5 url(<{"design/menuborder.gif"|theme}>) repeat-y left;
+	margin: 0;
+	padding: 5px 5px 5px 12px;
+	border-right: solid 1px #efefef;
+}
+#content table {
+	width: 100%;
+	border: solid 1px #cccccc;
+}
+#contentBody {
+	background: #ffffff;
+	padding: 12px;
+}
+
+#searchBox {
+	margin: 0;
+}
+#footer {
+	background: #cccccc;
+	font-size: 95%;
+	text-align: center;
+	padding: 3px 0;
+}
+.nw {
+	white-space: nowrap;
+}
+.head {
+	color: #000000;
+	background: #dddddd;
+	padding: 1px 4px;
+}
+.foot {
+	color: #000000;
+	background: #dddddd;
+	padding: 4px 4px;
+	text-align: center;
+}
+.odd {
+	background: #e6e6e6;
+	padding: 1px 4px;
+}
+.even {
+	background: #f5f5f5;
+	padding: 1px 4px;
+}
+tr.odd td {
+	background: #e6e6e6;
+	padding: 1px 4px;
+}
+tr.even td {
+	background: #f5f5f5;
+	padding: 1px 4px;
+}
+.adminnavi {
+}
+.adminnavi a {
+}
+.toptab {
+	text-align: right;
+}
+.pagenavi {
+	text-align: center;
+}
+.tips {
+	border:2px dotted #ff6633;
+	padding: 8px;
+	padding-left: 35px;
+	margin: 10px;
+	background: #fff8ee url(<{"design/module_title.gif"|theme}>) no-repeat 5px 2px;
+}
+.help {
+}
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:17:44 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:17:44 +0900
Subject: [xoops-cvslog 2921] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060428091744.C848B2AC67E@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.4 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.5
--- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.4	Fri Apr 28 15:46:46 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php	Fri Apr 28 18:17:44 2006
@@ -101,14 +101,16 @@
 	{
 		$this->mController =& $controller;
 		
-		$this->mSmarty=new Legacy_AdminSmarty();
+		$this->mSmarty =& new Legacy_AdminSmarty();
 
-		$this->mSmarty->assign(array("xoops_url"=>XOOPS_URL,
-		                              "xoops_rootpath"=>XOOPS_ROOT_PATH,
-		                              "xoops_langcode"=>_LANGCODE,
-		                              "xoops_charset"=>_CHARSET,
-		                              "xoops_version"=>XOOPS_VERSION,
-		                              "xoops_upload_url"=>XOOPS_UPLOAD_URL));
+		$this->mSmarty->assign(array(
+			"xoops_url"        => XOOPS_URL,
+		    "xoops_rootpath"   => XOOPS_ROOT_PATH,
+		    "xoops_langcode"   => _LANGCODE,
+		    "xoops_charset"    => _CHARSET,
+		    "xoops_version"    => XOOPS_VERSION,
+		    "xoops_upload_url" => XOOPS_UPLOAD_URL)
+		);
 
 	}
 	
@@ -239,7 +241,6 @@
 		}
 
 		$modulePath = XOOPS_MODULE_PATH . "/" . $dirname . "/admin/templates/" . $string;
-
 		if (file_exists($modulePath)) {
 			return XOOPS_MODULE_URL . "/" . $dirname . "/admin/templates/" . $string;
 		}
@@ -251,24 +252,81 @@
 function Legacy_function_stylesheet($params, &$smarty)
 {
 	$file = $params['file'];
+	if (strstr($file, "..") !== false) {
+		return;
+	}
+	
+	$infoArr = Legacy_get_ovveride_file($file, "stylesheets/");
+
+	// TEMP
+	// TODO We must return FALLBACK_URL here.
+	if ($infoArr['file'] != null) {
+		$request = array();
+		foreach ($infoArr as $key => $value) {
+			if ($value != null) {
+				$request[] = "${key}=${value}";
+			}
+		}
+		$url = XOOPS_MODULE_URL . "/base/admin/css.php?" . implode("&amp;", $request);
+		print '<link rel="stylesheet" type="text/css" media="all" href="' . $url . '" />';
+	}
+}
 
+function Legacy_get_ovveride_file($file, $prefix = null)
+{
 	$root =& XCube_Root::getSingleton();
+	$modController =& $root->mController->getModuleController();
+	$moduleObject =& $modController->getXoopsModule();
+
 	$theme = $root->mSiteConfig['Legacy']['Theme'];
 
-	// TODO We must remove Hard-Coding
-	$themePath = XOOPS_THEME_PATH . "/" . $theme . "/" . $file;
-	if (file_exists($themePath)) {
-		$url = XOOPS_MODULE_URL . "/base/admin/css.php?theme=${theme}&amp;file=${file}";
+	$ret = array();
+	$ret['theme'] = $theme;
+	$ret['file'] = $file;
+	
+	$file = $prefix . $file;
+
+	if (!is_object($moduleObject)) {
+		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/" . $file;
+		if (file_exists($themePath)) {
+			return $ret;
+		}
+		
+		$ret['theme'] = null;
+		return $ret;
 	}
 	else {
-		$url = XOOPS_MODULE_URL . "/base/admin/css.php?file=${file}";
-	}
+		$dirname = $moduleObject->get('dirname');
+		
+		$ret['dirname'] = $dirname;
 
-	// TEMP
-	// TODO We must return FALLBACK_URL here.
+		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/modules/" . $dirname . "/" . $file;
+		if (file_exists($themePath)) {
+			return $ret;
+		}
+		
+		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/" . $file;
+		if (file_exists($themePath)) {
+			$ret['dirname'] = null;
+			return $ret;
+		}
+		
+		$ret['theme'] = null;
 
-	print '<link rel="stylesheet" type="text/css" media="all" href="' . $url . '" />';
-}
+		$modulePath = XOOPS_MODULE_PATH . "/" . $dirname . "/admin/templates/" . $file;
+		if (file_exists($modulePath)) {
+			return $ret;
+		}
+		
+		$ret['dirname'] = null;
 
+		if (file_exists(LEGACY_ADMIN_RENDER_FALLBACK_PATH . "/" . $file)) {
+			return $ret;
+		}
+		
+		$ret['file'] =null;
+		return $ret;
+	}
+}
 
 ?>
\ No newline at end of file

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:22:25 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:22:25 +0900
Subject: [xoops-cvslog 2922] CVS update: xoops2jp/html/modules/base/admin/theme
Message-ID: <20060428092225.22C392AC67F@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/admin/theme/admin_theme.html
diff -u xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.1 xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/theme/admin_theme.html:1.1.2.1	Fri Dec 30 17:25:46 2005
+++ xoops2jp/html/modules/base/admin/theme/admin_theme.html	Fri Apr 28 18:22:25 2006
@@ -6,6 +6,7 @@
 <title><{$xoops_sitename}> : <{$smarty.const._CPHOME}></title>
 <script type="text/javascript" src="<{$xoops_url}>/include/xoops.js"></script>
 <{stylesheet file=style.css}>
+<{stylesheet file=module.css}>
 <script type="text/javascript">
 <!--
 var cid = <{if $smarty.get.fct == preferences && $smarty.get.mod > 0}><{$smarty.get.mod}><{else}><{$currentModule->getVar('mid')}><{/if}>;

From minahito ＠ users.sourceforge.jp  Fri Apr 28 18:28:33 2006
From: minahito ＠ users.sourceforge.jp (Minahito)
Date: Fri, 28 Apr 2006 18:28:33 +0900
Subject: [xoops-cvslog 2923] CVS update: xoops2jp/html/modules/base/kernel
Message-ID: <20060428092833.69F322AC682@users.sourceforge.jp>

Index: xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.5 xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.6
--- xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php:1.1.2.5	Fri Apr 28 18:17:44 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_AdminRenderSystem.class.php	Fri Apr 28 18:28:33 2006
@@ -211,42 +211,19 @@
  */
 function Legacy_modifier_theme($string)
 {
-	$root =& XCube_Root::getSingleton();
-	$modController =& $root->mController->getModuleController();
-	$moduleObject =& $modController->getXoopsModule();
-
-	$theme = $root->mSiteConfig['Legacy']['Theme'];
-
-	if (!is_object($moduleObject)) {
-		// TODO We must remove Hard-Coding
-		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/" . $string;
-		if (file_exists($themePath)) {
-			return XOOPS_THEME_URL . "/" . $theme . "/" . $string;
-		}
-
-		return LEGACY_ADMIN_RENDER_FALLBACK_URL . "/" . $string;
+	$infoArr = Legacy_get_ovveride_file($string);
+	
+	if ($infoArr['theme'] != null && $infoArr['dirname'] != null) {
+		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/modules/" . $infoArr['dirname'] . "/" . $string;
 	}
-	else {
-		$dirname = $moduleObject->getVar('dirname');
-
-		// TODO We must remove Hard-Coding
-		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/modules/" . $dirname . "/" . $string;
-		if (file_exists($themePath)) {
-			return XOOPS_THEME_URL . "/" . $theme . "/modules/" . $dirname . "/" . $string;
-		}
-
-		$themePath = XOOPS_THEME_PATH . "/" . $theme . "/" . $string;
-		if (file_exists($themePath)) {
-			return XOOPS_THEME_URL . "/" . $theme . "/" . $string;
-		}
-
-		$modulePath = XOOPS_MODULE_PATH . "/" . $dirname . "/admin/templates/" . $string;
-		if (file_exists($modulePath)) {
-			return XOOPS_MODULE_URL . "/" . $dirname . "/admin/templates/" . $string;
-		}
-
-		return LEGACY_ADMIN_RENDER_FALLBACK_URL . "/" . $string;
+	elseif ($infoArr['theme'] != null) {
+		return XOOPS_THEME_URL . "/" . $infoArr['theme'] . "/" . $string;
+	}
+	elseif ($infoArr['dirname'] != null) {
+		return XOOPS_MODULE_URL . "/" . $infoArr['dirname'] . "/admin/templates/" . $string;
 	}
+	
+	return LEGACY_ADMIN_RENDER_FALLBACK_URL . "/" . $string;
 }
 
 function Legacy_function_stylesheet($params, &$smarty)

From onokazu ＠ users.sourceforge.jp  Sat Apr 29 12:02:15 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 12:02:15 +0900
Subject: [xoops-cvslog 2924] CVS update: xoops2jp/html/install/class
Message-ID: <20060429030215.9CF132AC78C@users.sourceforge.jp>

Index: xoops2jp/html/install/class/mainfilemanager.php
diff -u xoops2jp/html/install/class/mainfilemanager.php:1.2.8.1 xoops2jp/html/install/class/mainfilemanager.php:1.2.8.2
--- xoops2jp/html/install/class/mainfilemanager.php:1.2.8.1	Tue Mar  7 22:11:39 2006
+++ xoops2jp/html/install/class/mainfilemanager.php	Sat Apr 29 12:02:15 2006
@@ -28,7 +28,7 @@
 * mainfile manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruki ＠ planewave.org>
-* @version $Id: mainfilemanager.php,v 1.2.8.1 2006/03/07 13:11:39 nobunobu Exp $
+* @version $Id: mainfilemanager.php,v 1.2.8.2 2006/04/29 03:02:15 onokazu Exp $
 * @access public
 **/
 class mainfile_manager {
@@ -63,6 +63,7 @@
             $this->error = true;
             return false;
         }
+        clearstatcache();
         $content = fread($file, filesize($this->path) );
         fclose($file);
 

From onokazu ＠ users.sourceforge.jp  Sat Apr 29 12:11:37 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 12:11:37 +0900
Subject: [xoops-cvslog 2925] CVS update: xoops2jp/html/install
Message-ID: <20060429031137.5A0832AC784@users.sourceforge.jp>

Index: xoops2jp/html/install/makedata.php
diff -u xoops2jp/html/install/makedata.php:1.5.2.1 xoops2jp/html/install/makedata.php:1.5.2.2
--- xoops2jp/html/install/makedata.php:1.5.2.1	Fri Apr 21 11:25:50 2006
+++ xoops2jp/html/install/makedata.php	Sat Apr 29 12:11:37 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: makedata.php,v 1.5.2.1 2006/04/21 02:25:50 onokazu Exp $
+// $Id: makedata.php,v 1.5.2.2 2006/04/29 03:11:37 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -82,9 +82,9 @@
 
     // data for table 'banner'
 
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (1, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner.gif', 'http://xoopscube.org/', 1008813250)");
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (2, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner_2.gif', 'http://xoopscube.org/', 1008813250)");
-    $dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (3, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/banner.swf', 'http://xoopscube.org/', 1008813250)");
+    //$dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (1, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner.gif', 'http://xoopscube.org/', 1008813250)");
+    //$dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (2, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/xoops_banner_2.gif', 'http://xoopscube.org/', 1008813250)");
+    //$dbm->insert("banner", " (bid, cid, imptotal, impmade, clicks, imageurl, clickurl, date) VALUES (3, 1, 0, 1, 0, '".XOOPS_URL."/images/banners/banner.swf', 'http://xoopscube.org/', 1008813250)");
 
     // default theme
 

From onokazu ＠ users.sourceforge.jp  Sat Apr 29 12:11:37 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 12:11:37 +0900
Subject: [xoops-cvslog 2926] CVS update: xoops2jp/html/install/sql
Message-ID: <20060429031137.7D0312AC789@users.sourceforge.jp>

Index: xoops2jp/html/install/sql/mysql.data.sql
diff -u xoops2jp/html/install/sql/mysql.data.sql:1.1.16.1 xoops2jp/html/install/sql/mysql.data.sql:1.1.16.2
--- xoops2jp/html/install/sql/mysql.data.sql:1.1.16.1	Fri Apr 21 11:25:51 2006
+++ xoops2jp/html/install/sql/mysql.data.sql	Sat Apr 29 12:11:37 2006
@@ -13,7 +13,7 @@
 # Dumping data for table `bannerclient`
 #
 
-INSERT INTO bannerclient VALUES (0, 'XOOPS', 'XOOPS Dev Team', 'webmaster ＠ xoopscube.org', '', '', '');
+#INSERT INTO bannerclient VALUES (0, 'XOOPS Cube', 'XOOPS Cube Dev Team', 'webmaster ＠ xoopscube.org', '', '', '');
 
 #
 # Dumping data for table `bannerfinish`

From onokazu ＠ users.sourceforge.jp  Sat Apr 29 12:11:37 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 12:11:37 +0900
Subject: [xoops-cvslog 2927] CVS update: xoops2jp/html/images/banners
Message-ID: <20060429031137.A1F3A2AC784@users.sourceforge.jp>



From onokazu ＠ users.sourceforge.jp  Sat Apr 29 16:36:02 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 16:36:02 +0900
Subject: [xoops-cvslog 2928] CVS update: xoops2jp/docs
Message-ID: <20060429073602.BD9242AC0CA@users.sourceforge.jp>

Index: xoops2jp/docs/CHANGES.txt
diff -u xoops2jp/docs/CHANGES.txt:1.10.2.2 xoops2jp/docs/CHANGES.txt:1.10.2.3
--- xoops2jp/docs/CHANGES.txt:1.10.2.2	Sat Apr 22 13:32:45 2006
+++ xoops2jp/docs/CHANGES.txt	Sat Apr 29 16:36:02 2006
@@ -1,6 +1,12 @@
 XOOPS v2 Changelog
 ============================
 
+2006/ 4/29: Version 2.0.14 JP
+===============================
+- Fixed installation failure problem with PHP 5.1.x
+- Removed xoops.org banner image files and data
+
+
 2006/ 4/21: Version 2.0.14 JP RC1
 ===============================
 - Added fix for 4.4.x variable reference PHP notice errors

From onokazu ＠ users.sourceforge.jp  Sat Apr 29 16:36:02 2006
From: onokazu ＠ users.sourceforge.jp (onokazu)
Date: Sat, 29 Apr 2006 16:36:02 +0900
Subject: [xoops-cvslog 2929] CVS update: xoops2jp/html/include
Message-ID: <20060429073602.E221E2AC7A0@users.sourceforge.jp>

Index: xoops2jp/html/include/version.php
diff -u xoops2jp/html/include/version.php:1.11.2.2 xoops2jp/html/include/version.php:1.11.2.3
--- xoops2jp/html/include/version.php:1.11.2.2	Sat Apr 22 13:08:18 2006
+++ xoops2jp/html/include/version.php	Sat Apr 29 16:36:02 2006
@@ -1,4 +1,4 @@
 <?php
-// $Id: version.php,v 1.11.2.2 2006/04/22 04:08:18 onokazu Exp $
-define("XOOPS_VERSION","XOOPS 2.0.14 JP RC1");
+// $Id: version.php,v 1.11.2.3 2006/04/29 07:36:02 onokazu Exp $
+define("XOOPS_VERSION","XOOPS 2.0.14 JP");
 ?>
\ No newline at end of file