[xoops-cvslog 2611] CVS update: xoops2jp/html/install/wizards

Zurück zum Archiv-Index

NobuNobu nobun****@users*****
2006年 4月 1日 (土) 10:33:00 JST


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';
+?>


xoops-cvslog メーリングリストの案内
Zurück zum Archiv-Index